From e56bcb648958cabc7c08a9a4804ed194d9d3edc2 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Thu, 11 Jul 2024 12:31:50 -0500 Subject: [PATCH] updated build system --- CMakeLists.txt | 64 ++++++++++++++++++++--------------------- scripts/make_common.sh | 6 ++-- scripts/make_package.sh | 6 ++-- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 67c4b82b..c79f1289 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,39 +77,39 @@ endif() -DPROJECT_BUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS} -DPROJECT_CMAKE_BUILD_TYPE=${PROJECT_CMAKE_BUILD_TYPE} -DPROJECT_DIST_DIR=${PROJECT_DIST_DIR} - -DPROJECT_ENABLE_WXWIDGETS=${PROJECT_ENABLE_WXWIDGETS} - -DPROJECT_ENABLE_WINFSP=${PROJECT_ENABLE_WINFSP} - -DPROJECT_ENABLE_VORBIS=${PROJECT_ENABLE_VORBIS} - -DPROJECT_ENABLE_TPL=${PROJECT_ENABLE_TPL} - -DPROJECT_ENABLE_TESTING=${PROJECT_ENABLE_TESTING} - -DPROJECT_ENABLE_STDUUID=${PROJECT_ENABLE_STDUUID} - -DPROJECT_ENABLE_SQLITE=${PROJECT_ENABLE_SQLITE} - -DPROJECT_ENABLE_SPDLOG=${PROJECT_ENABLE_SPDLOG} - -DPROJECT_ENABLE_SFML=${PROJECT_ENABLE_SFML} - -DPROJECT_ENABLE_SECP256K1=${PROJECT_ENABLE_SECP256K1} - -DPROJECT_ENABLE_SAGO_PLATFORM_FOLDERS=${PROJECT_ENABLE_SAGO_PLATFORM_FOLDERS} - -DPROJECT_ENABLE_ROCKSDB=${PROJECT_ENABLE_ROCKSDB} - -DPROJECT_ENABLE_PUGIXML=${PROJECT_ENABLE_PUGIXML} - -DPROJECT_ENABLE_OPENSSL=${PROJECT_ENABLE_OPENSSL} - -DPROJECT_ENABLE_OPENAL=${PROJECT_ENABLE_OPENAL} - -DPROJECT_ENABLE_OGG=${PROJECT_ENABLE_OGG} - -DPROJECT_ENABLE_NUSPELL=${PROJECT_ENABLE_NUSPELL} - -DPROJECT_ENABLE_LIBSODIUM=${PROJECT_ENABLE_LIBSODIUM} - -DPROJECT_ENABLE_LIBEVENT=${PROJECT_ENABLE_LIBEVENT} - -DPROJECT_ENABLE_LIBBITCOIN_SYSTEM=${PROJECT_ENABLE_LIBBITCOIN_SYSTEM} - -DPROJECT_ENABLE_JSON=${PROJECT_ENABLE_JSON} - -DPROJECT_ENABLE_GTKMM=${PROJECT_ENABLE_GTKMM} - -DPROJECT_ENABLE_FZF=${PROJECT_ENABLE_FZF} - -DPROJECT_ENABLE_FUSE=${PROJECT_ENABLE_FUSE} - -DPROJECT_ENABLE_FREETYPE2=${PROJECT_ENABLE_FREETYPE2} - -DPROJECT_ENABLE_FONTCONFIG=${PROJECT_ENABLE_FONTCONFIG} - -DPROJECT_ENABLE_FMT=${PROJECT_ENABLE_FMT} - -DPROJECT_ENABLE_FLAC=${PROJECT_ENABLE_FLAC} - -DPROJECT_ENABLE_DTL=${PROJECT_ENABLE_DTL} - -DPROJECT_ENABLE_CURL=${PROJECT_ENABLE_CURL} - -DPROJECT_ENABLE_CPP_HTTPLIB=${PROJECT_ENABLE_CPP_HTTPLIB} - -DPROJECT_ENABLE_CLI11=${PROJECT_ENABLE_CLI11} -DPROJECT_ENABLE_BOOST=${PROJECT_ENABLE_BOOST} + -DPROJECT_ENABLE_CLI11=${PROJECT_ENABLE_CLI11} + -DPROJECT_ENABLE_CPP_HTTPLIB=${PROJECT_ENABLE_CPP_HTTPLIB} + -DPROJECT_ENABLE_CURL=${PROJECT_ENABLE_CURL} + -DPROJECT_ENABLE_DTL=${PROJECT_ENABLE_DTL} + -DPROJECT_ENABLE_FLAC=${PROJECT_ENABLE_FLAC} + -DPROJECT_ENABLE_FMT=${PROJECT_ENABLE_FMT} + -DPROJECT_ENABLE_FONTCONFIG=${PROJECT_ENABLE_FONTCONFIG} + -DPROJECT_ENABLE_FREETYPE2=${PROJECT_ENABLE_FREETYPE2} + -DPROJECT_ENABLE_FUSE=${PROJECT_ENABLE_FUSE} + -DPROJECT_ENABLE_FZF=${PROJECT_ENABLE_FZF} + -DPROJECT_ENABLE_GTKMM=${PROJECT_ENABLE_GTKMM} + -DPROJECT_ENABLE_JSON=${PROJECT_ENABLE_JSON} + -DPROJECT_ENABLE_LIBBITCOIN_SYSTEM=${PROJECT_ENABLE_LIBBITCOIN_SYSTEM} + -DPROJECT_ENABLE_LIBEVENT=${PROJECT_ENABLE_LIBEVENT} + -DPROJECT_ENABLE_LIBSODIUM=${PROJECT_ENABLE_LIBSODIUM} + -DPROJECT_ENABLE_NUSPELL=${PROJECT_ENABLE_NUSPELL} + -DPROJECT_ENABLE_OGG=${PROJECT_ENABLE_OGG} + -DPROJECT_ENABLE_OPENAL=${PROJECT_ENABLE_OPENAL} + -DPROJECT_ENABLE_OPENSSL=${PROJECT_ENABLE_OPENSSL} + -DPROJECT_ENABLE_PUGIXML=${PROJECT_ENABLE_PUGIXML} + -DPROJECT_ENABLE_ROCKSDB=${PROJECT_ENABLE_ROCKSDB} + -DPROJECT_ENABLE_SAGO_PLATFORM_FOLDERS=${PROJECT_ENABLE_SAGO_PLATFORM_FOLDERS} + -DPROJECT_ENABLE_SECP256K1=${PROJECT_ENABLE_SECP256K1} + -DPROJECT_ENABLE_SFML=${PROJECT_ENABLE_SFML} + -DPROJECT_ENABLE_SPDLOG=${PROJECT_ENABLE_SPDLOG} + -DPROJECT_ENABLE_SQLITE=${PROJECT_ENABLE_SQLITE} + -DPROJECT_ENABLE_STDUUID=${PROJECT_ENABLE_STDUUID} + -DPROJECT_ENABLE_TESTING=${PROJECT_ENABLE_TESTING} + -DPROJECT_ENABLE_TPL=${PROJECT_ENABLE_TPL} + -DPROJECT_ENABLE_VORBIS=${PROJECT_ENABLE_VORBIS} + -DPROJECT_ENABLE_WINFSP=${PROJECT_ENABLE_WINFSP} + -DPROJECT_ENABLE_WXWIDGETS=${PROJECT_ENABLE_WXWIDGETS} -DPROJECT_EXTERNAL_BUILD_ROOT=${PROJECT_EXTERNAL_BUILD_ROOT} -DPROJECT_FUSE=${PROJECT_FUSE} -DPROJECT_FUSE_INCLUDE_DIRS=${PROJECT_FUSE_INCLUDE_DIRS} diff --git a/scripts/make_common.sh b/scripts/make_common.sh index b07dde1e..dd5ca894 100755 --- a/scripts/make_common.sh +++ b/scripts/make_common.sh @@ -91,9 +91,9 @@ set -f FILE_LIST=$(find . -type f) for FILE in ${FILE_LIST}; do sha256sum ${FILE} >${FILE}.sha256 - if [ "${DEVELOPER_PRIVATE_KEY}" != "" ]; then - openssl dgst -sha256 -sign "${DEVELOPER_PRIVATE_KEY}" -out "${FILE}.sig" "${FILE}" - openssl dgst -sha256 -verify "${DEVELOPER_PUBLIC_KEY}" -signature "${FILE}.sig" "${FILE}" || exit 1 + if [ "${PROJECT_PRIVATE_KEY}" != "" ]; then + openssl dgst -sha256 -sign "${PROJECT_PRIVATE_KEY}" -out "${FILE}.sig" "${FILE}" + openssl dgst -sha256 -verify "${PROJECT_PUBLIC_KEY}" -signature "${FILE}.sig" "${FILE}" || exit 1 fi done unset IFS diff --git a/scripts/make_package.sh b/scripts/make_package.sh index 77f563f3..07cf478b 100644 --- a/scripts/make_package.sh +++ b/scripts/make_package.sh @@ -56,9 +56,9 @@ pushd "${DEST_DIR}" OUT_FILE=${PROJECT_APP_NAME}_${PROJECT_VERSION}_${PROJECT_GIT_REV}_${PROJECT_BUILD_ARCH}_${PROJECT_OS}.tar.gz tar cvzf "${OUT_FILE}" -C ${TEMP_DIR} . || exit_and_clean "Failed to create archive" 1 sha256sum "${OUT_FILE}" >"${OUT_FILE}.sha256" || exit_and_clean "Failed to create sha256 file" 1 -if [ "${DEVELOPER_PRIVATE_KEY}" != "" ]; then - openssl dgst -sha256 -sign "${DEVELOPER_PRIVATE_KEY}" -out "${OUT_FILE}.sig" "${OUT_FILE}" || exit_and_clean "Failed to create signature file" 1 - openssl dgst -sha256 -verify "${DEVELOPER_PUBLIC_KEY}" -signature "${OUT_FILE}.sig" "${OUT_FILE}" || exit_and_clean "Failed to validate signature file" 1 +if [ "${PROJECT_PRIVATE_KEY}" != "" ]; then + openssl dgst -sha256 -sign "${PROJECT_PRIVATE_KEY}" -out "${OUT_FILE}.sig" "${OUT_FILE}" || exit_and_clean "Failed to create signature file" 1 + openssl dgst -sha256 -verify "${PROJECT_PUBLIC_KEY}" -signature "${OUT_FILE}.sig" "${OUT_FILE}" || exit_and_clean "Failed to validate signature file" 1 fi popd