Changeset 22092 for main/trunk/release-kits/shared/core/ant-scripts/shared.xml

Timestamp:

2010-05-17T13:41:41+12:00 (14 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:

• main/trunk/release-kits/shared/core/ant-scripts/shared.xml (modified) (3 diffs)

main/trunk/release-kits/shared/core/ant-scripts/shared.xml

@@ -16 +16 @@
         <property name="svn.root" value="http://svn.greenstone.org" />
 
-        <!-- default revision and branch path -->
-        <property name="branch.path" value="trunk" />
-        <property name="branch.revision" value="HEAD" />
-    
         <!-- the minimum version of java which the installer should be run with (this gets used in search4j) -->
         <property name="java.min.version" value="1.4.0_00"/>
@@ -91 +87 @@
         <typedef name="rsplit" classname="org.greenstone.anttasks.SplitResource" classpathref="project.classpath"/>
         <typedef name="get-property-value" classname="org.greenstone.anttasks.GetPropertyValue" classpathref="project.classpath"/>
+
+        <!-- default revision and branch path -->
+        <property name="branch.revision" value="HEAD" />
+        <property name="branch.tag.name" value="trunk" />
+        <property name="branch.tag.version" value="" />
+
+        <if><bool><equals arg1="${branch.tag.name}" arg2="trunk" /></bool>
+
+          <property name="branch.path" value="${branch.tag.name}" />
+          
+          <else>
+            <if>
+              <bool>
+            <not><equals arg1="${branch.tag.version}" arg2="" /></not>
+              </bool>
+              <property name="branch.path" value="${branch.tag.name}/${branch.tag.version}" />
+              <else>
+            <fail>Cannot use use a branch.tag.name that is not 'trunk' without also defining branch.tag.version</fail>
+              </else>
+            </if>
+          </else>
+        </if>
     
         <!-- DATES IN DIFFERENT LANGUAGES -->
@@ -142 +160 @@
                     <equals arg1="${os.name}" arg2="Windows ME"/>
                     <equals arg1="${os.name}" arg2="Windows Vista"/>
+                    <equals arg1="${os.name}" arg2="Windows 7"/>
                 </or>
             </bool>