[open-ils-commits] [GIT] Evergreen ILS branch rel_2_11 updated. a4494298a90f55dd6ce0de32a538031559189cb5
Evergreen Git
git at git.evergreen-ils.org
Wed Apr 12 17:48:14 EDT 2017
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, rel_2_11 has been updated
via a4494298a90f55dd6ce0de32a538031559189cb5 (commit)
via c5fd9156b3d63c860beb1e315a391dba032ce35a (commit)
from 55e419ce688bf23e0e0a63388fc4c877c5f4b037 (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 a4494298a90f55dd6ce0de32a538031559189cb5
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Wed Apr 12 16:06:09 2017 -0400
LP#1665933: describe the new -x option when running -h
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Ben Shum <ben at evergreener.net>
Conflicts:
build/tools/make_release
diff --git a/build/tools/make_release b/build/tools/make_release
index 4b3bcbe..32a3589 100755
--- a/build/tools/make_release
+++ b/build/tools/make_release
@@ -84,6 +84,7 @@ while getopts ":hv:f:F:nptbrij:cx" opt; do
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 " -c build the experimental browser client; requires nodejs/grunt-cli/bower"
+ echo " -x skip building the XUL client"
echo " NOTE: -t and -b override PREV_BRANCH/PREV_VERSION, but -b overrides -t."
exit -1
;;
commit c5fd9156b3d63c860beb1e315a391dba032ce35a
Author: Jason Stephenson <jason at sigio.com>
Date: Tue Apr 11 10:52:09 2017 -0400
LP 1665933: Skip XUL staff client build in make_release.
Add a -x option to skip building the XulRunner staff clients. This is
useful for making custom tarballs for local installation where you
will build the staff client on the server.
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/build/tools/make_release b/build/tools/make_release
index 058ae5f..4b3bcbe 100755
--- a/build/tools/make_release
+++ b/build/tools/make_release
@@ -18,12 +18,13 @@ BUILD_ONLY=NO # -b
UPGRADE_PREVIEW=NO # -r
SKIP_I18N=NO # -i
BUILD_BROWSER_CLIENT=NO # -c
+SKIP_XUL=NO # -x
# path to OpenSRF libraries
[ "$(which osrf_config)" ] && OSRF_JS_PATH="$(osrf_config --libdir)/javascript";
-while getopts ":hv:f:F:nptbrij:c" opt; do
+while getopts ":hv:f:F:nptbrij:cx" opt; do
case $opt in
v)
VERSION=$OPTARG
@@ -59,6 +60,9 @@ while getopts ":hv:f:F:nptbrij:c" opt; do
c)
BUILD_BROWSER_CLIENT=YES
;;
+ x)
+ SKIP_XUL=YES
+ ;;
\?)
echo "Invalid Option: -$OPTARG"
exit 1
@@ -347,31 +351,34 @@ 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 [ "$SKIP_XUL" = "NO" ]; 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
+else
+ echo "Skipping XULRunner staff client build"
+fi
echo "Removing build directory"
rm -rf Evergreen-ILS-$VERSION/
-----------------------------------------------------------------------
Summary of changes:
build/tools/make_release | 60 ++++++++++++++++++++++++++--------------------
1 files changed, 34 insertions(+), 26 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list