From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 12 Jun 2007 18:05:45 +0000 (+0000)
Subject: Changes needed to make things work after the cvs2svn migration
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=559ea1f11eceb14deaeb30b95362d8da11609565;p=Evergreen.git

Changes needed to make things work after the cvs2svn migration

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_0@7420 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/xul/staff_client/Makefile b/Open-ILS/xul/staff_client/Makefile
index 00e3d01ff4..c6e70cdfb0 100644
--- a/Open-ILS/xul/staff_client/Makefile
+++ b/Open-ILS/xul/staff_client/Makefile
@@ -28,16 +28,16 @@ add_symlinks:
 	ln -s ../../chrome/content/main/lang.js server/main/lang.js
 	ln -s ../../chrome/content/main/simple_auth.xul server/main/simple_auth.xul
 	ln -s ../../chrome/content/OpenILS/data.js server/OpenILS/data.js
-	(cd build/chrome/content/OpenSRF/; for x in *; do ln -s  ../../../build/chrome/content/OpenSRF/$$x ../../../../chrome/content/OpenSRF/$$x; done)
+	#(cd build/chrome/content/OpenSRF/; for x in *; do ln -s  ../../../build/chrome/content/OpenSRF/$$x ../../../../chrome/content/OpenSRF/$$x; done)
 	(cd build/chrome/content/OpenILS/util/; for x in *; do if [ $$x != 'fmall.js' ]; then ln -s  ../../../../build/chrome/content/OpenILS/util/$$x ../../../../../chrome/content/OpenILS/util/$$x; fi ; done)
-	(cd build/chrome/content/legacy/; for x in [a-z]*; do ln -s  ../../../build/chrome/content/legacy/$$x ../../../../chrome/content/legacy/$$x; done)
+	#(cd build/chrome/content/legacy/; for x in [a-z]*; do ln -s  ../../../build/chrome/content/legacy/$$x ../../../../chrome/content/legacy/$$x; done)
 	(cd build/chrome/locale/en-US/; for x in *; do ln -s  ../../../build/chrome/locale/en-US/$$x ../../../../chrome/locale/en-US/$$x; done)
 
 build_dir:
 	@echo
 	@echo '*********************************************************  Kludge, make sure these directories exists '
 	mkdir -p chrome/locale/en-US/
-	mkdir -p chrome/content/OpenSRF/
+	#mkdir -p chrome/content/OpenSRF/
 	@echo
 	@echo '*********************************************************  Creating and populating build/ '
 	mkdir -p build/
@@ -76,14 +76,14 @@ generated:
 open-ils:
 	@echo
 	@echo '********************************************************* Grabbing more OPAC code and legacy code and custom code'
-	cp ../../../OpenSRF/src/javascript/*.js build/chrome/content/OpenSRF/
+	#cp ../../../OpenSRF/src/javascript/*.js build/chrome/content/OpenSRF/
 	cp ../../../Open-ILS/web/opac/common/js/*.js build/chrome/content/OpenILS/util/
-	cp ../../../Evergreen/staff_client/chrome/content/evergreen/cat/marc* build/chrome/content/legacy/
-	cp ../../../Evergreen/staff_client/chrome/content/evergreen/cat/browse* build/chrome/content/legacy/
-	cp ../../../Evergreen/staff_client/chrome/locale/en-US/evergreen/cat.dtd build/chrome/locale/en-US/
-	cp -R ../../../Evergreen/xul/staff_client/server/ build/
+	#cp ../../../Evergreen/staff_client/chrome/content/evergreen/cat/marc* build/chrome/content/legacy/
+	#cp ../../../Evergreen/staff_client/chrome/content/evergreen/cat/browse* build/chrome/content/legacy/
+	#cp ../../../Evergreen/staff_client/chrome/locale/en-US/evergreen/cat.dtd build/chrome/locale/en-US/
+	#cp -R ../../../Evergreen/xul/staff_client/server/ build/
 	external/prune_dirs.sh build/
-	find build/chrome/content/legacy/ -type f -name '*.*' -exec sed -i s/evergreen/open_ils_staff_client/g {} \;
+	#find build/chrome/content/legacy/ -type f -name '*.*' -exec sed -i s/evergreen/open_ils_staff_client/g {} \;
 
 custom:
 	@echo
diff --git a/Open-ILS/xul/staff_client/components/nsIOpenILS.xpt b/Open-ILS/xul/staff_client/components/nsIOpenILS.xpt
index 2efad7b2f4..ea14455b0f 100644
Binary files a/Open-ILS/xul/staff_client/components/nsIOpenILS.xpt and b/Open-ILS/xul/staff_client/components/nsIOpenILS.xpt differ
diff --git a/Open-ILS/xul/staff_client/external/prune_dirs.sh b/Open-ILS/xul/staff_client/external/prune_dirs.sh
index 0f418ff602..266c0d8092 100755
--- a/Open-ILS/xul/staff_client/external/prune_dirs.sh
+++ b/Open-ILS/xul/staff_client/external/prune_dirs.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 find $1 -type d -name CVS -exec rm -rf {} \; 2> /dev/null
+find $1 -type d -name .svn -exec rm -rf {} \; 2> /dev/null
 find $1 -type d -name OPEN_ILS_STAFF_CLIENT -exec rm -rf {} \; 2> /dev/null
 exit 0