updated build system

This commit is contained in:
Scott E. Graves 2024-06-27 12:04:37 -05:00
parent d96c6012c5
commit 4d555bce96
4 changed files with 39 additions and 9 deletions

View File

@ -174,6 +174,8 @@ else
PROJECT_BUILD_DIR=${PROJECT_BUILD_DIR}/x86_64 PROJECT_BUILD_DIR=${PROJECT_BUILD_DIR}/x86_64
fi fi
PROJECT_DIST_DIR=${PROJECT_DIST_DIR}/${PROJECT_APP_NAME}
PROJECT_EXTERNAL_BUILD_ROOT=${PROJECT_BUILD_DIR}/deps PROJECT_EXTERNAL_BUILD_ROOT=${PROJECT_BUILD_DIR}/deps
PROJECT_3RD_PARTY_DIR=${SOURCE_DIR}/support/3rd_party PROJECT_3RD_PARTY_DIR=${SOURCE_DIR}/support/3rd_party
@ -252,6 +254,8 @@ 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_PRIVATE_KEY
export PROJECT_PUBLIC_KEY
export PROJECT_REQUIRE_ALPINE export PROJECT_REQUIRE_ALPINE
export PROJECT_STATIC_LINK export PROJECT_STATIC_LINK
export PROJECT_TOOLCHAIN_FILE_CMAKE export PROJECT_TOOLCHAIN_FILE_CMAKE

View File

@ -1,13 +1,4 @@
#!/bin/bash #!/bin/bash
# clean dist on each build
# repertory - add back git rev
# - store in PROJECT_GIT_REV
# add make_package.sh/cmd
# - signature / sha256
# - add PROJECT_PUBLIC_KEY
# - add PROJECT_PRIVATE_KEY
# - [optional] post_package.sh for copy to destination
# update nvim-lua mmr/mmd
CURRENT_DIR=$(dirname "$0") CURRENT_DIR=$(dirname "$0")
CURRENT_DIR=$(realpath ${CURRENT_DIR}) CURRENT_DIR=$(realpath ${CURRENT_DIR})
@ -16,6 +7,11 @@ CURRENT_DIR=$(realpath ${CURRENT_DIR})
mkdir -p "${PROJECT_BUILD_DIR}/build" mkdir -p "${PROJECT_BUILD_DIR}/build"
if [ -d "${PROJECT_DIST_DIR}" ]; then
rm -rf "${PROJECT_DIST_DIR}"
mkdir -p "${PROJECT_DIST_DIR}"
fi
if [ -f "${SOURCE_DIR}/pre_build.sh" ]; then if [ -f "${SOURCE_DIR}/pre_build.sh" ]; then
"${SOURCE_DIR}/pre_build.sh" "${SOURCE_DIR}/pre_build.sh"
fi fi

9
scripts/make_package.cmd Normal file
View File

@ -0,0 +1,9 @@
@echo off
set DEST=%~1
set ARG1=%~2
set ARG2=%~3
pushd "%~dp0%"
call mingw64 -no-start ./make_package.sh "%DEST%" "x86_64" "%ARG1%" "%ARG2%" 1 0 || exit 1
popd

21
scripts/make_package.sh Normal file
View File

@ -0,0 +1,21 @@
#!/bin/bash
DEST_DIR=$1
CURRENT_DIR=$(dirname "$0")
CURRENT_DIR=$(realpath ${CURRENT_DIR})
. "${CURRENT_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6"
if [ ! -d "${PROJECT_DIST_DIR}" ]; then
echo "Dist directory not found: ${PROJECT_DIST_DIR}"
exit 1
fi
if [ "${DEST_DIR}" == "" ] || [ ! -d "${DEST_DIR}" ]; then
echo "Destination directory not found: ${DEST_DIR}"
exit 1
fi
PACKAGE_ROOT=${PROJECT_DIST_DIR}/..
PACKAGE_ROOT=$(realpath ${PACKAGE_ROOT})