Changeset 35670 for main


Ignore:
Timestamp:
2021-10-22T17:43:33+13:00 (2 years ago)
Author:
davidb
Message:

Further adjustment of how ant build.xml checks for the version of java it is running. Locking in to 'java.specification.version' which serves up 'top-level' details (Major.Minor form) without going into sub-update release info. Using this form is easier to test within build.xml, and does not suffer from the 'ant.java.version' property, which locks on to the version of Java that produced ant.jar

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/build.xml

    r35638 r35670  
    351351    For Java 1.4, we use Tomcat 5.5, for Java5 and higher, we use Tomcat 8.x-->
    352352  <condition property="tomcat.version" value="apache-tomcat-5.5.25" else="apache-tomcat-8.5.51">
    353     <equals arg1="1.4" arg2="${ant.java.version}"/>
     353    <equals arg1="1.4" arg2="${java.specification.version}"/>
    354354  </condition>
    355355  <condition property="tomcat.version.major" value="5" else="8">
    356     <equals arg1="1.4" arg2="${ant.java.version}"/>
     356    <equals arg1="1.4" arg2="${java.specification.version}"/>
    357357  </condition>
    358358  <condition property="privileged.attribute" value="privileged='true'" else="">
    … …  
    917917
    918918  <target name="test-setup">
    919     <echo>ant version      = ${ant.version}</echo>
    920     <echo>ant java version = ${ant.java.version}</echo>
     919    <echo>ant.version   = ${ant.version}</echo>
     920    <echo>java.version  = ${java.specification.version} (specification version)</echo>
     921    <echo></echo>
    921922    <echo>is unix       : ${current.os.isunix}</echo>
    922923    <echo>is mac        : ${current.os.ismac}</echo>
    … …  
    13861387    <condition property="java.too.old">
    13871388      <or>
    1388         <equals arg1="1.1" arg2="${ant.java.version}"/>
    1389         <equals arg1="1.2" arg2="${ant.java.version}"/>
    1390         <equals arg1="1.3" arg2="${ant.java.version}"/>
    1391         <equals arg1="1.4" arg2="${ant.java.version}"/>
    1392         <equals arg1="1.5" arg2="${ant.java.version}"/>
    1393         <equals arg1="1.6" arg2="${ant.java.version}"/>
    1394         <equals arg1="1.7" arg2="${ant.java.version}"/>
     1389        <equals arg1="1.1" arg2="${java.specification.version}"/>
     1390        <equals arg1="1.2" arg2="${java.specification.version}"/>
     1391        <equals arg1="1.3" arg2="${java.specification.version}"/>
     1392        <equals arg1="1.4" arg2="${java.specification.version}"/>
     1393        <equals arg1="1.5" arg2="${java.specification.version}"/>
     1394        <equals arg1="1.6" arg2="${java.specification.version}"/>
     1395        <equals arg1="1.7" arg2="${java.specification.version}"/>
    13951396      </or>
    13961397    </condition>
    … …  
    14331434          <istrue value="${packages.tomcat.ispresent}"/>
    14341435          <istrue value="${packages.tomcat.istomcat8}"/>
    1435           <equals arg1="1.4" arg2="${ant.java.version}"/>
     1436          <equals arg1="1.4" arg2="${java.specification.version}"/>
    14361437        </and>
    14371438      </bool>
    … …  
    15391540    <condition property="need.xalan.jar">
    15401541      <or>
    1541         <not><equals arg1="1.4" arg2="${ant.java.version}"/></not>
     1542        <not><equals arg1="1.4" arg2="${java.specification.version}"/></not>
    15421543      </or>
    15431544    </condition>
    … …  
    23932394      we would need to have the tomcat compat package to work with Java 1.4-->
    23942395      <if>
    2395     <bool><equals arg1="1.4" arg2="${ant.java.version}"/></bool>
     2396    <bool><equals arg1="1.4" arg2="${java.specification.version}"/></bool>
    23962397    <!--
    23972398    <get src="${gsorg.root}/gs3files/${tomcat.version}-compat.zip"
Note: See TracChangeset for help on using the changeset viewer.