docker: allow passing arguments to build
This commit is contained in:
parent
ab9eaef3fc
commit
a8a99bc462
1 changed files with 8 additions and 4 deletions
|
@ -26,6 +26,7 @@ export GCC_ARM_PATH="gcc-arm-none-eabi-$GCC_ARM_VER"
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
local target="$1"
|
local target="$1"
|
||||||
|
shift
|
||||||
|
|
||||||
mkdir -p "$TOOLS_DIR"
|
mkdir -p "$TOOLS_DIR"
|
||||||
|
|
||||||
|
@ -35,7 +36,7 @@ main() {
|
||||||
|
|
||||||
mkdir -p "$BUILD_DIR"
|
mkdir -p "$BUILD_DIR"
|
||||||
|
|
||||||
CmakeGenerate
|
CmakeGenerate "$@"
|
||||||
CmakeBuild $target
|
CmakeBuild $target
|
||||||
BUILD_RESULT=$?
|
BUILD_RESULT=$?
|
||||||
if [ "$DISABLE_POSTBUILD" != "true" -a "$BUILD_RESULT" == 0 ]; then
|
if [ "$DISABLE_POSTBUILD" != "true" -a "$BUILD_RESULT" == 0 ]; then
|
||||||
|
@ -68,13 +69,16 @@ CmakeGenerate() {
|
||||||
-DARM_NONE_EABI_TOOLCHAIN_PATH="$TOOLS_DIR/$GCC_ARM_PATH" \
|
-DARM_NONE_EABI_TOOLCHAIN_PATH="$TOOLS_DIR/$GCC_ARM_PATH" \
|
||||||
-DNRF5_SDK_PATH="$TOOLS_DIR/$NRF_SDK_VER" \
|
-DNRF5_SDK_PATH="$TOOLS_DIR/$NRF_SDK_VER" \
|
||||||
-DBUILD_DFU=1 \
|
-DBUILD_DFU=1 \
|
||||||
-DBUILD_RESOURCES=1
|
-DBUILD_RESOURCES=1 \
|
||||||
|
"$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# CmakeBuild [target [CMAKE_ARGS...]]
|
||||||
|
# CMAKE_ARGS can include a '--' arg, with the same meaning as it has in 'cmake'.
|
||||||
CmakeBuild() {
|
CmakeBuild() {
|
||||||
local target="$1"
|
local target="$1"
|
||||||
[ -n "$target" ] && target="--target $target"
|
[ -n "$target" ] && target="--target $target" && shift
|
||||||
cmake --build "$BUILD_DIR" --config $BUILD_TYPE $target -- -j$(nproc)
|
cmake --build "$BUILD_DIR" --config $BUILD_TYPE $target "$@" -- -j$(nproc)
|
||||||
BUILD_RESULT=$?
|
BUILD_RESULT=$?
|
||||||
return $BUILD_RESULT
|
return $BUILD_RESULT
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue