summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2014-12-31 14:02:30 +0000
committerJohn-Mark Bell <jmb@netsurf-browser.org>2014-12-31 14:02:30 +0000
commit8df033357721f62064e4f80850d37d44070530e1 (patch)
treec4f1aa0d1c2029d05414e76d0c00cb710bbb5f92
parent6b645664fe9c8f8d8a46493a6e00ef32b753a642 (diff)
downloadnetsurf-8df033357721f62064e4f80850d37d44070530e1.tar.gz
netsurf-8df033357721f62064e4f80850d37d44070530e1.tar.bz2
Ensure buildsystem is built before everything else.
-rw-r--r--Docs/env.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/Docs/env.sh b/Docs/env.sh
index f70f013f1..f5c421501 100644
--- a/Docs/env.sh
+++ b/Docs/env.sh
@@ -66,8 +66,11 @@ MAKE=make
# NetSurf GIT repositories
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="buildsystem libwapcaplet libparserutils libhubbub libdom libcss libnsgif libnsbmp libutf8proc libnsutils"
+NS_INTERNAL_LIBS="libwapcaplet libparserutils libhubbub libdom libcss libnsgif libnsbmp libutf8proc libnsutils"
# The browser itself
NS_BROWSER="netsurf"
@@ -219,7 +222,7 @@ ns-package-install()
# git pull in all repos parameters are passed to git pull
ns-pull()
{
- for REPO in ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_TOOLS} ${NS_BROWSER} ; do
+ for REPO in ${NS_BUILDSYSTEM} ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_TOOLS} ${NS_BROWSER} ; do
echo -n " GIT: Pulling ${REPO}: "
if [ -f "${TARGET_WORKSPACE}/${REPO}/.git/config" ]; then
(cd ${TARGET_WORKSPACE}/${REPO} && git pull $*; )
@@ -233,7 +236,7 @@ ns-pull()
ns-clone()
{
mkdir -p ${TARGET_WORKSPACE}
- for REPO in $(echo ${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} ${NS_BROWSER}) ; do
echo -n " GIT: Cloning ${REPO}: "
if [ -f ${TARGET_WORKSPACE}/${REPO}/.git/config ]; then
echo "Repository already present"
@@ -251,7 +254,7 @@ ns-clone()
# issues a make command to all libraries
ns-make-libs()
{
- for REPO in $(echo ${NS_TOOLS}); do
+ for REPO in $(echo ${NS_BUILDSYSTEM} ${NS_TOOLS}); do
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
${MAKE} -C ${TARGET_WORKSPACE}/${REPO} $USE_CPUS $*
if [ $? -ne 0 ]; then