Changeset 18515 for greenstone3

Timestamp:

2009-02-13T14:21:37+13:00 (15 years ago)

Author:

oranfry

Message:

corrections to build.xml to protect against problems

File:

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

greenstone3/trunk/build.xml

@@ -55 +55 @@
   </if>
 
+  <!-- create the packages dir if it has not been created yet -->
+  <mkdir dir="packages"/>
   
   <!--the first three properties have to be put on the top to be used by build.properties-->
@@ -1077 +1079 @@
     <copy file="${build.home}/phind.jar" todir="${web.applet}"/>
     <!-- phind also needs xercesImpl.jar and xml-apis.jar to be in web/applet -->
-    <copy file="${packages.home}/tomcat/common/endorsed/xercesImpl.jar" todir="${web.applet}"/>
-    <copy file="${packages.home}/tomcat/common/endorsed/xml-apis.jar" todir="${web.applet}"/>
+    <if>
+      <bool><istrue value="${tomcat.islocal}"/></bool>
+      <copy file="${packages.home}/tomcat/common/endorsed/xercesImpl.jar" todir="${web.applet}"/>
+      <copy file="${packages.home}/tomcat/common/endorsed/xml-apis.jar" todir="${web.applet}"/>
+    </if>
+
+
     <!-- skip anttasks for now
     <jar destfile="${build.home}/anttasks.jar">
@@ -1117 +1124 @@
   <target name="checkout-indexers" depends="init" if="independent-indexers" unless="nosvn.mode">
     <svn>
-      <checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers" revision="${branch.revision}"/>
+      <checkout url="${svn.root}/indexers/${branch.path}" destPath="${src.packages.home}/indexers" revision="${branch.revision}"/>
     </svn>
   </target>