[open-ils-commits] r298 - in conifer: branches/rel_1_4 branches/rel_1_4/xul trunk/tools trunk/xul (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2009-04-06 23:26:48 -0400 (Mon, 06 Apr 2009)
New Revision: 298

Added:
   conifer/branches/rel_1_4/xul/
Removed:
   conifer/trunk/xul/rel_1_4/
Modified:
   conifer/trunk/tools/patch_conifer.sh
Log:
Add some XUL love in the right place


Copied: conifer/branches/rel_1_4/xul (from rev 293, conifer/trunk/xul/rel_1_4)


Property changes on: conifer/branches/rel_1_4/xul
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: conifer/trunk/tools/patch_conifer.sh
===================================================================
--- conifer/trunk/tools/patch_conifer.sh	2009-04-07 02:08:57 UTC (rev 297)
+++ conifer/trunk/tools/patch_conifer.sh	2009-04-07 03:26:48 UTC (rev 298)
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 REMOTE_CANONICAL_SVN_DIR=svn://svn.open-ils.org/ILS/branches/rel_1_4
-CANONICAL_SVN_DIR=/home/opensrf/Evergreen-rel_1_4/Open-ILS
+CANONICAL_SVN_DIR=/home/opensrf/Evergreen-rel_1_4
 CANONICAL_EXPORT_DIR=/home/opensrf/rel_1_4_export
 REMOTE_SVN_DIR=svn://svn.open-ils.org/ILS-Contrib/conifer
 LOCAL_SVN_DIR=/home/opensrf/conifer-svn
@@ -49,7 +49,7 @@
 
 copy_opac_skins()
 {
-	SKINS=`cd "$LOCAL_EXPORT_DIR"/trunk/web/opac/skin; ls -1`
+	SKINS=`cd "$LOCAL_EXPORT_DIR"/branches/rel_1_4/web/opac/skin; ls -1`
 	LINKS=`cd "$INSTALL_DIR"/var/web/opac/skin/default/; find xml -type l -print`
 
 	# For skins, create a _test variation of each
@@ -84,6 +84,12 @@
 	done
 }
 
+# We need the Canuck patch in place. Save us, Canuck patch!
+copy_xul()
+{
+	cp -r "$LOCAL_EXPORT_DIR"/branches/rel_1_4/xul/server/patron/ue_config.js "$INSTALL_DIR"/var/web/xul/server/server/patron/ue_config.js
+}
+
 # We'll need to restart Perl services after an update of circ rules
 copy_circ_rules()
 {
@@ -137,3 +143,6 @@
 copy_web_common
 copy_opac_skins
 copy_circ_rules
+copy_xul
+#copy_perl_modules
+#copy_conf_files