diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2013-03-05 21:12:53 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2013-03-05 21:12:53 +0000 |
commit | 3f34408f77d88169a79fbd8e3fa9d291d55a6c0a (patch) | |
tree | 0df748f2d071e88d4a235c37bd5935d4375f4e93 | |
parent | 8770a2d77401ba5fe4d9b679c3035119141109d4 (diff) | |
download | netsurf-3f34408f77d88169a79fbd8e3fa9d291d55a6c0a.tar.gz netsurf-3f34408f77d88169a79fbd8e3fa9d291d55a6c0a.tar.bz2 |
Support ZSH and change behaviour for MAKE a little
Adds support for ZSH by shonky means, and also changes ns-make
to ns-make-libs, extends the script to count CPUs and use a -jX
and adds ns-make to call make with the given args and also the -jX.
-rw-r--r-- | Docs/env.sh | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/Docs/env.sh b/Docs/env.sh index 0ca60e538..06f125ccc 100644 --- a/Docs/env.sh +++ b/Docs/env.sh @@ -18,12 +18,20 @@ if [ "x${TARGET_ABI}" = "x" ]; then fi if [ "x${TARGET_WORKSPACE}" = "x" ]; then - TARGET_WORKSPACE=${HOME}/netsurf/workspace + TARGET_WORKSPACE=${HOME}/dev-netsurf/workspace +fi + +if [ "x${USE_CPUS}" = "x" ]; then + NCPUS=$(grep -c "^processor" /proc/cpuinfo 2>/dev/null) + NCPUS="${NCPUS:-1}" + NCPUS=$((NCPUS * 2)) + USE_CPUS="-j${NCPUS}" fi # setup environment echo "TARGET_ABI=${TARGET_ABI}" echo "TARGET_WORKSPACE=${TARGET_WORKSPACE}" +echo "USE_CPUS=${USE_CPUS}" export PREFIX=${TARGET_WORKSPACE}/inst-${TARGET_ABI} export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:: @@ -48,7 +56,7 @@ NS_GTK_DEB="libgtk2.0-dev libcurl3-dev libmng-dev librsvg2-dev liblcms1-dev libj # apt get commandline to install necessary dev packages ns-apt-get-install() { - sudo apt-get install ${NS_DEV_DEB} ${NS_TOOL_DEB} ${NS_GTK_DEB} + sudo apt-get install $(echo ${NS_DEV_DEB} ${NS_TOOL_DEB} ${NS_GTK_DEB}) } # git pull in all repos parameters are passed to git pull @@ -68,7 +76,7 @@ ns-pull() ns-clone() { mkdir -p ${TARGET_WORKSPACE} - for REPO in ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_TOOLS} ${NS_BROWSER} ; do + for REPO in $(echo ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_TOOLS} ${NS_BROWSER}) ; do echo -n " GIT: Cloning ${REPO}: " if [ -f ${TARGET_WORKSPACE}/${REPO}/.git/config ]; then echo "Repository already present" @@ -84,11 +92,11 @@ ns-clone() } # issues a make command to all libraries -ns-make() +ns-make-libs() { - for REPO in ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_TOOLS}; do - echo " MAKE: make -C ${REPO} $*" - make -C ${TARGET_WORKSPACE}/${REPO} TARGET=${TARGET_ABI} $* + for REPO in $(echo ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_TOOLS}); do + echo " MAKE: make -C ${REPO} $USE_CPUS $*" + make -C ${TARGET_WORKSPACE}/${REPO} TARGET=${TARGET_ABI} $USE_CPUS $* done } @@ -97,5 +105,12 @@ ns-pull-install() { ns-pull $* - ns-make install + ns-make-libs install } + +# Passes appropriate flags to make +ns-make() +{ + make $USE_CPUS "$@" +} + |