summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vincent.sanders@collabora.co.uk>2013-05-10 13:58:41 (GMT)
committer Vincent Sanders <vincent.sanders@collabora.co.uk>2013-05-10 13:58:41 (GMT)
commit2558cc2c3108162defaa2f5d20b7201696f220fc (patch)
treef4c1522f364be03d667e355d34414ad00c71354f
parent7f5f1fdbfbbf8781c6bc4479f645770d901e200a (diff)
downloadbuildsystem-2558cc2c3108162defaa2f5d20b7201696f220fc.tar.gz
buildsystem-2558cc2c3108162defaa2f5d20b7201696f220fc.tar.bz2
ensure make TARGET parameter is set
-rwxr-xr-xcitools/jenkins-build.sh20
1 files changed, 12 insertions, 8 deletions
diff --git a/citools/jenkins-build.sh b/citools/jenkins-build.sh
index dd8ef00..894ee97 100755
--- a/citools/jenkins-build.sh
+++ b/citools/jenkins-build.sh
@@ -74,15 +74,19 @@ esac
# here is also where we can adjust other setting based on target
case ${TARGET} in
"m68k-atari-mint")
- TARGET="atari"
+ TARGET_TARGET="atari"
;;
"m5475-atari-mint")
- TARGET="m5475_atari"
+ TARGET_TARGET="m5475_atari"
;;
"powerpc-apple-darwin9")
- TARGET="powerpc_apple_darwin9"
+ TARGET_TARGET="powerpc_apple_darwin9"
+ ;;
+
+ *)
+ TARGET_TARGET=${TARGET}
;;
esac
@@ -98,22 +102,22 @@ export PATH=${PATH}:${PREFIX}/bin
# execute the build steps
# clean target is always first
-make Q= clean TARGET=${TARGET} BUILD=${TARGET_BUILD}
+make Q= clean TARGET=${TARGET_TARGET} BUILD=${TARGET_BUILD}
# either a coverage build or a normal one
if [ "x${TARGET}" = "x${TARGET_COVERAGE}" ]; then
- make Q= TARGET=${TARGET} BUILD=${TARGET_BUILD} coverage
+ make Q= TARGET=${TARGET_TARGET} BUILD=${TARGET_BUILD} coverage
gcovr -x -r .. -o coverage.xml
else
- make Q= TARGET=${TARGET} BUILD=${TARGET_BUILD}
+ make Q= TARGET=${TARGET_TARGET} BUILD=${TARGET_BUILD}
fi
# test if appropriate
if [ "x${TARGET}" = "x${TARGET_TEST}" ]; then
- make Q= TARGET=${TARGET} BUILD=${TARGET_BUILD} test
+ make Q= TARGET=${TARGET_TARGET} BUILD=${TARGET_BUILD} test
fi
# install
if [ "x${TARGET}" = "x${TARGET_INSTALL}" ]; then
- make Q= TARGET=${TARGET} BUILD=${TARGET_BUILD} install
+ make Q= TARGET=${TARGET_TARGET} BUILD=${TARGET_BUILD} install
fi