mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-24 02:14:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Support ZSH and change behaviour for MAKE a little

Browse Source 
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.
This commit is contained in:
Daniel Silverstone 2013-03-05 21:12:53 +00:00
parent 8770a2d774
commit 3f34408f77
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Docs/env.sh
View File

@ -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 "$@"
}