diff options
| -rw-r--r-- | .cproject | 12 | ||||
| -rw-r--r-- | examples/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | scripts/build-botan-01.sh | 1 | ||||
| -rw-r--r-- | scripts/build-botan-amd64.sh (renamed from scripts/build-botan-min.sh) | 7 | ||||
| -rw-r--r-- | src/elevator/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | test/elevator/CMakeLists.txt | 3 |
6 files changed, 13 insertions, 18 deletions
@@ -24,8 +24,7 @@ <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.893961943" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath"> <listOptionValue builtIn="false" value="/usr/include/c++/10"/> <listOptionValue builtIn="false" value=""${workspace_loc:/elevator/jaulib/include}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/elevator/botan/dist-amd64-min}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/elevator/botan/dist-amd64-min/include/botan-3}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/elevator/include/amalgamation-amd64}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/elevator/include}""/> </option> <option id="gnu.cpp.compiler.option.dialect.std.535162784" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.c++17" valueType="enumerated"/> @@ -66,7 +65,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="botan/dist-amd64-min"/> + <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="include/amalgamation-amd64"/> <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="examples/pack"/> <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="jaulib/src"/> <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/elevator"/> @@ -100,8 +99,7 @@ <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.656563235" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath"> <listOptionValue builtIn="false" value="/usr/include/c++/10"/> <listOptionValue builtIn="false" value=""${workspace_loc:/elevator/jaulib/include}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/elevator/botan/dist-amd64-min}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/elevator/botan/dist-amd64-min/include/botan-3}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/elevator/include/amalgamation-amd64}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/elevator/include}""/> </option> <option id="gnu.cpp.compiler.option.other.other.1708258132" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -Wno-multichar -Wno-float-equal -Wno-unused-parameter -Wno-cast-align" valueType="string"/> @@ -140,7 +138,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="botan/dist-amd64-min"/> + <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="include/amalgamation-amd64"/> <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="examples/cipherpack"/> <entry excluding="pack.cpp" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="examples/pack"/> <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="include/elevator"/> @@ -194,4 +192,4 @@ <resource resourceType="PROJECT" workspacePath="/elevator"/> </configuration> </storageModule> -</cproject>
\ No newline at end of file +</cproject> diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 75e834f..000af55 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories( ${PROJECT_SOURCE_DIR}/jaulib/include - ${PROJECT_SOURCE_DIR}/botan/dist-amd64-min -# ${PROJECT_SOURCE_DIR}/botan/dist-amd64-min/include/botan-3 + ${PROJECT_SOURCE_DIR}/include/amalgamation-amd64 ${PROJECT_SOURCE_DIR}/include ) diff --git a/scripts/build-botan-01.sh b/scripts/build-botan-01.sh deleted file mode 100644 index 6f1e58a..0000000 --- a/scripts/build-botan-01.sh +++ /dev/null @@ -1 +0,0 @@ -./configure.py --prefix=`pwd`/dist-amd64-max diff --git a/scripts/build-botan-min.sh b/scripts/build-botan-amd64.sh index d249574..4df3c12 100644 --- a/scripts/build-botan-min.sh +++ b/scripts/build-botan-amd64.sh @@ -29,8 +29,9 @@ MOD_BASIC=base,pubkey,rsa,x509,eme_oaep,eme_raw,emsa1 CXX_FLAGS= LD_FLAGS= -rm -rf dist-amd64-min -mkdir -p dist-amd64-min +mkdir -p $rootdir/include/amalgamation-amd64 +rm -f $rootdir/include/amalgamation-amd64/botan_all.h +rm -f $rootdir/include/amalgamation-amd64/botan_all.cpp ./configure.py --cpu=$USE_CPU --prefix=`pwd`/dist-amd64-min --minimized-build \ --enable-modules=$MOD_BASIC,$MOD_CIPHER,$MOD_HASH,$MOD_RNG,$MOD_HW_THIS \ @@ -41,6 +42,6 @@ mkdir -p dist-amd64-min # --with-lzma --with-bzip2 \ -cp -a botan_all.cpp botan_all.h dist-amd64-min/ +mv botan_all.cpp botan_all.h $rootdir/include/amalgamation-amd64/ cd $rootdir diff --git a/src/elevator/CMakeLists.txt b/src/elevator/CMakeLists.txt index 5356e4f..29d9644 100644 --- a/src/elevator/CMakeLists.txt +++ b/src/elevator/CMakeLists.txt @@ -1,7 +1,6 @@ set (elevator_LIB_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/jaulib/include - ${PROJECT_SOURCE_DIR}/botan/dist-amd64-min -# ${PROJECT_SOURCE_DIR}/botan/dist-amd64-min/include/botan-3 + ${PROJECT_SOURCE_DIR}/include/amalgamation-amd64 ${PROJECT_SOURCE_DIR}/include ) @@ -14,7 +13,7 @@ set (elevator_LIB_SRCS ${PROJECT_SOURCE_DIR}/jaulib/src/debug.cpp ${PROJECT_SOURCE_DIR}/jaulib/src/basic_types.cpp ${PROJECT_SOURCE_DIR}/jaulib/src/environment.cpp - ${PROJECT_SOURCE_DIR}/botan/dist-amd64-min/botan_all.cpp + ${PROJECT_SOURCE_DIR}/include/amalgamation-amd64/botan_all.cpp ${PROJECT_SOURCE_DIR}/src/elevator/process.cpp ${PROJECT_SOURCE_DIR}/src/elevator/IOUtil.cpp ${PROJECT_SOURCE_DIR}/src/elevator/Crypto.cpp diff --git a/test/elevator/CMakeLists.txt b/test/elevator/CMakeLists.txt index 56ab2e7..4baf057 100644 --- a/test/elevator/CMakeLists.txt +++ b/test/elevator/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories( ${PROJECT_SOURCE_DIR}/jaulib/include - ${PROJECT_SOURCE_DIR}/botan/dist-amd64-min -# ${PROJECT_SOURCE_DIR}/botan/dist-amd64-min/include/botan-3 + ${PROJECT_SOURCE_DIR}/include/amalgamation-amd64 ${PROJECT_SOURCE_DIR}/include ) |