summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2014-12-19 13:29:12 +0000
committerVincent Sanders <vince@kyllikki.org>2014-12-19 13:30:20 +0000
commit876b6cbeb0eaf718f17bdbadf37182cb72730d81 (patch)
tree625795fc9ea0439202b4962dbb17399f676463d1
parentef43be99895f9da0fed1806432fd23dc9f12d36e (diff)
downloadnetsurf-876b6cbeb0eaf718f17bdbadf37182cb72730d81.tar.gz
netsurf-876b6cbeb0eaf718f17bdbadf37182cb72730d81.tar.bz2
fix BUILD/HOST usage to work with fixed buildsystem
-rw-r--r--Docs/env.sh48
-rwxr-xr-xutils/jenkins-build.sh90
2 files changed, 81 insertions, 57 deletions
diff --git a/Docs/env.sh b/Docs/env.sh
index ad85d81d8..3456c4d84 100644
--- a/Docs/env.sh
+++ b/Docs/env.sh
@@ -3,7 +3,7 @@
# NetSurf Library, tool and browser support script
#
# Usage: source env.sh
-# TARGET_ABI sets the target for library builds
+# TARGET_ABI / HOST sets the target for library builds
# TARGET_WORKSPACE is the workspace directory to keep the sandboxes
#
# This script allows NetSurf and its libraries to be built without
@@ -13,8 +13,19 @@
# Released under the MIT Licence
# parameters
-if [ "x${TARGET_ABI}" = "x" ]; then
- TARGET_ABI=$(cc -dumpmachine)
+
+# The system doing the building
+if [ "x${BUILD}" = "x" ]; then
+ BUILD=$(cc -dumpmachine)
+fi
+
+# Get the host build if unset
+if [ "x${HOST}" = "x" ]; then
+ if [ "x${TARGET_ABI}" = "x" ]; then
+ HOST=${BUILD}
+ else
+ HOST=${TARGET_ABI}
+ fi
fi
if [ "x${TARGET_WORKSPACE}" = "x" ]; then
@@ -33,16 +44,17 @@ if [ "x${NETSURF_GTK_MAJOR}" = "x" ]; then
NETSURF_GTK_MAJOR=3
fi
-# The host system doing the building
-HOST_ABI=$(cc -dumpmachine)
-# setup environment
-echo "HOST_ABI=${HOST_ABI}"
-echo "TARGET_ABI=${TARGET_ABI}"
+###############################################################################
+# Setup environment
+###############################################################################
+
+echo "BUILD=${BUILD}"
+echo "HOST=${HOST}"
echo "TARGET_WORKSPACE=${TARGET_WORKSPACE}"
echo "USE_CPUS=${USE_CPUS}"
-export PREFIX=${TARGET_WORKSPACE}/inst-${TARGET_ABI}
+export PREFIX=${TARGET_WORKSPACE}/inst-${HOST}
export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}::
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PREFIX}/lib
export PATH=${PATH}:${PREFIX}/bin
@@ -58,7 +70,7 @@ NS_INTERNAL_LIBS="buildsystem libwapcaplet libparserutils libhubbub libdom libcs
NS_BROWSER="netsurf"
# add target specific libraries
-case "${TARGET_ABI}" in
+case "${HOST}" in
i586-pc-haiku)
# tools required to build the browser for haiku (beos)
NS_TOOLS=""
@@ -83,6 +95,12 @@ case "${TARGET_ABI}" in
# 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"
+ ;;
*)
# default tools required to build the browser
NS_TOOLS="nsgenbind"
@@ -211,11 +229,17 @@ ns-make-libs()
for REPO in $(echo ${NS_TOOLS}); do
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
make -C ${TARGET_WORKSPACE}/${REPO} $USE_CPUS $*
+ if [ $? -ne 0]; then
+ exit $?
+ fi
done
for REPO in $(echo ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS}); do
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
- make -C ${TARGET_WORKSPACE}/${REPO} BUILD=${TARGET_ABI} $USE_CPUS $*
+ make -C ${TARGET_WORKSPACE}/${REPO} HOST=${HOST} $USE_CPUS $*
+ if [ $? -ne 0]; then
+ exit $?
+ fi
done
}
@@ -223,7 +247,7 @@ ns-make-libs()
ns-make-libnsfb()
{
echo " MAKE: make -C libnsfb $USE_CPUS $*"
- make -C ${TARGET_WORKSPACE}/libnsfb BUILD=${TARGET_ABI} $USE_CPUS $*
+ make -C ${TARGET_WORKSPACE}/libnsfb HOST=${HOST} $USE_CPUS $*
}
# pulls all repos and makes and installs the libraries and tools
diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh
index b4704c9b1..e7de93d3a 100755
--- a/utils/jenkins-build.sh
+++ b/utils/jenkins-build.sh
@@ -28,7 +28,7 @@
#
# TARGET is set to the frontend target to build
-# BUILD is set to the identifier of the toolchain doing the building
+# 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
@@ -56,13 +56,13 @@ MAKE=make
# specific parameters too
case ${TARGET} in
"riscos")
- case ${BUILD} in
+ case ${HOST} in
"arm-unknown-riscos")
ARTIFACT_TARGET=riscos
;;
*)
- echo "Target \"${TARGET}\" cannot be built on \"${BUILD})\""
+ echo "Target \"${TARGET}\" cannot be built on \"${HOST})\""
exit 1
;;
@@ -73,13 +73,13 @@ case ${TARGET} in
;;
"haiku")
- case ${BUILD} in
+ case ${HOST} in
"i586-pc-haiku")
ARTIFACT_TARGET=Haiku
;;
*)
- echo "Target \"${TARGET}\" cannot be built on \"${BUILD})\""
+ echo "Target \"${TARGET}\" cannot be built on \"${HOST})\""
exit 1
;;
@@ -91,13 +91,13 @@ case ${TARGET} in
"windows")
- case ${BUILD} in
+ case ${HOST} in
"i686-w64-mingw32")
ARTIFACT_TARGET=windows
;;
*)
- echo "Target \"${TARGET}\" cannot be built on \"${BUILD})\""
+ echo "Target \"${TARGET}\" cannot be built on \"${HOST})\""
exit 1
;;
@@ -109,11 +109,11 @@ case ${TARGET} in
"cocoa")
- case ${BUILD} in
+ case ${HOST} in
"i686-apple-darwin10")
ARTIFACT_TARGET=Darwin
- IDENTIFIER="${BUILD}-${IDENTIFIER}"
- OLD_IDENTIFIER="${BUILD}-${OLD_IDENTIFIER}"
+ IDENTIFIER="${HOST}-${IDENTIFIER}"
+ OLD_IDENTIFIER="${HOST}-${OLD_IDENTIFIER}"
;;
"powerpc-apple-darwin9")
@@ -123,7 +123,7 @@ case ${TARGET} in
;;
*)
- echo "Target \"${TARGET}\" cannot be built on \"${BUILD})\""
+ echo "Target \"${TARGET}\" cannot be built on \"${HOST})\""
exit 1
;;
@@ -135,13 +135,13 @@ case ${TARGET} in
"amiga")
- case ${BUILD} in
+ case ${HOST} in
"ppc-amigaos")
ARTIFACT_TARGET=amiga
;;
*)
- echo "Target \"${TARGET}\" cannot be built on \"${BUILD})\""
+ echo "Target \"${TARGET}\" cannot be built on \"${HOST})\""
exit 1
;;
@@ -153,7 +153,7 @@ case ${TARGET} in
"atari")
- case ${BUILD} in
+ case ${HOST} in
"m68k-atari-mint")
ARTIFACT_TARGET=m68k-atari-mint
PKG_SRC=ns020
@@ -170,7 +170,7 @@ case ${TARGET} in
;;
*)
- echo "Target \"${TARGET}\" cannot be built on \"${BUILD})\""
+ echo "Target \"${TARGET}\" cannot be built on \"${HOST})\""
exit 1
;;
@@ -182,7 +182,7 @@ case ${TARGET} in
"gtk")
- case ${BUILD} in
+ case ${HOST} in
"x86_64-linux-gnu")
ARTIFACT_TARGET=Linux
;;
@@ -193,7 +193,7 @@ case ${TARGET} in
;;
*)
- echo "Target \"${TARGET}\" cannot be built on \"${BUILD}\""
+ echo "Target \"${TARGET}\" cannot be built on \"${HOST}\""
exit 1
;;
@@ -205,7 +205,7 @@ case ${TARGET} in
"framebuffer")
- case ${BUILD} in
+ case ${HOST} in
"x86_64-linux-gnu")
ARTIFACT_TARGET=Linux
;;
@@ -220,37 +220,37 @@ case ${TARGET} in
"arm-unknown-riscos")
ARTIFACT_TARGET=riscos
- export GCCSDK_INSTALL_ENV=/opt/netsurf/${BUILD}/env
- export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${BUILD}/cross/bin
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
;;
"m68k-atari-mint")
ARTIFACT_TARGET=m68k-atari-mint
- export GCCSDK_INSTALL_ENV=/opt/netsurf/${BUILD}/env
- export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${BUILD}/cross/bin
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
;;
"m5475-atari-mint")
ATARIARCH=v4e
ARTIFACT_TARGET=m5475-atari-mint
- export GCCSDK_INSTALL_ENV=/opt/netsurf/${BUILD}/env
- export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${BUILD}/cross/bin
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
;;
"i686-w64-mingw32")
ARTIFACT_TARGET=windows
- export GCCSDK_INSTALL_ENV=/opt/netsurf/${BUILD}/env
- export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${BUILD}/cross/bin
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
;;
"ppc-amigaos")
ARTIFACT_TARGET=amiga
- export GCCSDK_INSTALL_ENV=/opt/netsurf/${BUILD}/env
- export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${BUILD}/cross/bin
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
;;
*)
- echo "Target \"${TARGET}\" cannot be built on \"${BUILD})\""
+ echo "Target \"${TARGET}\" cannot be built on \"${HOST})\""
exit 1
;;
@@ -263,7 +263,7 @@ case ${TARGET} in
"monkey")
# monkey target can be built on most of the supported architectures
- case ${BUILD} in
+ case ${HOST} in
"x86_64-linux-gnu")
ARTIFACT_TARGET=Linux
;;
@@ -278,44 +278,44 @@ case ${TARGET} in
"arm-unknown-riscos")
ARTIFACT_TARGET=riscos
- export GCCSDK_INSTALL_ENV=/opt/netsurf/${BUILD}/env
- export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${BUILD}/cross/bin
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
;;
"m68k-atari-mint")
ARTIFACT_TARGET=m68k-atari-mint
- export GCCSDK_INSTALL_ENV=/opt/netsurf/${BUILD}/env
- export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${BUILD}/cross/bin
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
;;
"m5475-atari-mint")
ATARIARCH=v4e
ARTIFACT_TARGET=m5475-atari-mint
- export GCCSDK_INSTALL_ENV=/opt/netsurf/${BUILD}/env
- export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${BUILD}/cross/bin
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
;;
"i686-w64-mingw32")
ARTIFACT_TARGET=windows
- export GCCSDK_INSTALL_ENV=/opt/netsurf/${BUILD}/env
- export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${BUILD}/cross/bin
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
;;
"ppc-amigaos")
ARTIFACT_TARGET=amiga
- export GCCSDK_INSTALL_ENV=/opt/netsurf/${BUILD}/env
- export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${BUILD}/cross/bin
+ export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env
+ export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin
;;
*)
- echo "Target \"${TARGET}\" cannot be built on \"${BUILD})\""
+ echo "Target \"${TARGET}\" cannot be built on \"${HOST})\""
exit 1
;;
esac
- IDENTIFIER="${BUILD}-${IDENTIFIER}"
- OLD_IDENTIFIER="${BUILD}-${OLD_IDENTIFIER}"
+ IDENTIFIER="${HOST}-${IDENTIFIER}"
+ OLD_IDENTIFIER="${HOST}-${OLD_IDENTIFIER}"
PKG_SRC=nsmonkey
PKG_SFX=
;;
@@ -329,7 +329,7 @@ case ${TARGET} in
esac
# setup environment
-export PREFIX=${JENKINS_HOME}/artifacts-${BUILD}
+export PREFIX=${JENKINS_HOME}/artifacts-${HOST}
export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PREFIX}/lib
export PATH=${PATH}:${PREFIX}/bin
@@ -342,7 +342,7 @@ fi
# convert javascript parameters
if [ "${BUILD_JS}" = "json" ];then
- case ${BUILD} in
+ case ${HOST} in
"arm-unknown-riscos")
BUILD_MOZJS=NO
BUILD_JS=YES