netsurf: branch master updated. release/3.3-637-g6847fad

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/6847fad65368bab3418eb... ...commit http://git.netsurf-browser.org/netsurf.git/commit/6847fad65368bab3418eb71... ...tree http://git.netsurf-browser.org/netsurf.git/tree/6847fad65368bab3418eb716a... The branch, master has been updated via 6847fad65368bab3418eb716af4f9d485dfe30b1 (commit) from 6d63f7959af64a45b0643d0610fcbdb0c07bfbc4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=6847fad65368bab3418... commit 6847fad65368bab3418eb716af4f9d485dfe30b1 Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; remove javascript build option from jenkins script diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index e34d26c..f85ae4b 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -30,7 +30,6 @@ # TARGET is set to the frontend target to build # HOST is set to the identifier of the toolchain doing the building # CC is the compiler (gcc or clang) -# BUILD_JS is the javascript type (json or jsoff) # BUILD_NUMBER is the CI build number ##### @@ -346,36 +345,29 @@ if [ "${CC}" = "clang" ];then fi # convert javascript parameters -if [ "${BUILD_JS}" = "json" ];then - 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 +case ${HOST} in + "arm-unknown-riscos") + BUILD_MOZJS=NO + BUILD_JS=NO + #BUILD_JS=YES + BUILD_DUKTAPE=YES ;; - esac + "amd64-unknown-openbsd5.4") + BUILD_MOZJS=NO + BUILD_JS=NO + #BUILD_JS=YES + BUILD_DUKTAPE=YES + ;; -else - BUILD_JS=NO - BUILD_MOZJS=NO - BUILD_DUKTAPE=NO -fi + *) + #BUILD_MOZJS=YES + BUILD_MOZJS=NO + BUILD_JS=NO + BUILD_DUKTAPE=YES + ;; + +esac ########### Use distcc if present ###### ----------------------------------------------------------------------- Summary of changes: utils/jenkins-build.sh | 48 ++++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index e34d26c..f85ae4b 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -30,7 +30,6 @@ # TARGET is set to the frontend target to build # HOST is set to the identifier of the toolchain doing the building # CC is the compiler (gcc or clang) -# BUILD_JS is the javascript type (json or jsoff) # BUILD_NUMBER is the CI build number ##### @@ -346,36 +345,29 @@ if [ "${CC}" = "clang" ];then fi # convert javascript parameters -if [ "${BUILD_JS}" = "json" ];then - 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 +case ${HOST} in + "arm-unknown-riscos") + BUILD_MOZJS=NO + BUILD_JS=NO + #BUILD_JS=YES + BUILD_DUKTAPE=YES ;; - esac + "amd64-unknown-openbsd5.4") + BUILD_MOZJS=NO + BUILD_JS=NO + #BUILD_JS=YES + BUILD_DUKTAPE=YES + ;; -else - BUILD_JS=NO - BUILD_MOZJS=NO - BUILD_DUKTAPE=NO -fi + *) + #BUILD_MOZJS=YES + BUILD_MOZJS=NO + BUILD_JS=NO + BUILD_DUKTAPE=YES + ;; + +esac ########### Use distcc if present ###### -- NetSurf Browser