updated build system

This commit is contained in:
2024-07-25 13:01:03 -05:00
parent 267c272ce5
commit a5c47d3f22
12 changed files with 76 additions and 94 deletions

View File

@ -1,13 +1,12 @@
#!/bin/bash
CURRENT_DIR=$(dirname "$0")
CURRENT_DIR=$(realpath ${CURRENT_DIR})
PROJECT_SCRIPTS_DIR=$(dirname "$0")
PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR})
. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" 0 0
. "${CURRENT_DIR}/env.sh" "$1" "$2" "$3" 0 0
if [ -f "${CURRENT_DIR}/cleanup.sh" ]; then
. "${CURRENT_DIR}/cleanup.sh" "$1" "$2" "$3" 0 0
rm ${CURRENT_DIR}/cleanup.*
if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then
. "${PROJECT_SCRIPTS_DIR}/cleanup.sh" "$1" "$2" "$3" 0 0
rm ${PROJECT_SCRIPTS_DIR}/cleanup.*
fi
if [ "${PROJECT_REQUIRE_ALPINE}" == "ON" ]; then
@ -15,7 +14,7 @@ if [ "${PROJECT_REQUIRE_ALPINE}" == "ON" ]; then
DOCKER_CONTAINER=${PROJECT_NAME}_${DOCKER_NAME}_${PROJECT_BUILD_ARCH}
DOCKER_TAG=${PROJECT_NAME}:${DOCKER_NAME}
. "${CURRENT_DIR}/docker_common.sh" || exit 1
. "${PROJECT_SCRIPTS_DIR}/docker_common.sh" || exit 1
else
"${SOURCE_DIR}/scripts/make_common.sh" "${PROJECT_BUILD_ARCH}" "${PROJECT_CMAKE_BUILD_TYPE}" "${PROJECT_BUILD_CLEAN}" 0 0 || exit 1
"${PROJECT_SOURCE_DIR}/scripts/make_common.sh" "${PROJECT_BUILD_ARCH}" "${PROJECT_CMAKE_BUILD_TYPE}" "${PROJECT_BUILD_CLEAN}" 0 0 || exit 1
fi