[open-ils-commits] r20254 - branches/rel_2_1/Open-ILS/xul/staff_client (phasefx)

svn at svn.open-ils.org svn at svn.open-ils.org
Wed Apr 20 12:48:19 EDT 2011


Author: phasefx
Date: 2011-04-20 12:48:16 -0400 (Wed, 20 Apr 2011)
New Revision: 20254

Modified:
   branches/rel_2_1/Open-ILS/xul/staff_client/Makefile.am
Log:
New targets for staff client Makefile

rigrelease:
Sets up branding/xulrunner-stub for release builds
Includes a change to windowssetup.nsi to swap out image set

rigbeta:
Sets up branding/xulrunner-stub for beta builds
Includes a change to windowssetup.nsi to swap out image set

rebuild:
Shortcut for re-using the same version/stamp as the last build

Updated stamp target to add files for rebuild.

Author: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Jason Etheridge <jason at esilibrary.com>


Modified: branches/rel_2_1/Open-ILS/xul/staff_client/Makefile.am
===================================================================
--- branches/rel_2_1/Open-ILS/xul/staff_client/Makefile.am	2011-04-20 16:46:58 UTC (rev 20253)
+++ branches/rel_2_1/Open-ILS/xul/staff_client/Makefile.am	2011-04-20 16:48:16 UTC (rev 20254)
@@ -39,6 +39,26 @@
 
 install-exec-local: $(OILSSERVER_INST)
 
+# Helper target
+# For when you want to add devbuild/permachine/autoupdate to an existing stamp id
+rebuild: export STAFF_CLIENT_STAMP_ID=`cat PREV_STAMP_ID`
+rebuild: export STAFF_CLIENT_VERSION=`cat PREV_VERSION`
+rebuild: build
+
+rigrelease:
+	@echo ' * Rigging for release branding'
+	@cp xulrunner-stub.release.exe xulrunner-stub.exe
+	@mkdir -p branding
+	@cp evergreen-icon.ico branding/evergreen.ico
+	@sed -i -e 's/^\s*;\?\s*!define UI_IMAGESET "release"/!define UI_IMAGESET "release"/' -e 's/^\s*;\?\s*!define UI_IMAGESET "beta"/;!define UI_IMAGESET "beta"/' windowssetup.nsi
+
+rigbeta:
+	@echo ' * Rigging for beta branding'
+	@cp xulrunner-stub.beta.exe xulrunner-stub.exe
+	@mkdir -p branding
+	@cp evergreen-icon-beta.ico branding/evergreen.ico
+	@sed -i -e 's/^\s*;\?\s*!define UI_IMAGESET "release"/;!define UI_IMAGESET "release"/' -e 's/^\s*;\?\s*!define UI_IMAGESET "beta"/!define UI_IMAGESET "beta"/' windowssetup.nsi
+
 devbuild: build
 	@echo ' * Copying in developer preferences'
 	@cp external/developers.js build/defaults/preferences/
@@ -125,6 +145,8 @@
 	@if [ -n "${AUTOUPDATE_HOST}" ]; then echo "Applying automatic update host ${AUTOUPDATE_HOST}"; fi
 	@if [ -n "${AUTOUPDATE_HOST}" ]; then sed -i -e "s|::HOSTNAME::|${AUTOUPDATE_HOST}|" -e "s|https\?://\(https\?://\)|\1|" build/defaults/preferences/autoupdate.js; fi
 	@if [ -n "${AUTOUPDATE_HOST}" ]; then sed -i -e "s|::HOSTNAME::|${AUTOUPDATE_HOST}|" -e "s|https\?://\(https\?://\)|\1|" build/install.rdf; fi
+	@cp build/STAMP_ID PREV_STAMP_ID
+	@cp build/VERSION PREV_VERSION
 
 bell:
 	@perl -e 'print "Ringing bell..." . chr(7) . "\n";'



More information about the open-ils-commits mailing list