Changeset 22092


Ignore:
Timestamp:
2010-05-17T13:41:41+12:00 (11 years ago)
Author:
sjm84
Message:

Added Windows 7 to the list of os names that is considered as Windows. Also created branch.path from two new properties, specifically, branch.tag.name and branch.tag.version

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/shared/core/ant-scripts/shared.xml

    r21867 r22092  
    1616        <property name="svn.root" value="http://svn.greenstone.org" />
    1717
    18         <!-- default revision and branch path -->
    19         <property name="branch.path" value="trunk" />
    20         <property name="branch.revision" value="HEAD" />
    21    
    2218        <!-- the minimum version of java which the installer should be run with (this gets used in search4j) -->
    2319        <property name="java.min.version" value="1.4.0_00"/>
     
    9187        <typedef name="rsplit" classname="org.greenstone.anttasks.SplitResource" classpathref="project.classpath"/>
    9288        <typedef name="get-property-value" classname="org.greenstone.anttasks.GetPropertyValue" classpathref="project.classpath"/>
     89
     90        <!-- default revision and branch path -->
     91        <property name="branch.revision" value="HEAD" />
     92        <property name="branch.tag.name" value="trunk" />
     93        <property name="branch.tag.version" value="" />
     94
     95        <if><bool><equals arg1="${branch.tag.name}" arg2="trunk" /></bool>
     96
     97          <property name="branch.path" value="${branch.tag.name}" />
     98         
     99          <else>
     100            <if>
     101              <bool>
     102            <not><equals arg1="${branch.tag.version}" arg2="" /></not>
     103              </bool>
     104              <property name="branch.path" value="${branch.tag.name}/${branch.tag.version}" />
     105              <else>
     106            <fail>Cannot use use a branch.tag.name that is not 'trunk' without also defining branch.tag.version</fail>
     107              </else>
     108            </if>
     109          </else>
     110        </if>
    93111   
    94112        <!-- DATES IN DIFFERENT LANGUAGES -->
     
    142160                    <equals arg1="${os.name}" arg2="Windows ME"/>
    143161                    <equals arg1="${os.name}" arg2="Windows Vista"/>
     162                    <equals arg1="${os.name}" arg2="Windows 7"/>
    144163                </or>
    145164            </bool>
Note: See TracChangeset for help on using the changeset viewer.