Changeset 9978

Timestamp:

2005-05-27T16:05:14+12:00 (19 years ago)

Author:

kjdon

Message:

removed the prepare-extra target, moved the file copy statements into prepare-tomcat-compat - these jar files only exist in compat mode

File:

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

trunk/gsdl3/build.xml

@@ -171 +171 @@
     description="Install Greenstone 3. Use this when you first checkout the code. Also running this target later on will reinstall Greenstone. Most things will be reset back to their defaults, except for code changes."/>
 
-  <target name="prepare" depends="init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-mysql,prepare-collections,prepare-extra"/>
+  <target name="prepare" depends="init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-mysql,prepare-collections"/>
 
   <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building"
@@ -343 +343 @@
   </target>
 
-  <target name="prepare-extra" depends="init">
-    <!--  copy some jar files to web/lib for the phind applet -->
-    <copy file="${catalina.home}/common/endorsed/xml-apis.jar"
-      tofile="${basedir}/web/lib/xml-apis.jar"/>
-    <copy file="${catalina.home}/common/endorsed/xercesImpl.jar"
-      tofile="${basedir}/web/lib/xercesImpl.jar"/>
-  </target>
-
   <target name="configure-files" depends="configure-files-gsdl3,configure-files-server"/>
   
@@ -416 +408 @@
     <unzip src="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7-compat.zip" 
       dest="${basedir}/comms/jakarta"/>
+    <copy file="${catalina.home}/common/endorsed/xml-apis.jar"
+      tofile="${basedir}/web/lib/xml-apis.jar"/>
+    <copy file="${catalina.home}/common/endorsed/xercesImpl.jar"
+      tofile="${basedir}/web/lib/xercesImpl.jar"/>
   </target>