gnupg2: Update from 2.2.5 to 2.2.6

[termux-packages] / build-all.sh

diff --git a/build-all.sh b/build-all.sh
index 2613691..613ce8a 100755 (executable)
--- a/build-all.sh
+++ b/build-all.sh
@@ -3,24 +3,74 @@
 
 set -e -u -o pipefail
 
+# Read settings from .termuxrc if existing
+test -f $HOME/.termuxrc && . $HOME/.termuxrc
+: ${TERMUX_TOPDIR:="$HOME/.termux-build"}
+: ${TERMUX_ARCH:="aarch64"}
+: ${TERMUX_DEBUG:=""}
+
+_show_usage () {
+       echo "Usage: ./build-all.sh [-a ARCH] [-d]"
+       echo "Build all packages."
+       echo "  -a The architecture to build for: aarch64(default), arm, i686, x86_64 or all."
+       echo "  -d Build with debug symbols."
+       exit 1
+}
+
+while getopts :a:hdDs option; do
+case "$option" in
+       a) TERMUX_ARCH="$OPTARG";;
+       d) TERMUX_DEBUG='-d';;
+       h) _show_usage;;
+esac
+done
+shift $((OPTIND-1))
+if [ "$#" -ne 0 ]; then _show_usage; fi
+
+if [[ ! "$TERMUX_ARCH" =~ ^(aarch64|arm|i686|x86_64)$ ]]; then
+       echo "ERROR: Invalid arch '$TERMUX_ARCH'" 1>&2
+       exit 1
+fi
+
 BUILDSCRIPT=`dirname $0`/build-package.sh
-BUILDORDER_FILE=$HOME/termux/_buildall/buildorder.txt
+BUILDALL_DIR=$TERMUX_TOPDIR/_buildall-$TERMUX_ARCH
+BUILDORDER_FILE=$BUILDALL_DIR/buildorder.txt
+BUILDSTATUS_FILE=$BUILDALL_DIR/buildstatus.txt
 
 if [ -e $BUILDORDER_FILE ]; then
-       echo "Continuing with existing buildorder file: $BUILDORDER_FILE"
+       echo "Using existing buildorder file: $BUILDORDER_FILE"
 else
-       rm -Rf $HOME/termux /data/data $HOME/termux/_buildall
-       mkdir -p $HOME/termux/_buildall
-       ./buildorder.py packages > $BUILDORDER_FILE
+       mkdir -p $BUILDALL_DIR
+       ./scripts/buildorder.py > $BUILDORDER_FILE
+fi
+if [ -e $BUILDSTATUS_FILE ]; then
+       echo "Continuing build-all from: $BUILDSTATUS_FILE"
 fi
 
-exec >> $HOME/termux/_buildall/ALL.out 2>> $HOME/termux/_buildall/ALL.err
+exec >  >(tee -a $BUILDALL_DIR/ALL.out)
+exec 2> >(tee -a $BUILDALL_DIR/ALL.err >&2)
+trap "echo ERROR: See $BUILDALL_DIR/\${package}.err" ERR
+
+for package_path in `cat $BUILDORDER_FILE`; do
+       package=`basename $package_path`
+       # Check build status (grepping is a bit crude, but it works)
+       if [ -e $BUILDSTATUS_FILE ] && grep "^$package\$" $BUILDSTATUS_FILE >/dev/null; then
+               echo "Skipping $package"
+               continue
+       fi
 
-for package in `cat $BUILDORDER_FILE`; do
-       echo -n "Building $package... " >> $HOME/termux/_buildall/ALL.out
+       echo -n "Building $package... "
        BUILD_START=`date "+%s"`
-       bash -x $BUILDSCRIPT $package > $HOME/termux/_buildall/${package}.out 2> $HOME/termux/_buildall/${package}.err
+       bash -x $BUILDSCRIPT -a $TERMUX_ARCH -s $TERMUX_DEBUG $package \
+               > $BUILDALL_DIR/${package}.out 2> $BUILDALL_DIR/${package}.err
        BUILD_END=`date "+%s"`
        BUILD_SECONDS=$(( $BUILD_END - $BUILD_START ))
        echo "done in $BUILD_SECONDS"
+
+       # Update build status
+       echo "$package" >> $BUILDSTATUS_FILE
 done
+
+# Update build status
+rm -f $BUILDSTATUS_FILE
+echo "Finished"