Merge pull request #34 from Shareong/main

upgrade log & replace hunter with vcpkg

.github/workflows/workflow.yml

@@ -30,14 +30,14 @@ jobs:
         id: cache
         with:
           path: |
-            /home/runner/.hunter
-            /Users/runner/.hunter/
+            /home/runner/vcpkg
+            /Users/runner/vcpkg/
             ccache
-          key: hunter-clang-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
+          key: vcpkg-clang-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
           restore-keys: |
-            hunter-clang-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
-            hunter-clang-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-
-            hunter-clang-v1-notest-${{ runner.temp }}-
+            vcpkg-clang-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
+            vcpkg-clang-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-
+            vcpkg-clang-v1-notest-${{ runner.temp }}-
       - name: install macOS dependencies
         if: runner.os == 'macOS'
         run: brew install ccache
@@ -49,7 +49,7 @@ jobs:
         run: export SDKROOT=$(xcrun --sdk macosx --show-sdk-path) && CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake . -DTESTS=ON
       - name: configure
         if: runner.os == 'Linux'
-        run: CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake . -DTESTS=ON -DHUNTER_CONFIGURATION_TYPES=Debug
+        run: CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake . -DTESTS=ON
       - name: compile
         run: make -j2
       - name: run test
@@ -67,12 +67,12 @@ jobs:
       - uses: actions/cache@v2
         id: cache
         with:
-          path: /home/runner/.hunter
-          key: hunter-gcc-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
+          path: /home/runner/vcpkg
+          key: vcpkg-gcc-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
           restore-keys: |
-            hunter-gcc-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
-            hunter-gcc-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-
-            hunter-gcc-v1-notest-${{ runner.temp }}-
+            vcpkg-gcc-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
+            vcpkg-gcc-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-
+            vcpkg-gcc-v1-notest-${{ runner.temp }}-
       - uses: actions/cache@v2
         id: ccache
         with:
@@ -85,7 +85,7 @@ jobs:
       - name: install Ubuntu dependencies
         run: sudo apt install -y git curl build-essential cmake ccache lcov
       - name: configure
-        run: cmake . -DTESTS=ON -DCOVERAGE=ON -DDEBUG=on -DHUNTER_CONFIGURATION_TYPES=Debug
+        run: cmake . -DTESTS=ON -DCOVERAGE=ON -DDEBUG=on
       - name: compile
         run: make -j2
       - name: run test
@@ -103,7 +103,7 @@ jobs:
     container:
       image: docker.io/centos:7
       volumes:
-        - /github/home/.hunter:/github/home/.hunter
+        - /github/home/vcpkg:/github/home/vcpkg
     steps:
       - uses: actions/checkout@v2
         with:
@@ -112,14 +112,14 @@ jobs:
         id: cache
         with:
           path: |
-            /home/runner/.hunter
-            /github/home/.hunter
+            /home/runner/vcpkg
+            /github/home/vcpkg
             ccache
-          key: hunter-centos-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
+          key: vcpkg-centos-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
           restore-keys: |
-            hunter-centos-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
-            hunter-centos-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-
-            hunter-centos-v1-notest-${{ runner.temp }}-
+            vcpkg-centos-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
+            vcpkg-centos-v1-notest-${{ runner.temp }}-${{ github.base_ref }}-
+            vcpkg-centos-v1-notest-${{ runner.temp }}-
       - name: install CentOS dependencies
         run: |
           yum install -y epel-release centos-release-scl
@@ -145,25 +145,25 @@ jobs:
         id: cache
         with:
           path: |
-            /home/runner/.hunter
-            /github/home/.hunter
-            /Users/runner/.hunter
-            /home/runner/.hunter/_Base/Download/
-            /github/home/.hunter/_Base/Download/
-            /Users/runner/.hunter/_Base/Download/
-            C:/.hunter/
-            C:/.hunter/_Base/Download/
+            /home/runner/vcpkg
+            /github/home/vcpkg
+            /Users/runner/vcpkg
+            /home/runner/vcpkg/_Base/Download/
+            /github/home/vcpkg/_Base/Download/
+            /Users/runner/vcpkg/_Base/Download/
+            C:/vcpkg/
+            C:/vcpkg/_Base/Download/
             ccache
