eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to cope with make tool naming

This commit is contained in:
Vincent Sanders 2014-05-02 11:08:01 +01:00
parent 1eb49059ab
commit c80a281ea5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
utils/jenkins-build.sh
View File

@ -49,6 +49,9 @@ OLD_IDENTIFIER="$CC-${BUILD_JS}-$((BUILD_NUMBER - ${OLD_ARTIFACT_COUNT}))"
# default atari architecture - bletch
ATARIARCH=68020-60
# make tool
MAKE=make
# Ensure the combination of target and toolchain works and set build
# specific parameters too
case ${TARGET} in
@ -169,6 +172,7 @@ case ${TARGET} in
"amd64-unknown-openbsd5.4")
ARTIFACT_TARGET=OpenBSD
MAKE=gmake
;;
*)
@ -344,11 +348,10 @@ fi
########### Build from source ##################
# Clean first
make NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} clean
${MAKE} NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} clean
# Do the Build
make -k NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} CI_BUILD=${BUILD_NUMBER} ATARIARCH=${ATARIARCH} Q=
${MAKE} -k NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} CI_BUILD=${BUILD_NUMBER} ATARIARCH=${ATARIARCH} Q=
@ -356,7 +359,7 @@ make -k NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} CI_BUILD=${B
############ Package artifact construction ################
# build the package file
make -k NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} CI_BUILD=${BUILD_NUMBER} ATARIARCH=${ATARIARCH} package Q=
${MAKE} -k NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} CI_BUILD=${BUILD_NUMBER} ATARIARCH=${ATARIARCH} package Q=
if [ ! -f "${PKG_SRC}${PKG_SFX}" ]; then
# unable to find package file