updated build system
This commit is contained in:
parent
097507a2d9
commit
0c414fc8a6
@ -32,6 +32,11 @@ if(PROJECT_BUILD)
|
|||||||
)
|
)
|
||||||
|
|
||||||
include(project.cmake)
|
include(project.cmake)
|
||||||
|
|
||||||
|
if (PROJECT_VERSION)
|
||||||
|
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/dist/version.sh "export PROJECT_VERSION=${PROJECT_VERSION}")
|
||||||
|
add_definitions(-DPROJECT_VERSION=${PROJECT_VERSION})
|
||||||
|
endif()
|
||||||
else()
|
else()
|
||||||
message(STATUS "-=[CMake Settings]=-")
|
message(STATUS "-=[CMake Settings]=-")
|
||||||
message(STATUS " C standard: ${CMAKE_C_STANDARD}")
|
message(STATUS " C standard: ${CMAKE_C_STANDARD}")
|
||||||
|
@ -2,12 +2,11 @@
|
|||||||
|
|
||||||
setlocal
|
setlocal
|
||||||
|
|
||||||
set VERSION=%~1
|
set DEST=%~1
|
||||||
set DEST=%~2
|
set ARG1=%~2
|
||||||
set ARG1=%~3
|
set ARG2=%~3
|
||||||
set ARG2=%~4
|
set ARG3=%~4
|
||||||
set ARG3=%~5
|
|
||||||
|
|
||||||
pushd "%~dp0%"
|
pushd "%~dp0%"
|
||||||
call mingw64 -no-start ./make_package.sh "%VERSION%" "%DEST%" "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
|
call mingw64 -no-start ./make_package.sh "%DEST%" "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
|
||||||
popd
|
popd
|
||||||
|
@ -1,14 +1,16 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
PROJECT_VERSION=$1
|
|
||||||
DEST_DIR=$(realpath $2)
|
DEST_DIR=$(realpath $2)
|
||||||
|
TEMP_DIR=$(mktemp -d)
|
||||||
|
|
||||||
CURRENT_DIR=$(dirname "$0")
|
CURRENT_DIR=$(dirname "$0")
|
||||||
CURRENT_DIR=$(realpath ${CURRENT_DIR})
|
CURRENT_DIR=$(realpath ${CURRENT_DIR})
|
||||||
|
|
||||||
. "${CURRENT_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7"
|
. "${CURRENT_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7"
|
||||||
|
|
||||||
TEMP_DIR=$(mktemp -d)
|
if [ -f "../dist/version.sh" ]; then
|
||||||
|
source ../dist/version.sh
|
||||||
|
fi
|
||||||
|
|
||||||
function exit_and_clean() {
|
function exit_and_clean() {
|
||||||
echo $1
|
echo $1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user