Skip to content

Commit

Permalink
update to v0.3.1 (#26)
Browse files Browse the repository at this point in the history
* update from cryptogarageinc v0.3.10+α

Co-authored-by: k-matsuzawa <matsuzawa@cryptogarage.co.jp>
  • Loading branch information
ko-matsu and k-matsuzawa authored May 24, 2021
1 parent 5ff66f5 commit 822c872
Show file tree
Hide file tree
Showing 194 changed files with 28,221 additions and 15,803 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/check_pre-merge_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
branches:
- master
- stable_v*
pull_request:
branches:
- master
- stable_v*

env:
CMAKE_VERSION: 3.17.2
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/check_pre-merge_sprint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,30 @@ jobs:
name: output-lcov-cfdcore-${{ matrix.os }}
path: ./build/lcov_cfdcore_output.zip

cmake-cpp-support-test:
name: cmake build-ubuntu C++ support test
runs-on: ubuntu-20.04
strategy:
matrix:
cppversion: [11, 14, 17, 20]

steps:
- uses: actions/checkout@v2
- name: dump version
run: |
cmake --version
gcc --version
- name: cmake-build
run: |
cmake --version
cmake -S . -B build -G "Unix Makefiles" -DENABLE_SHARED=on -DENABLE_ELEMENTS=on -DCMAKE_BUILD_TYPE=Release -DSTD_CPP_VERSION=${{ matrix.cppversion }} -DTARGET_RPATH=./build/Release
cmake --build build --config Debug --parallel 4
- name: test
run: |
cd build
ctest -C Release --output-on-failure
cd ..
ubuntu-valgrind:
name: valgrind-ubuntu
runs-on: ${{ matrix.os }}
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/code_scanner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ jobs:
# We must fetch at least the immediate parents so that if this is a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
Expand Down Expand Up @@ -81,11 +77,6 @@ jobs:
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Ensure a compatible version of dotnet is installed.
# The [Microsoft Security Code Analysis CLI](https://aka.ms/mscadocs) is built with dotnet v3.1.201.
# A version greater than or equal to v3.1.201 of dotnet must be installed on the agent in order to run this action.
Expand Down
72 changes: 0 additions & 72 deletions .github/workflows/workflow_modify_checker.yml

This file was deleted.

10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Useful when developing applications for cryptocurrencies.
## Dependencies

- C/C++ Compiler
- can compile c++11
  - can compile c++11 or upper (default is c++11. use STD_CPP_VERSION option)
- CMake (3.14.3 or higher)
- When using npm scripts and cmake-js
- node.js (stable version)
Expand Down Expand Up @@ -133,7 +133,11 @@ cmake --build build
- `-DTARGET_RPATH=xxxxx;yyyyy`: Set rpath (Linux, MacOS). Separator is ';'.
- `-DCMAKE_BUILD_TYPE=Release`: Enable release build.
- `-DCMAKE_BUILD_TYPE=Debug`: Enable debug build.
- `-DSTD_CPP_VERSION=xx`: Set the C++ version. [11,14,17,20] (default:11)
- `-DCFDCORE_DEBUG=on`: Enable cfd debug mode and loggings log files. [ON/OFF] (default:OFF)
- Enable debug mode is need `STD_CPP_VERSION` upper 14.
- `-DCFDCORE_LOG_LEVEL=xxxx`: Set log level. [trace/debug/info/warn] (default:info)
- `-DCFDCORE_LOG_CONSOLE=on`: Enable cfd loggings console output mode. [ON/OFF] (default:OFF)

---

Expand Down Expand Up @@ -208,7 +212,9 @@ npm run ctest
- [libwally-core](https://github.com/cryptogarageinc/libwally-core/tree/cfd-develop) (forked from [ElementsProject/libwally-core](https://github.com/ElementsProject/libwally-core))
- [secp256k1-zkp](https://github.com/cryptogarageinc/secp256k1-zkp/tree/cfd-develop) (forked from [ElementsProject/secp256k1-zkp](https://github.com/ElementsProject/secp256k1-zkp))
- [univalue](https://github.com/jgarzik/univalue) (for JSON encoding and decoding)
- [googletest](https://github.com/google/googletest) (for testing)
- logger
- [fmtlib](https://github.com/fmtlib/fmt) (for logging format tool)
- [quill](https://github.com/odygrd/quill) (for logging)

### formatter

Expand Down
6 changes: 6 additions & 0 deletions cmake/Cpp11Setting.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,14 @@ endif()
if(${STD_CPP_VERSION})
set(CMAKE_CXX_STANDARD ${STD_CPP_VERSION})
message(STATUS "[STD_CPP_VERSION] ${STD_CPP_VERSION}")
if(${STD_CPP_VERSION} STREQUAL "11")
set(ENABLE_LOGGING FALSE)
else()
set(ENABLE_LOGGING TRUE)
endif()
else()
set(CMAKE_CXX_STANDARD 11)
set(ENABLE_LOGGING FALSE)
endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
14 changes: 10 additions & 4 deletions external/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ endif()
# load current repository file
set(LOCAL_CURRENT_VERSION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../${EXTERNAL_LOCAL_FILENAME})
set(EXTERNAL_LOCAL_CURRENT_FILENAME local_resource/external_project_local_setting2.config)
if((NOT LIBWALLY_TARGET_VERSION) AND (EXISTS ${LOCAL_CURRENT_VERSION_FILE}))
if((NOT LIBWALLY_TARGET_VERSION) AND (NOT LIBWALLY_TARGET_URL) AND (EXISTS ${LOCAL_CURRENT_VERSION_FILE}))
transform_makefile_srclist(${LOCAL_CURRENT_VERSION_FILE} "${CMAKE_CURRENT_BINARY_DIR}/${EXTERNAL_LOCAL_CURRENT_FILENAME}.cmake")
include(${CMAKE_CURRENT_BINARY_DIR}/${EXTERNAL_LOCAL_CURRENT_FILENAME}.cmake)
message(STATUS "[external project local] load current cfd-core file")
Expand All @@ -55,13 +55,19 @@ if(LIBWALLY_TARGET_VERSION)
set(LIBWALLY_TARGET_TAG ${LIBWALLY_TARGET_VERSION})
message(STATUS "[external project local] libwally-core target=${LIBWALLY_TARGET_VERSION}")
else()
set(LIBWALLY_TARGET_TAG refs/tags/cfd-0.3.4)
set(LIBWALLY_TARGET_TAG refs/tags/cfd-0.3.7)
endif()
if(LIBWALLY_TARGET_URL)
set(LIBWALLY_TARGET_REP ${LIBWALLY_TARGET_URL})
message(STATUS "[external project local] libwally-core url=${LIBWALLY_TARGET_URL}")
else()
set(LIBWALLY_TARGET_REP cryptogarageinc/libwally-core.git)
endif()

if(${USE_GIT_SSH})
set(LIBWALLY_URL git@github.com:cryptogarageinc/libwally-core.git)
set(LIBWALLY_URL git@github.com:${LIBWALLY_TARGET_REP})
else()
set(LIBWALLY_URL https://github.com/cryptogarageinc/libwally-core.git)
set(LIBWALLY_URL https://github.com/${LIBWALLY_TARGET_REP})
endif()

set(TEMPLATE_PROJECT_NAME libwally-core)
Expand Down
Loading

0 comments on commit 822c872

Please sign in to comment.