diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f393253eedbd4cbe0a2bc563f6871af26f41e10..6b61b6a1290a33d2bb09501e39b85dff643ce276 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -141,6 +141,18 @@ amd64:linux.rwd: - ./prod_build/pack.sh --target linux rwd - /opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-node/$CI_COMMIT_REF_NAME/ build_*/*.deb +amd64:linux.rwd.noopt: + extends: .build + image: demlabs/amd64/debian-buster:linuxbuilder + before_script: + - /opt/buildtools/prepare_environment.sh amd64-linux + - *fill_version_mk + script: + - echo "Do hard work" + - ./prod_build/build.sh --target linux rwd -DBUILD_WITH_PYTHON_ENV=ON -DBUILD_DIAGTOOL=ON -DCELLFRAME_NO_OPTIMIZATION=ON + - ./prod_build/pack.sh --target linux rwd + - /opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-node/$CI_COMMIT_REF_NAME/ build_*/*.deb + amd64:linux.tps: extends: .build image: demlabs/amd64/debian-buster:linuxbuilder diff --git a/CMakeLists.txt b/CMakeLists.txt index d6e542ff8bc5d3d2d58a533866233b65e1dbf0f6..676428c7b3ca9e66df29f4c11e0aef0776a79e68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,13 +33,18 @@ SET(DESTDIR "/opt/${PROJECT_NAME}") # init CellFrame SDK add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}\"") set(SUBMODULES_NO_BUILD ON) +option(CELLFRAME_NO_OPTIMIZATION "Build without BMI BMI2 CPU instruction." OFF) + +if( CELLFRAME_NO_OPTIMIZATION ) + set(DAP_CRYPTO_XKCP_PLAINC ON) +endif() + include (dap-sdk/cmake/OS_Detection.cmake) set(BUILD_WITH_GDB_DRIVER_MDBX ON) set(BUILD_WITH_GDB_DRIVER_SQLITE ON) #set(BUILD_WITH_GDB_DRIVER_PGSQL ON) #set(BUILD_CELLFRAME_NODE_TESTS ON) - #set (BUILD_WITH_TPS_TEST ON) if (BUILD_WITH_TPS_TEST) add_definitions("-DDAP_TPS_TEST") @@ -57,8 +62,8 @@ option(ADD_UPDATER OFF) option(DAP_USE_RPMALLOC "Use 'rpmalloc' instead of std allocator" OFF) if(LINUX) - set(BUILD_WITH_PYTHON_ENV ON) - set(SUPPORT_PYTHON_PLUGINS ON) + set(BUILD_WITH_PYTHON_ENV OFF) + set(SUPPORT_PYTHON_PLUGINS OFF) endif() set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-esbocs cs-none diff --git a/dap-sdk b/dap-sdk index 7c30076d377e9fd979affe4bcf02408b9997acdd..3802171c8aae50a7d55cafaa87cdf4933cb52a2c 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 7c30076d377e9fd979affe4bcf02408b9997acdd +Subproject commit 3802171c8aae50a7d55cafaa87cdf4933cb52a2c diff --git a/version.mk b/version.mk index bc8fefbc685f59172d1a277404e1526aa4bc4114..7c7a270f81f267f6f7fe09b44f553b55f5086de2 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ VERSION_MAJOR=5 VERSION_MINOR=3 -VERSION_PATCH=175 +VERSION_PATCH=176