[open-ils-commits] [GIT] Evergreen ILS branch master updated. ff25ed5095f9c7ba2f3df7e6f20ec78e45110bb3

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  ff25ed5095f9c7ba2f3df7e6f20ec78e45110bb3 (commit)
      from  a5d2ba3273d03300e7d9137a1a0317fef730839d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ff25ed5095f9c7ba2f3df7e6f20ec78e45110bb3
Author: Bill Erickson <berick at esilibrary.com>
Date:   Mon Jul 21 09:39:41 2014 -0400

    LP#1334693 make_release optional -j <osrf_js_path>
    
    make_release supports a "-j" option for passing in the OpenSRF JS path:
    
    make_release [options] -j /openils/lib/javascript
    
    This is useful when running make_release, specifically the staff client
    building portion, on a machine where the OpenSRF libs are available
    (say, from a git checkout) but osrf_config is not available because
    OpenSRF is not actually installed.
    
    The script will attempt to find osrf_config and the JS path
    automatically, so under normal circumstances, -j is not required.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/build/tools/make_release b/build/tools/make_release
index c52565d..65cef4b 100755
--- a/build/tools/make_release
+++ b/build/tools/make_release
@@ -18,7 +18,11 @@ BUILD_ONLY=NO # -b
 UPGRADE_PREVIEW=NO # -r
 SKIP_I18N=NO # -i
 
-while getopts ":hv:f:F:nptbri" opt; do
+# path to OpenSRF libraries
+[ "$(which osrf_config)" ] && OSRF_JS_PATH="$(osrf_config --libdir)/javascript";
+
+
+while getopts ":hv:f:F:nptbrij:" opt; do
     case $opt in
         v)
             VERSION=$OPTARG
@@ -47,6 +51,10 @@ while getopts ":hv:f:F:nptbri" opt; do
         b)
             BUILD_ONLY=YES
         ;;
+
+        j)
+            OSRF_JS_PATH="$OPTARG"
+        ;;
         \?)
             echo "Invalid Option: -$OPTARG"
             exit 1
@@ -66,12 +74,18 @@ while getopts ":hv:f:F:nptbri" opt; do
             echo "   -b turns on build only mode."
             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 "   NOTE: -t and -b override PREV_BRANCH/PREV_VERSION, but -b overrides -t."
             exit -1
         ;;
     esac
 done
 
+if [ -z "$OSRF_JS_PATH" ]; then
+    echo "Unable to find OpenSRF JavaScript library path.  Specify with -j";
+    exit 1;
+fi;
+
 if [ $TAG_ONLY = "YES" ]; then
     PREV_BRANCH="TAG"
 fi
@@ -326,7 +340,7 @@ wget http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$XULRUNNER_VERSIO
 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 build
+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

-----------------------------------------------------------------------

Summary of changes:
 build/tools/make_release |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS