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

update build system

Browse Source
This commit is contained in:
Scott E. Graves 2024-07-09 12:22:47 -05:00
parent 81dc6d1269
commit 466b3fcead
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/env.sh
View File

@ -230,6 +230,12 @@ fi
PATH="${PROJECT_EXTERNAL_BUILD_ROOT}/bin:${PATH}" PATH="${PROJECT_EXTERNAL_BUILD_ROOT}/bin:${PATH}"
if [ "${PROJECT_IS_MINGW}" == "1" ]; then
PROJECT_OS=win32
else
PROJECT_OS=linux
fi
export MSYS export MSYS
export NUM_JOBS export NUM_JOBS
export OPENSSL_ROOT_DIR export OPENSSL_ROOT_DIR
@ -254,6 +260,7 @@ export PROJECT_LINK_TYPE
export PROJECT_MINGW64_COPY_DEPENDENCIES export PROJECT_MINGW64_COPY_DEPENDENCIES
export PROJECT_MINGW64_DOCKER_BUILD_ARGS export PROJECT_MINGW64_DOCKER_BUILD_ARGS
export PROJECT_MSYS2_PACKAGE_LIST export PROJECT_MSYS2_PACKAGE_LIST
export PROJECT_OS
export PROJECT_PRIVATE_KEY export PROJECT_PRIVATE_KEY
export PROJECT_PUBLIC_KEY export PROJECT_PUBLIC_KEY
export PROJECT_REQUIRE_ALPINE export PROJECT_REQUIRE_ALPINE

11
scripts/make_package.cmd
View File

@ -2,11 +2,12 @@
setlocal setlocal
set DEST=%~1 set VERSION=%~1
set ARG1=%~2 set DEST=%~2
set ARG2=%~3 set ARG1=%~3
set ARG3=%~4 set ARG2=%~4
set ARG3=%~5
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 "%VERSION%" "%DEST%" "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
popd popd

12
scripts/make_package.sh
View File

@ -1,11 +1,12 @@
#!/bin/bash #!/bin/bash
DEST_DIR=$(realpath $1) PROJECT_VERSION=$1
DEST_DIR=$(realpath $2)
CURRENT_DIR=$(dirname "$0") CURRENT_DIR=$(dirname "$0")
CURRENT_DIR=$(realpath ${CURRENT_DIR}) CURRENT_DIR=$(realpath ${CURRENT_DIR})
. "${CURRENT_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6" . "${CURRENT_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7"
TEMP_DIR=$(mktemp -d) TEMP_DIR=$(mktemp -d)
@ -15,6 +16,11 @@ function exit_and_clean() {
exit $2 exit $2
} }
if [ "${PROJECT_VERSION}" == "" ]; then
echo "Project version not set"
exit 1
fi
if [ ! -d "${PROJECT_DIST_DIR}" ]; then if [ ! -d "${PROJECT_DIST_DIR}" ]; then
echo "Dist directory not found: ${PROJECT_DIST_DIR}" echo "Dist directory not found: ${PROJECT_DIST_DIR}"
exit 1 exit 1
@ -31,7 +37,7 @@ PACKAGE_ROOT=$(realpath ${PACKAGE_ROOT})
rsync -av --progress ${PACKAGE_ROOT}/ ${TEMP_DIR}/ || exit_and_clean "Failed to rsync" 1 rsync -av --progress ${PACKAGE_ROOT}/ ${TEMP_DIR}/ || exit_and_clean "Failed to rsync" 1
pushd "${DEST_DIR}" pushd "${DEST_DIR}"
tar cvzf ${PROJECT_APP_NAME}.tar.gz -C ${TEMP_DIR} . || exit_and_clean "Failed to create archive" 1 tar cvzf ${PROJECT_APP_NAME}_${PROJECT_VERSION}_${PROJECT_BUILD_ARCH}_${PROJECT_OS}.tar.gz -C ${TEMP_DIR} . || exit_and_clean "Failed to create archive" 1
popd popd
exit_and_clean "Created package successfully" 0 exit_and_clean "Created package successfully" 0