summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-09-19 21:02:51 (GMT)
committer Vincent Sanders <vince@kyllikki.org>2016-09-19 21:02:51 (GMT)
commit608a18caff8d1b994ab24fa74b64885e67e6348e (patch)
tree1b1b7bd1725347b834fd593ab72d6119704dc744
parentb78e887ba097decb2fc774ab70f2bd8a671f9928 (diff)
downloadnetsurf-608a18caff8d1b994ab24fa74b64885e67e6348e.tar.gz
netsurf-608a18caff8d1b994ab24fa74b64885e67e6348e.tar.bz2
remove junk references to old javascript implementations
-rw-r--r--Makefile.config.example7
-rw-r--r--Makefile.defaults10
-rw-r--r--frontends/amiga/Makefile.defaults6
-rw-r--r--frontends/atari/Makefile.defaults4
-rwxr-xr-xutils/jenkins-build.sh35
5 files changed, 10 insertions, 52 deletions
diff --git a/Makefile.config.example b/Makefile.config.example
index 686ffea..aeddc10 100644
--- a/Makefile.config.example
+++ b/Makefile.config.example
@@ -28,11 +28,8 @@
### following line
# override NETSURF_FB_FONTLIB := freetype
-### To enable/disable JavaScript support, uncomment the appropriate line below.
-# override NETSURF_USE_JS := NO
-# override NETSURF_USE_JS := YES
-# override NETSURF_USE_MOZJS := NO
-# override NETSURF_USE_MOZJS := YES
+### To disable JavaScript support, uncomment the appropriate line below.
+# override NETSURF_USE_DUKTAPE := NO
### To change flags to javascript binding generator
# GBFLAGS:=-g
diff --git a/Makefile.defaults b/Makefile.defaults
index 1651a2d..c2a91e6 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -32,7 +32,7 @@
# ----------------------------------------------------------------------------
# Enable NetSurf's use of libcurl for fetching over http(s)
-# Valid options: YES, NO
+# Valid options: YES, NO (highly recommended)
NETSURF_USE_CURL := YES
# Enable NetSurf's use of openssl for fetching over https
@@ -59,12 +59,8 @@ NETSURF_USE_PNG := YES
# Valid options: YES, NO
NETSURF_USE_VIDEO := NO
-# Enable NetSurf's use of spidermonkey for javascript
-# Valid options: YES, NO, AUTO
-NETSURF_USE_JS := NO
-# Javascript support in older debian/ubuntu versions
-NETSURF_USE_MOZJS := NO
-# Or use duktape
+# Enable NetSurf's use of duktape for javascript
+# Valid options: YES, NO
NETSURF_USE_DUKTAPE := YES
# Enable NetSurf's use of libharu for PDF export and GTK printing support.
diff --git a/frontends/amiga/Makefile.defaults b/frontends/amiga/Makefile.defaults
index 1864981..f19d6e3 100644
--- a/frontends/amiga/Makefile.defaults
+++ b/frontends/amiga/Makefile.defaults
@@ -22,12 +22,6 @@ NETSURF_USE_AMIGA_DATATYPES := YES
# Valid options: YES, NO
NETSURF_USE_NSSVG := YES
-# Enable NetSurf's use of Spidermonkey 1.80+
-# Only here to stop the build complaining;
-# enable NETSURF_USE_MOZJS instead for JavaScript support
-# Valid options: NO
-NETSURF_USE_JS := NO
-
# Enable building the source object cache filesystem based backing store.
# implementation.
# Valid options: YES, NO
diff --git a/frontends/atari/Makefile.defaults b/frontends/atari/Makefile.defaults
index b738b48..dd04054 100644
--- a/frontends/atari/Makefile.defaults
+++ b/frontends/atari/Makefile.defaults
@@ -18,10 +18,6 @@ NETSURF_USE_RSVG := AUTO
# Valid options: YES, NO, AUTO
NETSURF_USE_NSSVG := AUTO
-# Enable Spidermonkey JavaScript engine
-# Valid options: YES, NO
-NETSURF_USE_MOZJS := NO
-
# Enable building the source object cache filesystem based backing store.
# implementation.
# Valid options: YES, NO
diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh
index b1f2412..20808b3 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