remove junk references to old javascript implementations

This commit is contained in:
Vincent Sanders 2016-09-19 22:02:51 +01:00
parent b78e887ba0
commit 608a18caff
5 changed files with 10 additions and 52 deletions

View File

@ -28,11 +28,8 @@
### following line ### following line
# override NETSURF_FB_FONTLIB := freetype # override NETSURF_FB_FONTLIB := freetype
### To enable/disable JavaScript support, uncomment the appropriate line below. ### To disable JavaScript support, uncomment the appropriate line below.
# override NETSURF_USE_JS := NO # override NETSURF_USE_DUKTAPE := NO
# override NETSURF_USE_JS := YES
# override NETSURF_USE_MOZJS := NO
# override NETSURF_USE_MOZJS := YES
### To change flags to javascript binding generator ### To change flags to javascript binding generator
# GBFLAGS:=-g # GBFLAGS:=-g

View File

@ -32,7 +32,7 @@
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Enable NetSurf's use of libcurl for fetching over http(s) # 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 NETSURF_USE_CURL := YES
# Enable NetSurf's use of openssl for fetching over https # Enable NetSurf's use of openssl for fetching over https
@ -59,12 +59,8 @@ NETSURF_USE_PNG := YES
# Valid options: YES, NO # Valid options: YES, NO
NETSURF_USE_VIDEO := NO NETSURF_USE_VIDEO := NO
# Enable NetSurf's use of spidermonkey for javascript # Enable NetSurf's use of duktape for javascript
# Valid options: YES, NO, AUTO # Valid options: YES, NO
NETSURF_USE_JS := NO
# Javascript support in older debian/ubuntu versions
NETSURF_USE_MOZJS := NO
# Or use duktape
NETSURF_USE_DUKTAPE := YES NETSURF_USE_DUKTAPE := YES
# Enable NetSurf's use of libharu for PDF export and GTK printing support. # Enable NetSurf's use of libharu for PDF export and GTK printing support.

View File

@ -22,12 +22,6 @@ NETSURF_USE_AMIGA_DATATYPES := YES
# Valid options: YES, NO # Valid options: YES, NO
NETSURF_USE_NSSVG := YES 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. # Enable building the source object cache filesystem based backing store.
# implementation. # implementation.
# Valid options: YES, NO # Valid options: YES, NO

View File

@ -18,10 +18,6 @@ NETSURF_USE_RSVG := AUTO
# Valid options: YES, NO, AUTO # Valid options: YES, NO, AUTO
NETSURF_USE_NSSVG := 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. # Enable building the source object cache filesystem based backing store.
# implementation. # implementation.
# Valid options: YES, NO # Valid options: YES, NO

View File

@ -40,10 +40,10 @@ OLD_ARTIFACT_COUNT=25
################# Parameter and environment setup ##################### ################# Parameter and environment setup #####################
#identifier for this specific build #identifier for this specific build
IDENTIFIER="$CC-${BUILD_JS}-${BUILD_NUMBER}" IDENTIFIER="$CC-${BUILD_NUMBER}"
# Identifier for build which will be cleaned # 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 # default atari architecture - bletch
ATARIARCH=68020-60 ATARIARCH=68020-60
@ -344,31 +344,6 @@ if [ "${CC}" = "clang" ];then
export CC="clang -Qunused-arguments" export CC="clang -Qunused-arguments"
fi 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 ###### ########### Use distcc if present ######
DISTCC=distcc DISTCC=distcc
@ -385,17 +360,17 @@ fi
########### Build from source ################## ########### Build from source ##################
# Clean first # Clean first
${MAKE} NETSURF_USE_DUKTAPE=${BUILD_DUKTAPE} NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} clean ${MAKE} clean
# Do the Build # 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 ################ ############ Package artifact construction ################
# build the package file # 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 if [ ! -f "${PKG_SRC}${PKG_SFX}" ]; then
# unable to find package file # unable to find package file