summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rwxr-xr-xutils/jenkins-build.sh35
1 files changed, 5 insertions, 30 deletions
diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh
index b1f2412f5..20808b3fc 100755
--- a/utils/jenkins-build.sh
+++ b/utils/jenkins-build.sh
@@ -40,10 +40,10 @@ OLD_ARTIFACT_COUNT=25
################# Parameter and environment setup #####################
#identifier for this specific build
-IDENTIFIER="$CC-${BUILD_JS}-${BUILD_NUMBER}"
+IDENTIFIER="$CC-${BUILD_NUMBER}"
# Identifier for build which will be cleaned
-OLD_IDENTIFIER="$CC-${BUILD_JS}-$((BUILD_NUMBER - ${OLD_ARTIFACT_COUNT}))"
+OLD_IDENTIFIER="$CC-$((BUILD_NUMBER - ${OLD_ARTIFACT_COUNT}))"
# default atari architecture - bletch
ATARIARCH=68020-60
@@ -344,31 +344,6 @@ if [ "${CC}" = "clang" ];then
export CC="clang -Qunused-arguments"
fi
-# convert javascript parameters
-case ${HOST} in
- "arm-unknown-riscos")
- BUILD_MOZJS=NO
- BUILD_JS=NO
- #BUILD_JS=YES
- BUILD_DUKTAPE=YES
- ;;
-
- "amd64-unknown-openbsd5.4")
- BUILD_MOZJS=NO
- BUILD_JS=NO
- #BUILD_JS=YES
- BUILD_DUKTAPE=YES
- ;;
-
- *)
- #BUILD_MOZJS=YES
- BUILD_MOZJS=NO
- BUILD_JS=NO
- BUILD_DUKTAPE=YES
- ;;
-
-esac
-
########### Use distcc if present ######
DISTCC=distcc
@@ -385,17 +360,17 @@ fi
########### Build from source ##################
# Clean first
-${MAKE} NETSURF_USE_DUKTAPE=${BUILD_DUKTAPE} NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} clean
+${MAKE} clean
# Do the Build
-${MAKE} -j ${PARALLEL} -k NETSURF_USE_DUKTAPE=${BUILD_DUKTAPE} NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} CI_BUILD=${BUILD_NUMBER} ATARIARCH=${ATARIARCH} Q=
+${MAKE} -j ${PARALLEL} -k CI_BUILD=${BUILD_NUMBER} ATARIARCH=${ATARIARCH} Q=
############ Package artifact construction ################
# build the package file
-${MAKE} -k NETSURF_USE_DUKTAPE=${BUILD_DUKTAPE} NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} CI_BUILD=${BUILD_NUMBER} ATARIARCH=${ATARIARCH} package Q=
+${MAKE} -k CI_BUILD=${BUILD_NUMBER} ATARIARCH=${ATARIARCH} package Q=
if [ ! -f "${PKG_SRC}${PKG_SFX}" ]; then
# unable to find package file