From 50229f7f7f1d846af21a31c42a8faea9b8b3cca3 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 20 May 2015 17:53:18 -0400 Subject: [PATCH] Staff client builds show build date (as before). 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 Conflicts: Open-ILS/xul/staff_client/chrome/content/main/about.html --- Open-ILS/xul/staff_client/Makefile.am | 4 +++- Open-ILS/xul/staff_client/chrome/content/main/about.html | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am index 7834a013b8..3ad3695899 100644 --- 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 b2b87b683f..c2bc4f1436 100644 --- 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 @@

Evergreen

-

Target Server ID:

-

$HeadURL$

+

Target Server ID: +
Build Date: BUILD_DATE +

What is Evergreen?

-- 2.11.0