Changeset 24607

Show
Ignore:
Timestamp:
16.09.2011 16:02:56 (8 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r24366 r24607  
    768768  </target> 
    769769   
    770   <!-- 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 --> 
     770  <!-- 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. 
     771       The test for whether we need it assumes we won't be trying to compile GS3 against Java versions less than 1.4. --> 
    771772  <target name="configure-java-version" depends="init" 
    772773    description="Activates or deactivates some jar libraries as needed depending on your java version"> 
     
    775776    <condition property="need.xalan.jar"> 
    776777      <or> 
    777         <equals arg1="1.5" arg2="${ant.java.version}"/> 
    778         <equals arg1="1.6" arg2="${ant.java.version}"/> 
     778        <not><equals arg1="1.4" arg2="${ant.java.version}"/></not> 
    779779      </or> 
    780780    </condition>