com php-src: Enable more control over travis/compile.sh: travis/compile.sh

[email protected] (Sara Golemon)
Newsgroups php.cvs
Message-ID <[email protected]>
Commit:    847b36265a5f6919b70182919e1b8f3183b214a4
Author:    Sara Golemon <[email protected]>         Tue, 18 Apr 2017 11:27:19 -0700
Parents:   b78b15e88022b70ce6810f8b8dd1e42c2dac44b3
Branches:  master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=847b36265a5f6919b70182919e1b8f3183b214a4

Log:
Enable more control over travis/compile.sh

This is also used by RM process to test the same things.
Allow generating build output (to a log file) and specifying
number of parallel jobs (rather than hard-code zero).

Leave all defaults as-is for Travis builds.

Changed paths:
  M  travis/compile.sh


Diff:
diff --git a/travis/compile.sh b/travis/compile.sh
index bd127e7..ddf80f9 100755
--- a/travis/compile.sh
+++ b/travis/compile.sh
@@ -9,10 +9,26 @@ if [[ "$ENABLE_DEBUG" == 1 ]]; then
 else
 	DEBUG="";
 fi
+
+if [[ -z "$CONFIG_LOG_FILE" ]]; then
+	CONFIG_QUIET="--quiet"
+	CONFIG_LOG_FILE="/dev/stdout"
+else
+	CONFIG_QUIET=""
+fi
+if [[ -z "$MAKE_LOG_FILE" ]]; then
+	MAKE_QUIET="--quiet"
+	MAKE_LOG_FILE="/dev/stdout"
+else
+	MAKE_QUIET=""
+fi
+
+MAKE_JOBS=${MAKE_JOBS:-2}
+
 ./buildconf --force
 ./configure \
---prefix=$HOME"/php-install" \
---quiet \
+--prefix="$HOME"/php-install \
+$CONFIG_QUIET \
 $DEBUG \
 $TS \
 --enable-phpdbg \
@@ -59,6 +75,8 @@ $TS \
 --with-xpm-dir=/usr \
 --with-kerberos \
 --enable-sysvmsg \
---enable-zend-test
-make -j2 --quiet
-make install
+--enable-zend-test \
+> "$CONFIG_LOG_FILE"
+
+make "-j${MAKE_JOBS}" $MAKE_QUIET > "$MAKE_LOG_FILE"
+make install >> "$MAKE_LOG_FILE"
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.