harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r633863 - in /harmony/enhanced/buildtest/trunk/infra: build.xml scripts/framework.xml
Date Wed, 05 Mar 2008 14:47:13 GMT
Author: smishura
Date: Wed Mar  5 06:47:09 2008
New Revision: 633863

URL: http://svn.apache.org/viewvc?rev=633863&view=rev
Log:
Move targets 'fetch-depends' & 'checkout-projects' to build.xml

Modified:
    harmony/enhanced/buildtest/trunk/infra/build.xml
    harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml

Modified: harmony/enhanced/buildtest/trunk/infra/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/build.xml?rev=633863&r1=633862&r2=633863&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/build.xml Wed Mar  5 06:47:09 2008
@@ -70,8 +70,13 @@
                          Framework Setup Functionality
          ================================================================== -->
     <target name="setup"
-            depends="create-local-configuration, setup-framework, -save-suites-configuration,
-                        load-required-parameters, save-required-parameters" />
+            depends="fetch-depends,
+                     checkout-projects,
+                     create-local-configuration,
+                     setup-framework,
+                     -save-suites-configuration,
+                     load-required-parameters,
+                     save-required-parameters" />
 
     <target name="-save-suites-configuration" depends="define-ant-contrib">
         <echo file="${selected.suites.configuration}"># autogenerated file containing
test run setup information
@@ -107,6 +112,37 @@
 # For more information on which parameters can be configured see
 #     ${scripts.dir}/parameters.xml
 </echo>
+    </target>
+
+    <target name="fetch-depends">
+        <property name="download.xml" location="${scripts.dir}/download.xml" />
+
+        <!-- create empty file -->
+        <echo file="${external.resources.location}" message="" />
+
+        <!-- download framework dependencies -->
+        <subant genericantfile="${download.xml}"
+                target="download-all"
+                buildpath="${scripts.dir}"
+                inheritall="true" />
+
+        <!-- download suites dependencies -->
+        <subant genericantfile="${download.xml}"
+                target="download-all"
+                inheritall="true">
+            <dirset dir="${adaptors.dir}" includes="${test.suites}" />
+        </subant>
+    </target>
+
+    <target name="checkout-projects" depends="make-dirs">
+        <property name="svn.xml" location="${scripts.dir}/svn.xml" />
+
+        <!-- download suites dependencies -->
+        <subant genericantfile="${svn.xml}"
+                target="checkout-all"
+                inheritall="true">
+            <dirset dir="${adaptors.dir}" includes="${test.suites}" />
+        </subant>
     </target>
 
     <!-- ================================================================== 

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml?rev=633863&r1=633862&r2=633863&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml Wed Mar  5 06:47:09 2008
@@ -51,7 +51,7 @@
 
     <!-- Sets up the framework -->
     <target name="setup-framework" 
-            depends="fetch-depends, checkout-projects, load-depends, define-tasks, make-dirs,
patch-ant, 
+            depends="load-depends, define-tasks, make-dirs, patch-ant, 
                         check-selected-names, reorder-suites, -delete-temporal-properties"/>
 
     <!-- Initialize the framework for test execution -->
@@ -98,30 +98,6 @@
          obtained on setup stage -->
     <target name="load-suites-configuration" depends="define-ant-contrib">
         <var file="${selected.suites.configuration}"/>
-    </target>
-
-    <target name="fetch-depends">
-        <property name="download.xml" location="${scripts.dir}/download.xml"/>
-
-        <!-- create empty file -->
-        <echo file="${external.resources.location}" message=""/>
-        
-        <!-- download framework dependencies -->
-        <subant genericantfile="${download.xml}" target="download-all" buildpath="${scripts.dir}"
inheritall="true"/>
-        
-        <!-- download suites dependencies -->
-        <subant genericantfile="${download.xml}" target="download-all"  inheritall="true">
-            <dirset dir="${adaptors.dir}" includes="${test.suites}"/>
-        </subant>
-    </target>
-
-    <target name="checkout-projects" depends="make-dirs">
-        <property name="svn.xml" location="${scripts.dir}/svn.xml"/>
-
-        <!-- download suites dependencies -->
-        <subant genericantfile="${svn.xml}" target="checkout-all"  inheritall="true">
-            <dirset dir="${adaptors.dir}" includes="${test.suites}"/>
-        </subant>
     </target>
 
     <condition property="ant.to.patch" value="1.6.5">



Mime
View raw message