Changeset 15136 for greenstone3/trunk/build.xml

Timestamp:

2008-03-27T13:34:02+13:00 (16 years ago)

Author:

oranfry

Message:

made the configure-java-version execute quicker, and made it run every time tomcat starts - this way the user will never have to rename the xalan.jar(.tmp) files or remember to run configure-java-version explicitly - would be nice to hide the ugly output it creates though

File:

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

greenstone3/trunk/build.xml

@@ -152 +152 @@
     <isset property="disable.collection.building"/>
   </condition>
+
+    <!-- where is search4j tool -->
+    <condition property="search4j.exec" value="bin/search4j.exe"> 
+        <isset property="current.os.iswindows"/>
+  </condition>
+  <property name="search4j.exec" value="bin/search4j"/>
+
     
   <!-- ============= Base dirs for each package and component ============ -->
@@ -439 +446 @@
   </target>
   
-  <!-- if we are using java 1.5, we need the xalan.jar file in web/WEB-INF/lib,  but if we are using java 1.4, we can't have it there -->
+  <!-- if we are using java 1.5+, we need the xalan.jar file in web/WEB-INF/lib,  but if we are using java 1.4, we can't have it there -->
   <target name="configure-java-version" depends="init"
     description="Run this target if you have changed the default version of java since installing greenstone3">
+
+        <available property="have.xalan.jar" file="${web.lib}/xalan.jar"/>
     <condition property="need.xalan.jar">
-      <equals arg1="1.5" arg2="${ant.java.version}"/>
-    </condition>
+            <or>
+                <equals arg1="1.5" arg2="${ant.java.version}"/>
+                <equals arg1="1.6" arg2="${ant.java.version}"/>
+            </or>
+        </condition>
+
+        <condition property="do.deactivate.xalan.jar">
+            <and>
+                <isset property="have.xalan.jar"/>
+                <not><isset property="need.xalan.jar"/></not>
+            </and>
+        </condition>
+
+        <condition property="do.activate.xalan.jar">
+            <and>
+                <not><isset property="have.xalan.jar"/></not>
+                <isset property="need.xalan.jar"/>
+            </and>
+        </condition>
+        <!--
+        <echo>java version  : ${ant.java.version}</echo>
+        <echo>have xalan.jar: ${hava.xalan.jar}</echo>
+        <echo>need xalan.jar: ${need.xalan.jar}</echo>
+        <echo>activate?     : ${do.activate.xalan.jar}</echo>
+        <echo>deactivate?   : ${do.deactivate.xalan.jar}</echo>
+        -->
+
     <antcall target="activate-xalan-jar"/>
     <antcall target="deactivate-xalan-jar"/>
-  </target>
-  
-  <target name="activate-xalan-jar" if="need.xalan.jar">
+
+  </target>
+  
+  <target name="activate-xalan-jar" if="do.activate.xalan.jar">
     <copy file="${web.lib}/xalan.jar.tmp" tofile="${web.lib}/xalan.jar"/>
     <antcall target="copy-xalan-for-mac" />
@@ -455 +490 @@
 
   <target name="copy-xalan-for-mac" if="current.os.ismac">
-       <copy file="${web.lib}/xalan.jar.tmp" tofile="${catalina.home}/common/endorsed/xalan.jar"/> 
-  </target>
-
-  <target name="deactivate-xalan-jar" unless="need.xalan.jar">
+        <echo>installing xalan.jar</echo>
+        <copy file="${web.lib}/xalan.jar.tmp" tofile="${catalina.home}/common/endorsed/xalan.jar"/> 
+  </target>
+
+  <target name="deactivate-xalan-jar" if="do.deactivate.xalan.jar">
+        <echo>uninstalling xalan.jar</echo>
     <delete file="${web.lib}/xalan.jar"/>
   </target>
@@ -586 +623 @@
   </target>
     
-  <target name="start-tomcat" description="Startup only Tomcat" depends="init" if="tomcat.islocal">
+  <target name="start-tomcat" description="Startup only Tomcat" depends="init,configure-java-version" if="tomcat.islocal">
    <property name="tomcat.classpath" refid="local.tomcat.classpath"/>
     <property name="tomcat.path" refid="local.tomcat.path"/>