projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 62b12e8)
Staff client builds show build date (as before).
authorBill Erickson <berickxx@gmail.com>
Wed, 20 May 2015 21:53:18 +0000 (17:53 -0400)
committerBill Erickson <berickxx@gmail.com>
Thu, 21 Mar 2019 19:46:23 +0000 (15:46 -0400)
Updates about.html (under staff client Help) to remove the confusing
"HeadURL" variable and replace it w/ a Build Date value.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Conflicts:
Open-ILS/xul/staff_client/chrome/content/main/about.html

Open-ILS/xul/staff_client/Makefile.am patch | blob | history
Open-ILS/xul/staff_client/chrome/content/main/about.html patch | blob | history

diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am
index 7834a01..3ad3695 100644 (file)
--- a/Open-ILS/xul/staff_client/Makefile.am
+++ b/Open-ILS/xul/staff_client/Makefile.am
@@ -5,7 +5,8 @@
 export WEBDIR=@localstatedir@/web
 export STAFF_CLIENT_BUILD_ID = $$(/bin/cat build/BUILD_ID)
 export STAFF_CLIENT_VERSION = $$(/bin/cat build/VERSION)
-export STAFF_CLIENT_STAMP_ID = legacy
+export STAFF_CLIENT_STAMP_ID = $$(/bin/cat build/STAMP_ID)
+export STAFF_CLIENT_BUILD_DATE = $$(/bin/date +"%Y.%m.%d")
 
 # from http://closure-compiler.googlecode.com/files/compiler-latest.zip  FIXME: Autotools this?
 export CLOSURE_COMPILER_JAR = ~/closure-compiler/compiler.jar
@@ -135,6 +136,7 @@ localize_manifest:
 # Master VERSION will end up with 0branch.release, master STAMP ID will be 0branch_release.
 stamp:
        @/bin/date +"%Y%m%d.%H%M%S" > build/BUILD_ID
+       @sed -i -e s/BUILD_DATE/${STAFF_CLIENT_BUILD_DATE}/ build/chrome/content/main/about.html
        @if [ -n "${STAFF_CLIENT_BUILD_ID}" ]; then ( echo "Stamping with Build ID: ${STAFF_CLIENT_BUILD_ID}" ; echo ${STAFF_CLIENT_BUILD_ID} > build/BUILD_ID ) ; fi
        @if [ -z "${STAFF_CLIENT_BUILD_ID}" ]; then ( echo "No Build ID for versioning" ; echo "none" > build/BUILD_ID ) ; fi
        @sed -n -e 's/^AC_INIT([^,]*, \([^,]*\),.*$$/\1/p' @top_srcdir@/configure.ac > build/VERSION
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html
index b2b87b6..c2bc4f1 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/about.html
+++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html
@@ -1,7 +1,8 @@
 <html><head><script></script></head><body onload="var x = document.getElementById('version'); var version ='/xul/server/'.split(/\//)[2]; if (version == 'server') { version = 'versionless debug build'; } x.appendChild(document.createTextNode(version));">
 <h1 style="text-decoration: underline">Evergreen</h1>
-<p>Target Server ID: <span id="version"></span></p>
-<p>$HeadURL$</p>
+<p>Target Server ID: <span id="version"></span>
+<br/>Build Date: BUILD_DATE
+</p>
 <h2>What is Evergreen?</h2>
 <blockquote>
 <p>
Evergreen ILS