Changeset 27834


Ignore:
Timestamp:
2013-07-13T00:14:49+12:00 (11 years ago)
Author:
davidb
Message:

Test for windows relied on a property that had not been set yet (for read-only test). Rearranged to operate correctly

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/build.xml

    r27829 r27834  
    5252
    5353  -->
     54
     55  <property name="os.linux" value="Linux"/>
     56  <property name="os.mac" value="Mac OS X"/>
     57  <property name="os.solaris" value="SunOS"/>
     58  <property name="os.unix" value="${os.linux},${os.mac},${os.solaris}"/>
     59  <property name="os.windows" value="Windows 95,Windows 98,Windows 2000,Windows 2003,Windows XP,Windows NT,Windows ME,Windows Vista,Windows 7"/> <!-- check this!!!-->
     60
     61  <!-- this is true for linux and macs -->
     62  <condition property="current.os.isunix">
     63    <os family="unix"/>
     64  </condition>
     65 
     66  <condition property="current.os.isunixnotmac">
     67    <and>
     68      <os family="unix"/>
     69      <not>
     70    <os family="mac"/>
     71      </not>
     72    </and>
     73  </condition>
     74 
     75  <condition property="current.os.ismac">
     76    <os family="mac"/>
     77  </condition>
     78 
     79  <condition property="current.os.iswindows">
     80    <os family="windows"/>
     81  </condition>
    5482
    5583  <!-- create build.properties if it has not been created yet -->
    … …  
    151179
    152180      <if>
    153     <bool><equals arg1="${os.bin.dir}" arg2="windows"/></bool>
     181    <bool><istrue value="${current.os.iswindows}"/></bool>
    154182    <copy todir="${gsdl3.writablehome}/packages/tomcat"
    155183          preservelastmodified="true"
    … …  
    224252  </condition>
    225253 
    226   <property name="os.linux" value="Linux"/>
    227   <property name="os.mac" value="Mac OS X"/>
    228   <property name="os.solaris" value="SunOS"/>
    229   <property name="os.unix" value="${os.linux},${os.mac},${os.solaris}"/>
    230   <property name="os.windows" value="Windows 95,Windows 98,Windows 2000,Windows 2003,Windows XP,Windows NT,Windows ME,Windows Vista,Windows 7"/> <!-- check this!!!-->
    231 
    232   <!-- this is true for linux and macs -->
    233   <condition property="current.os.isunix">
    234     <os family="unix"/>
    235   </condition>
    236  
    237   <condition property="current.os.isunixnotmac">
    238     <and>
    239       <os family="unix"/>
    240       <not>
    241     <os family="mac"/>
    242       </not>
    243     </and>
    244   </condition>
    245  
    246   <condition property="current.os.ismac">
    247     <os family="mac"/>
    248   </condition>
    249  
    250   <condition property="current.os.iswindows">
    251     <os family="windows"/>
    252   </condition>
    253254
    254255  <!-- is there a better way to do this?? what about solaris?? -->
Note: See TracChangeset for help on using the changeset viewer.