netsurf: branch master updated. release/3.10-323-g14fba9a

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/14fba9afdce36db0f4465... ...commit http://git.netsurf-browser.org/netsurf.git/commit/14fba9afdce36db0f446515... ...tree http://git.netsurf-browser.org/netsurf.git/tree/14fba9afdce36db0f4465159c... The branch, master has been updated via 14fba9afdce36db0f4465159ce976f24b6d4916c (commit) via d893a6d60282216fad0ed02c0e7a793e61c39631 (commit) via beaeec57922cdb2c4ef79ed036fc6242a35a2455 (commit) from 20f5599514465186cf15f87268cd28d08545c176 (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=14fba9afdce36db0f44... commit 14fba9afdce36db0f4465159ce976f24b6d4916c Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <mdrake.unique(a)gmail.com&gt; GitHub CI: Make codeql job name match other jobs diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 1f01b73..5027d05 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -4,7 +4,7 @@ on: [push] jobs: codeql: - name: Analyze with CodeQL + name: codeql runs-on: ubuntu-22.04 strategy: commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d893a6d60282216fad0... commit d893a6d60282216fad0ed02c0e7a793e61c39631 Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <mdrake.unique(a)gmail.com&gt; GitHub CI: Update for new env.sh diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 69528c9..13b59c3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -53,7 +53,7 @@ jobs: run: | export TARGET_WORKSPACE="$(pwd)/projects" source docs/env.sh - ns-clone -n -s + ns-clone -d -s ns-make-tools install ns-make-libs install diff --git a/.github/workflows/monkey-test.yaml b/.github/workflows/monkey-test.yaml index 5f93e35..421bf3b 100644 --- a/.github/workflows/monkey-test.yaml +++ b/.github/workflows/monkey-test.yaml @@ -42,7 +42,7 @@ jobs: run: | export TARGET_WORKSPACE="$(pwd)/projects" source docs/env.sh - ns-clone -n -s + ns-clone -d -s ns-make-tools install ns-make-libs install diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 3f92548..1f01b73 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -38,7 +38,7 @@ jobs: run: | export TARGET_WORKSPACE="$(pwd)/projects" source docs/env.sh - ns-clone -n -s + ns-clone -d -s ns-make-tools install ns-make-libs install commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=beaeec57922cdb2c4ef... commit beaeec57922cdb2c4ef79ed036fc6242a35a2455 Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <mdrake.unique(a)gmail.com&gt; env.sh: Add support for building only a lib Allow the build environment to be set up for building a library only instead of the whole browser. diff --git a/docs/env.sh b/docs/env.sh index b7d33fc..4cb056e 100644 --- a/docs/env.sh +++ b/docs/env.sh @@ -263,64 +263,81 @@ NS_GIT="git://git.netsurf-browser.org" # Buildsystem: everything depends on this NS_BUILDSYSTEM="buildsystem" -# internal libraries all frontends require (order is important) -NS_INTERNAL_LIBS="libwapcaplet libparserutils libhubbub libdom libcss libnsgif libnsbmp libutf8proc libnsutils libnspsl libnslog" +NS_TOOLS="" +NS_FRONTEND_LIBS="" -# The browser itself -NS_BROWSER="netsurf" +BUILD_TARGET="${TARGET:-netsurf}" - -# add target specific libraries -case "${HOST}" in - i586-pc-haiku) - # tools required to build the browser for haiku (beos) - NS_TOOLS="nsgenbind" - # libraries required for the haiku target abi - NS_FRONTEND_LIBS="libsvgtiny" - ;; - *arwin*) - # tools required to build the browser for OS X - NS_TOOLS="" - # libraries required for the Darwin target abi - NS_FRONTEND_LIBS="libsvgtiny libnsfb" - ;; - arm-unknown-riscos|arm-riscos-gnueabi*) - # tools required to build the browser for RISC OS - NS_TOOLS="nsgenbind" - # libraries required for the risc os target abi - NS_FRONTEND_LIBS="libsvgtiny librufl libpencil librosprite" - ;; - *-atari-mint) - # tools required to build the browser for atari - NS_TOOLS="" - # libraries required for the atari frontend - NS_FRONTEND_LIBS="" - ;; - ppc-amigaos) - # default tools required to build the browser - NS_TOOLS="nsgenbind" - # default additional internal libraries - NS_FRONTEND_LIBS="libsvgtiny" +case "$BUILD_TARGET" in + libhubbub) + NS_INTERNAL_LIBS="libparserutils" ;; - m68k-unknown-amigaos) - # default tools required to build the browser - NS_TOOLS="nsgenbind" - # default additional internal libraries - NS_FRONTEND_LIBS="libsvgtiny" + + libdom) + NS_INTERNAL_LIBS="libwapcaplet libparserutils libhubbub" ;; - *-unknown-freebsd*) - # tools required to build the browser for freebsd - NS_TOOLS="" - # libraries required for the freebsd frontend - NS_FRONTEND_LIBS="" - # select gnu make - MAKE=gmake + + libcss) + NS_INTERNAL_LIBS="libwapcaplet libparserutils" ;; - *) - # default tools required to build the browser - NS_TOOLS="nsgenbind" - # default additional internal libraries - NS_FRONTEND_LIBS="libsvgtiny libnsfb" + + netsurf) + # internal libraries all frontends require (order is important) + NS_INTERNAL_LIBS="libwapcaplet libparserutils libhubbub libdom libcss libnsgif libnsbmp libutf8proc libnsutils libnspsl libnslog" + + # add target specific libraries + case "${HOST}" in + i586-pc-haiku) + # tools required to build the browser for haiku (beos) + NS_TOOLS="nsgenbind" + # libraries required for the haiku target abi + NS_FRONTEND_LIBS="libsvgtiny" + ;; + *arwin*) + # tools required to build the browser for OS X + NS_TOOLS="" + # libraries required for the Darwin target abi + NS_FRONTEND_LIBS="libsvgtiny libnsfb" + ;; + arm-unknown-riscos|arm-riscos-gnueabi*) + # tools required to build the browser for RISC OS + NS_TOOLS="nsgenbind" + # libraries required for the risc os target abi + NS_FRONTEND_LIBS="libsvgtiny librufl libpencil librosprite" + ;; + *-atari-mint) + # tools required to build the browser for atari + NS_TOOLS="" + # libraries required for the atari frontend + NS_FRONTEND_LIBS="" + ;; + ppc-amigaos) + # default tools required to build the browser + NS_TOOLS="nsgenbind" + # default additional internal libraries + NS_FRONTEND_LIBS="libsvgtiny" + ;; + m68k-unknown-amigaos) + # default tools required to build the browser + NS_TOOLS="nsgenbind" + # default additional internal libraries + NS_FRONTEND_LIBS="libsvgtiny" + ;; + *-unknown-freebsd*) + # tools required to build the browser for freebsd + NS_TOOLS="" + # libraries required for the freebsd frontend + NS_FRONTEND_LIBS="" + # select gnu make + MAKE=gmake + ;; + *) + # default tools required to build the browser + NS_TOOLS="nsgenbind" + # default additional internal libraries + NS_FRONTEND_LIBS="libsvgtiny libnsfb" + ;; + esac ;; esac @@ -331,7 +348,7 @@ export MAKE # git pull in all repos parameters are passed to git pull ns-pull() { - for REPO in $(echo ${NS_BUILDSYSTEM} ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_TOOLS} ${NS_BROWSER}) ; do + for REPO in $(echo ${NS_BUILDSYSTEM} ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_TOOLS} ${BUILD_TARGET}) ; do echo -n " GIT: Pulling ${REPO}: " if [ -f "${TARGET_WORKSPACE}/${REPO}/.git/config" ]; then (cd ${TARGET_WORKSPACE}/${REPO} && git pull $*; ) @@ -345,10 +362,11 @@ ns-pull() ns-clone() { SHALLOW="" + SKIP="" while [ $# -gt 0 ] do case "$1" in - -n | --not-netsurf) NS_BROWSER= + -d | --deps-only) SKIP="${BUILD_TARGET}" shift ;; -s | --shallow) SHALLOW="--depth 1" @@ -364,7 +382,8 @@ ns-clone() done mkdir -p ${TARGET_WORKSPACE} - for REPO in $(echo ${NS_BUILDSYSTEM} ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_RISCOS_LIBS} ${NS_TOOLS} ${NS_BROWSER}) ; do + for REPO in $(echo ${NS_BUILDSYSTEM} ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_RISCOS_LIBS} ${NS_TOOLS} ${BUILD_TARGET}) ; do + [ "x${REPO}" != "x${SKIP}" ] || continue echo -n " GIT: Cloning ${REPO}: " if [ -f ${TARGET_WORKSPACE}/${REPO}/.git/config ]; then echo "Repository already present" ----------------------------------------------------------------------- Summary of changes: .github/workflows/build.yaml | 2 +- .github/workflows/monkey-test.yaml | 2 +- .github/workflows/static-analysis.yaml | 4 +- docs/env.sh | 131 ++++++++++++++++++-------------- 4 files changed, 79 insertions(+), 60 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 69528c9..13b59c3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -53,7 +53,7 @@ jobs: run: | export TARGET_WORKSPACE="$(pwd)/projects" source docs/env.sh - ns-clone -n -s + ns-clone -d -s ns-make-tools install ns-make-libs install diff --git a/.github/workflows/monkey-test.yaml b/.github/workflows/monkey-test.yaml index 5f93e35..421bf3b 100644 --- a/.github/workflows/monkey-test.yaml +++ b/.github/workflows/monkey-test.yaml @@ -42,7 +42,7 @@ jobs: run: | export TARGET_WORKSPACE="$(pwd)/projects" source docs/env.sh - ns-clone -n -s + ns-clone -d -s ns-make-tools install ns-make-libs install diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 3f92548..5027d05 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -4,7 +4,7 @@ on: [push] jobs: codeql: - name: Analyze with CodeQL + name: codeql runs-on: ubuntu-22.04 strategy: @@ -38,7 +38,7 @@ jobs: run: | export TARGET_WORKSPACE="$(pwd)/projects" source docs/env.sh - ns-clone -n -s + ns-clone -d -s ns-make-tools install ns-make-libs install diff --git a/docs/env.sh b/docs/env.sh index b7d33fc..4cb056e 100644 --- a/docs/env.sh +++ b/docs/env.sh @@ -263,64 +263,81 @@ NS_GIT="git://git.netsurf-browser.org" # Buildsystem: everything depends on this NS_BUILDSYSTEM="buildsystem" -# internal libraries all frontends require (order is important) -NS_INTERNAL_LIBS="libwapcaplet libparserutils libhubbub libdom libcss libnsgif libnsbmp libutf8proc libnsutils libnspsl libnslog" +NS_TOOLS="" +NS_FRONTEND_LIBS="" -# The browser itself -NS_BROWSER="netsurf" +BUILD_TARGET="${TARGET:-netsurf}" - -# add target specific libraries -case "${HOST}" in - i586-pc-haiku) - # tools required to build the browser for haiku (beos) - NS_TOOLS="nsgenbind" - # libraries required for the haiku target abi - NS_FRONTEND_LIBS="libsvgtiny" - ;; - *arwin*) - # tools required to build the browser for OS X - NS_TOOLS="" - # libraries required for the Darwin target abi - NS_FRONTEND_LIBS="libsvgtiny libnsfb" - ;; - arm-unknown-riscos|arm-riscos-gnueabi*) - # tools required to build the browser for RISC OS - NS_TOOLS="nsgenbind" - # libraries required for the risc os target abi - NS_FRONTEND_LIBS="libsvgtiny librufl libpencil librosprite" - ;; - *-atari-mint) - # tools required to build the browser for atari - NS_TOOLS="" - # libraries required for the atari frontend - NS_FRONTEND_LIBS="" - ;; - ppc-amigaos) - # default tools required to build the browser - NS_TOOLS="nsgenbind" - # default additional internal libraries - NS_FRONTEND_LIBS="libsvgtiny" +case "$BUILD_TARGET" in + libhubbub) + NS_INTERNAL_LIBS="libparserutils" ;; - m68k-unknown-amigaos) - # default tools required to build the browser - NS_TOOLS="nsgenbind" - # default additional internal libraries - NS_FRONTEND_LIBS="libsvgtiny" + + libdom) + NS_INTERNAL_LIBS="libwapcaplet libparserutils libhubbub" ;; - *-unknown-freebsd*) - # tools required to build the browser for freebsd - NS_TOOLS="" - # libraries required for the freebsd frontend - NS_FRONTEND_LIBS="" - # select gnu make - MAKE=gmake + + libcss) + NS_INTERNAL_LIBS="libwapcaplet libparserutils" ;; - *) - # default tools required to build the browser - NS_TOOLS="nsgenbind" - # default additional internal libraries - NS_FRONTEND_LIBS="libsvgtiny libnsfb" + + netsurf) + # internal libraries all frontends require (order is important) + NS_INTERNAL_LIBS="libwapcaplet libparserutils libhubbub libdom libcss libnsgif libnsbmp libutf8proc libnsutils libnspsl libnslog" + + # add target specific libraries + case "${HOST}" in + i586-pc-haiku) + # tools required to build the browser for haiku (beos) + NS_TOOLS="nsgenbind" + # libraries required for the haiku target abi + NS_FRONTEND_LIBS="libsvgtiny" + ;; + *arwin*) + # tools required to build the browser for OS X + NS_TOOLS="" + # libraries required for the Darwin target abi + NS_FRONTEND_LIBS="libsvgtiny libnsfb" + ;; + arm-unknown-riscos|arm-riscos-gnueabi*) + # tools required to build the browser for RISC OS + NS_TOOLS="nsgenbind" + # libraries required for the risc os target abi + NS_FRONTEND_LIBS="libsvgtiny librufl libpencil librosprite" + ;; + *-atari-mint) + # tools required to build the browser for atari + NS_TOOLS="" + # libraries required for the atari frontend + NS_FRONTEND_LIBS="" + ;; + ppc-amigaos) + # default tools required to build the browser + NS_TOOLS="nsgenbind" + # default additional internal libraries + NS_FRONTEND_LIBS="libsvgtiny" + ;; + m68k-unknown-amigaos) + # default tools required to build the browser + NS_TOOLS="nsgenbind" + # default additional internal libraries + NS_FRONTEND_LIBS="libsvgtiny" + ;; + *-unknown-freebsd*) + # tools required to build the browser for freebsd + NS_TOOLS="" + # libraries required for the freebsd frontend + NS_FRONTEND_LIBS="" + # select gnu make + MAKE=gmake + ;; + *) + # default tools required to build the browser + NS_TOOLS="nsgenbind" + # default additional internal libraries + NS_FRONTEND_LIBS="libsvgtiny libnsfb" + ;; + esac ;; esac @@ -331,7 +348,7 @@ export MAKE # git pull in all repos parameters are passed to git pull ns-pull() { - for REPO in $(echo ${NS_BUILDSYSTEM} ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_TOOLS} ${NS_BROWSER}) ; do + for REPO in $(echo ${NS_BUILDSYSTEM} ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_TOOLS} ${BUILD_TARGET}) ; do echo -n " GIT: Pulling ${REPO}: " if [ -f "${TARGET_WORKSPACE}/${REPO}/.git/config" ]; then (cd ${TARGET_WORKSPACE}/${REPO} && git pull $*; ) @@ -345,10 +362,11 @@ ns-pull() ns-clone() { SHALLOW="" + SKIP="" while [ $# -gt 0 ] do case "$1" in - -n | --not-netsurf) NS_BROWSER= + -d | --deps-only) SKIP="${BUILD_TARGET}" shift ;; -s | --shallow) SHALLOW="--depth 1" @@ -364,7 +382,8 @@ ns-clone() done mkdir -p ${TARGET_WORKSPACE} - for REPO in $(echo ${NS_BUILDSYSTEM} ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_RISCOS_LIBS} ${NS_TOOLS} ${NS_BROWSER}) ; do + for REPO in $(echo ${NS_BUILDSYSTEM} ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_RISCOS_LIBS} ${NS_TOOLS} ${BUILD_TARGET}) ; do + [ "x${REPO}" != "x${SKIP}" ] || continue echo -n " GIT: Cloning ${REPO}: " if [ -f ${TARGET_WORKSPACE}/${REPO}/.git/config ]; then echo "Repository already present" -- NetSurf Browser