X-Git-Url: https://git.evergreen-ils.org/?p=Evergreen.git;a=blobdiff_plain;f=Open-ILS%2Fxul%2Fstaff_client%2FMakefile.am;h=e50540d7256d428ccdc1bc9648fc46bf13762328;hp=40c8057bebc81c289712f8e68b29c8e66c3cf33f;hb=1a04a0eae453a2c61f1ccad7af51dcf2c1d50280;hpb=fd742045d1b7af72cd9b29ccdbcd156cf3f4d44d

diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am
index 40c8057beb..e50540d725 100644
--- a/Open-ILS/xul/staff_client/Makefile.am
+++ b/Open-ILS/xul/staff_client/Makefile.am
@@ -4,40 +4,52 @@
 #---------------------------------------------------------
 
 export STAFF_CLIENT_BUILD_ID = $$(/bin/cat build/BUILD_ID)
+
 OPENSRF_JSLIBS = "$(OPENSRF_LIBS)/javascript"
 CHROME_LOCALES = $$(ls -1 chrome/locale)
 SKIN_CSS = $$(ls -1 server/skin/*css | sed -e "s/.css/_custom.css/")
 
-install-exec-local: build
+#------------------------------
+# Build ILS XUL CLIENT/SERVER
+#------------------------------
+
+if BUILDILSCLIENT
+OILSSERVER_INST = server-xul
+endif
 
-build: build_dir chrome2remote generated custom_skins open-ils stamp
+install-exec-local: $(OILSSERVER_INST)
+
+build: build_dir chrome2remote localize_manifest generated custom_skins open-ils stamp 
 	@echo To test the staff client:
 	@echo "  cd build/"
 	@echo "  xulrunner application.ini"
 
 build_dir:
 	@echo ' * Creating and populating build/ '
-	mkdir -p build/
-	cp -R chrome build/
-	cp -R server build/
-	cp -R defaults build/
-	cp -R components build/
-	cp application.ini build/
-	cp -R build/chrome/content/util/ build/server/
-	cp -R build/chrome/content/auth/ build/server/
-	cp build/chrome/content/main/constants.js build/server/main/constants.js
-	cp build/chrome/content/main/simple_auth.xul build/server/main/simple_auth.xul
-	cp build/chrome/content/main/bindings.xml build/server/main/bindings.xml
-	cp build/chrome/content/OpenILS/data.js build/server/OpenILS/data.js
-	cp build/chrome/content/OpenILS/global_util.js build/server/OpenILS/global_util.js
-	external/prune_dirs.sh build/
+	@mkdir -p build/
+	@cp -fR chrome build/
+	@cp -fR server build/
+	@cp -fR defaults build/
+	@cp -fR components build/
+	@cp application.ini build/
+	@cp -fR build/chrome/content/util/ build/server/
+	@cp -fR build/chrome/content/auth/ build/server/
+	@cp build/chrome/content/main/constants.js build/server/main/constants.js
+	@cp build/chrome/content/main/bindings.xml build/server/main/bindings.xml
+	@cp build/chrome/content/OpenILS/data.js build/server/OpenILS/data.js
+	@cp build/chrome/content/OpenILS/global_util.js build/server/OpenILS/global_util.js
+	@external/prune_dirs.sh build/
 
 # Convert chrome to remote for server localization
 chrome2remote:
-	sed -i 's/chrome:\/\/open_ils_staff_client\/locale\//\/xul\/server\/locale\/<\!--#echo var=locale-->\//' build/server/auth/verify_credentials.xul
-	sed -i 's/chrome:\/\/open_ils_staff_client\/locale\//\/xul\/server\/locale\/<\!--#echo var=locale-->\//' build/server/main/simple_auth.xul
 	@for loc in $(CHROME_LOCALES); do \
-		cp -r chrome/locale/$$loc build/server/locale/. ; \
+		cp -fr chrome/locale/$$loc build/server/locale/. ; \
+	done;
+
+# Update the manifest for our installed locales
+localize_manifest:
+	@for loc in $(CHROME_LOCALES) ; do \
+		if [ "$$loc" != "en-US" ]; then ( echo "locale open_ils_staff_client $$loc locale/$$loc/" >> build/chrome/chrome.manifest ) ; fi; \
 	done;
 
 stamp:
@@ -53,17 +65,31 @@ stamp:
 	@if [ -n "${STAFF_CLIENT_BUILD_ID}" ]; then find build/ -name '*.js' -exec sed -i s/xul\\\/server/xul\\\/${STAFF_CLIENT_BUILD_ID}\\\/server/g {} \; ; fi
 	@if [ -n "${STAFF_CLIENT_BUILD_ID}" ]; then find build/ -name '*.xml' -exec sed -i s/xul\\\/server/xul\\\/${STAFF_CLIENT_BUILD_ID}\\\/server/g {} \; ; fi
 
+bundle:
+	@rm -f build/build.tar
+	@tar cf build.tar build/
+	@mv build.tar build/
+
 generated:
 	@echo ' * Grabbing lang.dtd from the OPAC code '
-	cp @top_srcdir@/Open-ILS/web/opac/locale/en-US/lang.dtd build/chrome/locale/en-US/
+	@cp @top_srcdir@/Open-ILS/web/opac/locale/en-US/lang.dtd build/chrome/locale/en-US/
 
 open-ils:
 	@echo ' * Grabbing more OPAC code and legacy code and custom code'
-	cp @top_srcdir@/Open-ILS/web/opac/common/js/*.js build/chrome/content/OpenILS/util/
-	cp $(OPENSRF_JSLIBS)/*.js build/chrome/content/OpenILS/util/
-	external/prune_dirs.sh build/
+	@cp @top_srcdir@/Open-ILS/web/opac/common/js/*.js build/chrome/content/OpenILS/util/
+	@cp $(OPENSRF_JSLIBS)/*.js build/chrome/content/OpenILS/util/
+	@external/prune_dirs.sh build/
 
 custom_skins:
 	@for skin in $(SKIN_CSS); do \
-		if [ ! -f "$$skin" ]; then touch build/"$$skin"; fi \
+		if [ ! -f "$$skin" ]; then ( touch build/"$$skin" ); fi \
 	done;
+
+server-xul: build
+	@echo $@
+	mkdir -p $(WEBDIR)
+	mkdir -p $(WEBDIR)/xul/
+	@echo "BUILD_ID = $(STAFF_CLIENT_BUILD_ID)"
+	@echo "Copying xul into $(WEBDIR)/xul/$(STAFF_CLIENT_BUILD_ID)"
+	mkdir -p "$(WEBDIR)/xul/$(STAFF_CLIENT_BUILD_ID)"
+	cp -R @top_srcdir@/Open-ILS/xul/staff_client/build/server "${WEBDIR}/xul/${STAFF_CLIENT_BUILD_ID}/"