Changeset 10926

Timestamp:

2005-11-23T15:03:29+13:00 (18 years ago)

Author:

kjdon

Message:

split old prepare-web into two - prepare-web and prepare-collections

File:

• trunk/gsdl3/build.xml (modified) (6 diffs)

trunk/gsdl3/build.xml

@@ -223 +223 @@
   <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? -->
 
-  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-extensions,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-mysql,prepare-web"
+  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-extensions,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-mysql,prepare-web,prepare-collections"
     description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional cvs checkouts and downloads, so you need to be online to run this."/>
 
@@ -385 +385 @@
  <!-- ========== Web app Targets ================================ -->
   
-  <target name="prepare-web">
+  <target name="prepare-web" depends="init">
+    <mkdir dir="${web.home}/applet"/>
+    <condition property="need.xml.jars">
+      <equals arg1="1.5" arg2="${ant.java.version}"/>
+    </condition>
+    <antcall target="rename-xml-jars"/>
+  </target>
+  
+  <target name="rename-xml-jars" if="need.xml.jars">
+    <copy file="${web.lib}/xalan.jar.tmp" tofile="${web.lib}/xalan.jar"/>
+    <copy file="${web.lib}/xercesImpl.jar.tmp" tofile="${web.lib}/xercesImpl.jar"/>
+  </target>
+
+  <target name="prepare-collections" depends="init">
     <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>
     <!-- gs3mgdemo -->
@@ -421 +434 @@
       dest="${collect.dir}/gberg/index"/>
     <delete file="${collect.dir}/gberg/index/index.zip"/>
-    <mkdir dir="${web.home}/applet"/>
-
-    <condition property="need.xml.jars">
-      <equals arg1="1.5" arg2="${ant.java.version}"/>
-    </condition>
-    <antcall target="rename-xml-jars"/>
-  </target>
-  
-  <target name="rename-xml-jars" if="need.xml.jars">
-    <copy file="${web.lib}/xalan.jar.tmp" tofile="${web.lib}/xalan.jar"/>
-    <copy file="${web.lib}/xercesImpl.jar.tmp" tofile="${web.lib}/xercesImpl.jar"/>
-  </target>
+  </target>
+
   
   <target name="configure-web" depends="init,get-mysql-reader-password,get-mysql-admin-password"
@@ -1569 +1572 @@
     <delete dir="${packages.home}/axis"/>
     <antcall target="prepare-web"/>
+    <antcall target="prepare-collections"/>
   </target>
   
@@ -1634 +1638 @@
     <delete file="${gli.home}/gli.sh"/>
     <antcall target="rename-gs2build-files-unix"/>
-
+    <antcall target="prepare-collections"/>
     <antcall target="prepare-axis"/>
     <delete file="${packages.home}/axis-bin-1_2_1.zip"/>
@@ -1645 +1649 @@
     <xslt in="build.xml" out="dist-build.xml" style="dist-resources/convert-build-xml-source.xsl"/>
     <delete dir="${basedir}/dist-resources"/>
+    
   </target>