From: Jason Stephenson <jason@sigio.com>
Date: Sat, 18 Feb 2017 22:28:15 +0000 (-0500)
Subject: LP 1665933: Skip XUL in make_release.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e76c6fa87bacd60829a6004a8e345ce101b378af;p=working%2FEvergreen.git

LP 1665933: Skip XUL in make_release.

Alter make_release so that omitting -j and removing osrf_config from
the executble path will skip building XUL staff clients.

Signed-off-by: Jason Stephenson <jason@sigio.com>
---

diff --git a/build/tools/make_release b/build/tools/make_release
index 058ae5f153..5fd13aab1e 100755
--- a/build/tools/make_release
+++ b/build/tools/make_release
@@ -79,6 +79,7 @@ while getopts ":hv:f:F:nptbrij:c" opt; do
             echo "   -r prompt to preview upgrade SQL in editor before committing."
             echo "   -i skip i18n; primarily useful for (quickly) testing this script."
             echo "   -j opensrf javascript library path.  If osrf_config is found, the value derived from osrf_config --libdir."
+            echo "      You can skip building XUL staff clients by omitting -j and removing osrf_config from your path."
             echo "   -c build the experimental browser client;  requires nodejs/grunt-cli/bower"
             echo "   NOTE: -t and -b override PREV_BRANCH/PREV_VERSION, but -b overrides -t."
             exit -1
@@ -87,8 +88,7 @@ while getopts ":hv:f:F:nptbrij:c" opt; do
 done
 
 if [ -z "$OSRF_JS_PATH" ]; then
-    echo "Unable to find OpenSRF JavaScript library path.  Specify with -j";
-    exit 1;
+    echo "Unable to find OpenSRF JavaScript library path.  Skipping XUL staff clients.";
 fi;
 
 if [ "$TAG_ONLY" == "YES" ]; then
@@ -347,31 +347,32 @@ if [ $PREV_BRANCH != "PACKAGE" ]; then # We need to have tagged to do this ;)
     cp Evergreen-ILS-$VERSION/ChangeLog ChangeLog-$PREV_VERSION-$VERSION
 fi
 
-echo "Running enough of configure to build staff client"
-cd Evergreen-ILS-$VERSION/
-./configure --disable-core --disable-web --disable-updates --disable-apache-modules --disable-reporter
-
-echo "Building Release Staff Clients"
-cd Open-ILS/xul/staff_client
-
-echo "Grabbing XULRunner (to avoid issues with version changes)"
-wget http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$XULRUNNER_VERSION/runtimes/xulrunner-$XULRUNNER_VERSION.en-US.win32.zip
-wget http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$XULRUNNER_VERSION/runtimes/xulrunner-$XULRUNNER_VERSION.en-US.linux-i686.tar.bz2
-wget http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$XULRUNNER_VERSION/runtimes/xulrunner-$XULRUNNER_VERSION.en-US.linux-x86_64.tar.bz2
-
-make rigrelease
-make STAFF_CLIENT_STAMP_ID=rel_$UNDER_VERSION OPENSRF_JSLIBS="$OSRF_JS_PATH" build
-make win-client
-mv evergreen_staff_client_setup.exe ../../../../evergreen-setup-$VERSION.exe
-make linux32-client
-mv evergreen_staff_client_i686.tar.bz2 ../../../../evergreen-client-${VERSION}_i686.tar.bz2
-make linux64-client
-mv evergreen_staff_client_x86_64.tar.bz2 ../../../../evergreen-client-${VERSION}_x86_64.tar.bz2
-cd ../../../../
-md5sum evergreen-setup-$VERSION.exe > evergreen-setup-$VERSION.exe.md5
-md5sum evergreen-client-${VERSION}_i686.tar.bz2 > evergreen-client-${VERSION}_i686.tar.bz2.md5
-md5sum evergreen-client-${VERSION}_x86_64.tar.bz2 > evergreen-client-${VERSION}_x86_64.tar.bz2.md5
-
+if [ -n "$OSRF_JS_PATH" ]; then
+    echo "Running enough of configure to build staff client"
+    cd Evergreen-ILS-$VERSION/
+    ./configure --disable-core --disable-web --disable-updates --disable-apache-modules --disable-reporter
+
+    echo "Building Release Staff Clients"
+    cd Open-ILS/xul/staff_client
+
+    echo "Grabbing XULRunner (to avoid issues with version changes)"
+    wget http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$XULRUNNER_VERSION/runtimes/xulrunner-$XULRUNNER_VERSION.en-US.win32.zip
+    wget http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$XULRUNNER_VERSION/runtimes/xulrunner-$XULRUNNER_VERSION.en-US.linux-i686.tar.bz2
+    wget http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$XULRUNNER_VERSION/runtimes/xulrunner-$XULRUNNER_VERSION.en-US.linux-x86_64.tar.bz2
+
+    make rigrelease
+    make STAFF_CLIENT_STAMP_ID=rel_$UNDER_VERSION OPENSRF_JSLIBS="$OSRF_JS_PATH" build
+    make win-client
+    mv evergreen_staff_client_setup.exe ../../../../evergreen-setup-$VERSION.exe
+    make linux32-client
+    mv evergreen_staff_client_i686.tar.bz2 ../../../../evergreen-client-${VERSION}_i686.tar.bz2
+    make linux64-client
+    mv evergreen_staff_client_x86_64.tar.bz2 ../../../../evergreen-client-${VERSION}_x86_64.tar.bz2
+    cd ../../../../
+    md5sum evergreen-setup-$VERSION.exe > evergreen-setup-$VERSION.exe.md5
+    md5sum evergreen-client-${VERSION}_i686.tar.bz2 > evergreen-client-${VERSION}_i686.tar.bz2.md5
+    md5sum evergreen-client-${VERSION}_x86_64.tar.bz2 > evergreen-client-${VERSION}_x86_64.tar.bz2.md5
+fi
 
 echo "Removing build directory"
 rm -rf Evergreen-ILS-$VERSION/