BlockStorage/repertory
1
0
Fork 0
Code Issues 7 Pull Requests Releases 6 Wiki Activity

updated build system
Some checks reported errors
BlockStorage/repertory/pipeline/head Something is wrong with the build of this commit
Details

Browse Source
This commit is contained in:
Scott E. Graves 2024-07-27 10:00:59 -05:00
parent 78ef412516
commit aa04371663
4 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.jenkins_builds
View File

@ -22,7 +22,6 @@ pipeline {
retry(2) { retry(2) {
sleep time: 5, unit: 'SECONDS' sleep time: 5, unit: 'SECONDS'
sh 'scripts/make_unix.sh' sh 'scripts/make_unix.sh'
sh 'scripts/make_package.sh'
} }
} }
} }
@ -34,7 +33,6 @@ pipeline {
retry(2) { retry(2) {
sleep time: 5, unit: 'SECONDS' sleep time: 5, unit: 'SECONDS'
sh 'scripts/make_win32.sh' sh 'scripts/make_win32.sh'
sh 'scripts/make_package.sh "" "" "" "" 1 0'
} }
} }
} }
@ -46,7 +44,6 @@ pipeline {
retry(2) { retry(2) {
sleep time: 5, unit: 'SECONDS' sleep time: 5, unit: 'SECONDS'
sh 'scripts/make_unix.sh aarch64' sh 'scripts/make_unix.sh aarch64'
sh 'scripts/make_package.sh "" aarch64'
} }
} }
} }

2
scripts/make_common.sh
View File

@ -85,3 +85,5 @@ ln -sf "${PROJECT_BUILD_DIR}/build/compile_commands.json" "${PROJECT_SOURCE_DIR}
if [ -f "${PROJECT_SOURCE_DIR}/post_build.sh" ]; then if [ -f "${PROJECT_SOURCE_DIR}/post_build.sh" ]; then
"${PROJECT_SOURCE_DIR}/post_build.sh" "${PROJECT_SOURCE_DIR}/post_build.sh"
fi fi
. "${PROJECT_SCRIPTS_DIR}/make_package.sh" "$1" "$2" "$3" "$4" "$5"

9
scripts/make_package.cmd
View File

@ -2,11 +2,10 @@
setlocal setlocal
set DEST=%~1 set ARG1=%~1
set ARG1=%~2 set ARG2=%~2
set ARG2=%~3 set ARG3=%~3
set ARG3=%~4
pushd "%~dp0%" pushd "%~dp0%"
call mingw64 -no-start ./make_package.sh "%DEST%" "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1 call mingw64 -no-start ./make_package.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
popd popd

17
scripts/make_package.sh
View File

@ -2,11 +2,9 @@
TEMP_DIR=$(mktemp -d) TEMP_DIR=$(mktemp -d)
DEST_DIR=$1
PROJECT_SCRIPTS_DIR=$(realpath "$0") PROJECT_SCRIPTS_DIR=$(realpath "$0")
PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}") PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
. "${PROJECT_SCRIPTS_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6" . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5"
function error_exit() { function error_exit() {
echo $1 echo $1
@ -27,16 +25,7 @@ if [ ! -d "${PROJECT_DIST_DIR}" ]; then
error_exit "dist directory not found: ${PROJECT_DIST_DIR}" 2 error_exit "dist directory not found: ${PROJECT_DIST_DIR}" 2
fi fi
if [ "${DEST_DIR}" == "" ]; then pushd "${PROJECT_DIST_DIR}"
DEST_DIR="${PROJECT_DIST_DIR}"
fi
DEST_DIR=$(realpath "${DEST_DIR}")
if [ ! -d "${DEST_DIR}" ]; then
error_exit "dest directory not found: ${DEST_DIR}" 1
fi
pushd "${DEST_DIR}"
if [ -f "${PROJECT_OUT_FILE}" ]; then if [ -f "${PROJECT_OUT_FILE}" ]; then
rm -f "${PROJECT_OUT_FILE}" || error_exit "failed to delete file: ${PROJECT_OUT_FILE}" 1 rm -f "${PROJECT_OUT_FILE}" || error_exit "failed to delete file: ${PROJECT_OUT_FILE}" 1
fi fi
@ -69,7 +58,7 @@ unset IFS
set +f set +f
popd popd
pushd "${DEST_DIR}" pushd "${PROJECT_DIST_DIR}"
tar cvzf "${PROJECT_OUT_FILE}" -C ${TEMP_DIR} . || error_exit "failed to create archive: ${PROJECT_OUT_FILE}" 1 tar cvzf "${PROJECT_OUT_FILE}" -C ${TEMP_DIR} . || error_exit "failed to create archive: ${PROJECT_OUT_FILE}" 1
create_file_validations "${PROJECT_OUT_FILE}" create_file_validations "${PROJECT_OUT_FILE}"
popd popd