Changeset 24607

Timestamp:

2011-09-16T16:02:56+12:00 (13 years ago)

Author:

xiao

Message:

Xiaofeng found a bug in build.xml where web/WEB-INF/lib/xalan.jar.tmp wasn't being renamed to xalan.jar except for versions 1.5 and 1.6, whereas this renaming should take place for Java versions 1.5+. Xiaofeng was using Java 1.7 and compilation therefore failed when the correct jar library couldn't be found.

File:

• main/trunk/greenstone3/build.xml (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -768 +768 @@
   </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.
+       The test for whether we need it assumes we won't be trying to compile GS3 against Java versions less than 1.4. -->
   <target name="configure-java-version" depends="init"
     description="Activates or deactivates some jar libraries as needed depending on your java version">
@@ -775 +776 @@
     <condition property="need.xalan.jar">
       <or>
-        <equals arg1="1.5" arg2="${ant.java.version}"/>
-        <equals arg1="1.6" arg2="${ant.java.version}"/>
+        <not><equals arg1="1.4" arg2="${ant.java.version}"/></not>
       </or>
     </condition>