-          key: hunter-msvc-v3-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
+          key: vcpkg-msvc-v3-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
           restore-keys: |
-            hunter-msvc-v3-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
-            hunter-msvc-v3-notest-${{ runner.temp }}-${{ github.base_ref }}-
-            hunter-msvc-v3-notest-${{ runner.temp }}-
+            vcpkg-msvc-v3-notest-${{ runner.temp }}-${{ github.base_ref }}-${{ hashFiles('.github/workflows/workflow.yml') }}
+            vcpkg-msvc-v3-notest-${{ runner.temp }}-${{ github.base_ref }}-
+            vcpkg-msvc-v3-notest-${{ runner.temp }}-
       - name: Add MSbuild to PATH
         uses: microsoft/setup-msbuild@v1.1
       - name: configure
         if: runner.os == 'Windows'
-        run: mkdir -p build && cd build && cmake -G "Visual Studio 16 2019" -A x64 ../ -DHUNTER_STATUS_DEBUG=ON
+        run: mkdir -p build && cd build && cmake -G "Visual Studio 16 2019" -A x64 ../
       - name: compile
         run: 
           cd build && MSBuild /version && MSBuild bcos-utilities.sln /p:Configuration=Release /p:Platform=x64

.gitignore

@@ -30,3 +30,7 @@
 *.exe
 *.out
 *.app
+
+build
+# vcpkg
+vcpkg

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vcpkg"]
+	path = vcpkg
+	url = https://github.com/microsoft/vcpkg

CMakeLists.txt

@@ -16,47 +16,38 @@
 # limitations under the License.
 #------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.10)
-set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version")
+cmake_minimum_required(VERSION 3.14)
 
 if (NOT DEFINED URL_BASE)
     set(URL_BASE "github.com")
     # set(URL_BASE "git.luolix.top.cnpmjs.org")
 endif()
 
-set(BCOS_CMAKE_SCRIPTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bcos-cmake-scripts)
-set(BCOS_UTILITIES_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake" CACHE PATH "The cmake path for the library")
-list(APPEND CMAKE_MODULE_PATH ${BCOS_CMAKE_SCRIPTS_DIR})
-list(APPEND CMAKE_MODULE_PATH ${BCOS_UTILITIES_CMAKE_DIR})
-#init hunter
-include(HunterGate)
-HunterGate(
-    URL "https://${URL_BASE}/FISCO-BCOS/hunter/archive/162ff7cde3d843e43afdab8fe3214275c35ef168.tar.gz"
-    SHA1 "0ba8099fe89beb0d44986c750fe0d44040725d99"
-    FILEPATH "${BCOS_UTILITIES_CMAKE_DIR}/config.cmake"
-)
-project(bcos-utilities VERSION "1.0.0")
-set(VERSION_SUFFIX "-rc3")
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
-# basic settings
+set(VERSION_SUFFIX "")
 include(Options)
 configure_project()
+
+# vcpkg init
+find_package(Git REQUIRED)
+execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file")
+
+project(bcos-utilities VERSION "1.0.0")
+
 include(CompilerSettings)
 
 include_directories(${CMAKE_INSTALL_INCLUDEDIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-# install dependencies
-hunter_add_package(Boost COMPONENTS all)
-if(NOT MSVC)
-    hunter_add_package(range-v3)
-    find_package(range-v3 CONFIG REQUIRED)
-endif()
 # for compile
 set(BCOS_UTILITIES_TARGET "bcos-utilities")
 add_subdirectory(bcos-utilities)
 
+print_config("bcos-utilities")
+
 if (TESTS)
     enable_testing()
     set(CTEST_OUTPUT_ON_FAILURE TRUE)
@@ -78,10 +69,6 @@ install(
 # install the include files for hash
 include(InstallInclude)
 
-# for doxygen
-include(BuildDocs)
-buildDoc(doc)
-
 # for code coverage
 if (COVERAGE)
     include(Coverage)