From 468668e5189b2b9fcf0b68cf905605ac895487ed Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Thu, 25 Jul 2024 07:21:01 -0500 Subject: [PATCH] updated build system --- scripts/make_package.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/scripts/make_package.sh b/scripts/make_package.sh index 4a75a44d..07c52a2b 100755 --- a/scripts/make_package.sh +++ b/scripts/make_package.sh @@ -36,6 +36,21 @@ if [ ! -d "${DEST_DIR}" ]; then error_exit "dest directory not found: ${DEST_DIR}" 1 fi +FILE_PART=${PROJECT_NAME}_${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_REVISION_VERSION}-${PROJECT_RELEASE_ITER}-${PROJECT_GIT_REV}_${PROJECT_BUILD_ARCH}_${PROJECT_OS} + +OUT_FILE=${FILE_PART}.tar.gz +pushd "${DEST_DIR}" +if [ -f "${OUT_FILE}" ]; then + rm -f "${OUT_FILE}" || error_exit "failed to delete file: ${OUT_FILE}" 1 +fi +if [ -f "${OUT_FILE}.sha256" ]; then + rm -f "${OUT_FILE}.sha256" || error_exit "failed to delete file: ${OUT_FILE}.sha256" 1 +fi +if [ -f "${OUT_FILE}.sig" ]; then + rm -f "${OUT_FILE}.sig" || error_exit "failed to delete file: ${OUT_FILE}.sig" 1 +fi +popd + rsync -av --progress ${PROJECT_DIST_DIR}/ ${TEMP_DIR}/${PROJECT_NAME}/ || error_exit "failed to rsync" 1 pushd "${TEMP_DIR}/${PROJECT_NAME}/" @@ -49,9 +64,6 @@ unset IFS set +f popd -FILE_PART=${PROJECT_NAME}_${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_REVISION_VERSION}-${PROJECT_RELEASE_ITER}-${PROJECT_GIT_REV}_${PROJECT_BUILD_ARCH}_${PROJECT_OS} -OUT_FILE=${FILE_PART}.tar.gz - pushd "${DEST_DIR}" tar cvzf "${OUT_FILE}" -C ${TEMP_DIR} . || error_exit "failed to create archive: ${OUT_FILE}" 1 create_file_validations "${OUT_FILE}"