From 2f8af0fb08e08f9e2bf3750def6452d021ef7167 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Wed, 17 Jul 2024 08:59:06 -0500 Subject: [PATCH] updated build system --- config.sh | 4 ++-- scripts/env.sh | 5 +---- scripts/make_common.sh | 6 +++++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/config.sh b/config.sh index 8d723338..62750077 100755 --- a/config.sh +++ b/config.sh @@ -2,8 +2,8 @@ PROJECT_NAME="repertory" -PROJECT_COPYRIGHT="Copyright [2018-2024] [MIT License] [https://git.fifthgrid.com/blockstorage/repertory]" -PROJECT_COMPANY_NAME=https://git.fifthgrid.com/blockstorage +PROJECT_COPYRIGHT="Copyright <2018-2024> " +PROJECT_COMPANY_NAME="https://git.fifthgrid.com/blockstorage" PROJECT_DESCRIPTION="Mount utility for Sia and S3" PROJECT_MAJOR_VERSION=2 diff --git a/scripts/env.sh b/scripts/env.sh index 6b682040..8dfe8db0 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -209,9 +209,6 @@ PROJECT_CMAKE_OPTS="-DPROJECT_BUILD_ARCH=${PROJECT_BUILD_ARCH} ${PROJECT_CMAKE_O PROJECT_CMAKE_OPTS="-DPROJECT_BUILD_DIR=${PROJECT_BUILD_DIR} ${PROJECT_CMAKE_OPTS}" PROJECT_CMAKE_OPTS="-DPROJECT_BUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS} ${PROJECT_CMAKE_OPTS}" PROJECT_CMAKE_OPTS="-DPROJECT_CMAKE_BUILD_TYPE=${PROJECT_CMAKE_BUILD_TYPE} ${PROJECT_CMAKE_OPTS}" -PROJECT_CMAKE_OPTS="-DPROJECT_COMPANY_NAME=${PROJECT_COMPANY_NAME} ${PROJECT_CMAKE_OPTS}" -PROJECT_CMAKE_OPTS="-DPROJECT_COPYRIGHT=${PROJECT_COPYRIGHT} ${PROJECT_CMAKE_OPTS}" -PROJECT_CMAKE_OPTS="-DPROJECT_DESCRIPTION=${PROJECT_DESCRIPTION} ${PROJECT_CMAKE_OPTS}" PROJECT_CMAKE_OPTS="-DPROJECT_DIST_DIR=${PROJECT_DIST_DIR} ${PROJECT_CMAKE_OPTS}" PROJECT_CMAKE_OPTS="-DPROJECT_EXTERNAL_BUILD_ROOT=${PROJECT_EXTERNAL_BUILD_ROOT} ${PROJECT_CMAKE_OPTS}" PROJECT_CMAKE_OPTS="-DPROJECT_GIT_REV=${PROJECT_GIT_REV} ${PROJECT_CMAKE_OPTS}" @@ -308,7 +305,7 @@ echo " Build arch: ${PROJECT_BUILD_ARCH}" echo " Build clean: ${PROJECT_BUILD_CLEAN}" echo " Build dir: ${PROJECT_BUILD_DIR}" echo " Build shared libraries: ${PROJECT_BUILD_SHARED_LIBS}" -echo " CMake options: -G\"Unix Makefiles\" ${PROJECT_CMAKE_OPTS}" +echo " CMake options: -G\"Unix Makefiles\" ${PROJECT_CMAKE_OPTS} -DPROJECT_COMPANY_NAME=\"${PROJECT_COMPANY_NAME}\" -DPROJECT_COPYRIGHT=\"${PROJECT_COPYRIGHT}\" -DPROJECT_DESCRIPTION=\"${PROJECT_DESCRIPTION}\"" echo " CMake toolchain file: ${PROJECT_TOOLCHAIN_FILE_CMAKE}" echo " Cmake Build type: ${PROJECT_CMAKE_BUILD_TYPE}" echo " Company name: ${PROJECT_COMPANY_NAME}" diff --git a/scripts/make_common.sh b/scripts/make_common.sh index 6d7b9c26..246982a6 100755 --- a/scripts/make_common.sh +++ b/scripts/make_common.sh @@ -21,7 +21,11 @@ if [ "${PROJECT_IS_MINGW}" == "1" ]; then fi pushd "${PROJECT_BUILD_DIR}" -cmake "${SOURCE_DIR}" -G"Unix Makefiles" ${PROJECT_CMAKE_OPTS} || exit 1 +cmake "${SOURCE_DIR}" -G"Unix Makefiles" ${PROJECT_CMAKE_OPTS} \ + -DPROJECT_COMPANY_NAME="${PROJECT_COMPANY_NAME}" \ + -DPROJECT_COPYRIGHT="${PROJECT_COPYRIGHT}" \ + -DPROJECT_DESCRIPTION="${PROJECT_DESCRIPTION}" || + exit 1 if [ "${PROJECT_BUILD_CLEAN}" == "clean" ]; then make clean