Changeset 16741 for release-kits/mark2/ant-scripts/build.xml

Timestamp:

2008-08-13T11:40:57+12:00 (16 years ago)

Author:

oranfry

Message:

changes to mark2 after ant hack cleaned up

File:

• release-kits/mark2/ant-scripts/build.xml (modified) (4 diffs)

release-kits/mark2/ant-scripts/build.xml

@@ -7 +7 @@
         ..........................................................
 -->
+
 <project name="mark2-build" default="mark2">
 
 
     <!-- CONSTANTS -->
-
-    <!-- set current month and year-->
-    <exec executable="date" outputproperty="current.month"><arg value="+%b"/></exec>
-    <exec executable="date" outputproperty="current.year"><arg value="+%Y"/></exec>
 
     <!-- for the benefit of the shared scripts, set release-kit home -->
@@ -21 +18 @@
     <!-- IMPORT OTHER ANT SCRIPTS -->
     <import file="shared-ant-scripts/init.xml"/>
+    <import file="shared-ant-scripts/operations-on-gli.xml"/>
     <import file="compile.xml"/>
     <import file="create-distribution.xml"/>
@@ -28 +26 @@
     <!-- TARGET TO PERFORM ADDITIONAL PRECONDITION CHECKS -->
     <target name="mark2-init">
-        <echo>Determining Processor...</echo>
         <if>
             <bool>
                 <or><equals arg1="${processor}" arg2="ppc" /><equals arg1="${processor}" arg2="intel"/></or>
             </bool>
-
-            <echo>Processor: ${processor}</echo>
-            <echo/>
 
             <else>
@@ -42 +36 @@
             </else>
         </if>
+        <echo>Processor: ${processor}</echo>
     </target>
 
     <!-- THE MAIN TARGET -->
     <target name="mark2" depends="init,mark2-init">
-        <addressedcall target="compile"/>
-        <addressedcall target="create-distribution"/>
-        <addressedcall target="create-installer"/>
-        <addressedcall target="wrap"/>
+        <antcall target="compile"/>
+        <antcall target="create-distribution"/>
+        <antcall target="create-installer"/>
+        <antcall target="wrap"/>
     </target>