You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2008/03/21 07:23:59 UTC
svn commit: r639551 - /harmony/enhanced/buildtest/trunk/infra/build.xml
Author: smishura
Date: Thu Mar 20 23:23:48 2008
New Revision: 639551
URL: http://svn.apache.org/viewvc?rev=639551&view=rev
Log:
Move fetch-depends,checkout-projects,patch-ant to install stage
Modified:
harmony/enhanced/buildtest/trunk/infra/build.xml
Modified: harmony/enhanced/buildtest/trunk/infra/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/build.xml?rev=639551&r1=639550&r2=639551&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/build.xml Thu Mar 20 23:23:48 2008
@@ -70,7 +70,8 @@
Install
================================================================== -->
- <target name="install" depends="-check-selected-names" />
+ <target name="install"
+ depends="fetch-depends,checkout-projects,patch-ant" />
<target name="-check-selected-names">
@@ -112,10 +113,8 @@
<delete file="${tmp.file}" />
</target>
- <!-- ==================================================================
- Framework Setup Functionality
- ================================================================== -->
- <target name="-init-setup">
+
+ <target name="-init-install">
<!-- create dirs -->
<mkdir dir="${build.dir}" />
@@ -133,53 +132,7 @@
</condition>
</target>
- <target name="setup"
- depends="-init-setup,
- 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
-
-# Selected test suites will be executed in the following order:${line.separator}</echo>
- <echo file="${selected.suites.configuration}"
- append="true"
- message="test.suites.names.list=${test.suites.names.list}${line.separator}" />
-
- <echo file="${selected.suites.configuration}" append="true">
-# This order has been obtained on the base of the following
-# information about dependencies between test suites:${line.separator}</echo>
-
- <for list="${test.suites.names.list}" param="suite">
- <sequential>
- <echo file="${selected.suites.configuration}"
- append="true"
- message="@{suite}.parameters.depends=${@{suite}.parameters.depends}${line.separator}" />
- </sequential>
- </for>
- </target>
-
- <condition property="framework.local.config.exists">
- <available file="${framework.local.configuration.file}" />
- </condition>
-
- <target name="create-local-configuration"
- unless="framework.local.config.exists">
- <!-- create the file for local BTI configuration -->
- <echo file="${framework.local.configuration.file}">#
-# Any BTI framework local configuration properties
-# should be specified in this file.
-# For more information on which parameters can be configured see
-# ${scripts.dir}/parameters.xml
-</echo>
- </target>
-
- <target name="fetch-depends" depends="-init-setup">
+ <target name="fetch-depends" depends="-init-install,-check-selected-names">
<property name="download.xml" location="${scripts.dir}/download.xml" />
<!-- create empty file -->
@@ -199,7 +152,8 @@
</subant>
</target>
- <target name="checkout-projects" depends="-init-setup">
+ <target name="checkout-projects"
+ depends="-init-install,-check-selected-names">
<property name="svn.xml" location="${scripts.dir}/svn.xml" />
<!-- download suites dependencies -->
@@ -213,12 +167,12 @@
<!-- Tasks to patch Ant's Bug described at:
http://issues.apache.org/bugzilla/show_bug.cgi?id=30569
-->
- <target name="-patch-ant-1.6.5" depends="-init-setup" if="is.ant.1.6.5">
+ <target name="-patch-ant-1.6.5" depends="-init-install" if="is.ant.1.6.5">
<property name="ant.to.patch" value="1.6.5" />
<property name="ant.patch.url"
value="https://issues.apache.org/bugzilla/attachment.cgi?id=15681" />
</target>
- <target name="-patch-ant-1.7.0" depends="-init-setup" if="is.ant.1.7.0">
+ <target name="-patch-ant-1.7.0" depends="-init-install" if="is.ant.1.7.0">
<property name="ant.to.patch" value="1.7.0" />
<property name="ant.patch.url"
value="https://issues.apache.org/bugzilla/attachment.cgi?id=19566" />
@@ -248,6 +202,55 @@
</depend>
</javac>
</target>
+
+ <!-- ==================================================================
+ Framework Setup Functionality
+ ================================================================== -->
+
+ <target name="setup"
+ depends="-init-install,
+ 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
+
+# Selected test suites will be executed in the following order:${line.separator}</echo>
+ <echo file="${selected.suites.configuration}"
+ append="true"
+ message="test.suites.names.list=${test.suites.names.list}${line.separator}" />
+
+ <echo file="${selected.suites.configuration}" append="true">
+# This order has been obtained on the base of the following
+# information about dependencies between test suites:${line.separator}</echo>
+
+ <for list="${test.suites.names.list}" param="suite">
+ <sequential>
+ <echo file="${selected.suites.configuration}"
+ append="true"
+ message="@{suite}.parameters.depends=${@{suite}.parameters.depends}${line.separator}" />
+ </sequential>
+ </for>
+ </target>
+
+ <condition property="framework.local.config.exists">
+ <available file="${framework.local.configuration.file}" />
+ </condition>
+
+ <target name="create-local-configuration"
+ unless="framework.local.config.exists">
+ <!-- create the file for local BTI configuration -->
+ <echo file="${framework.local.configuration.file}">#
+# Any BTI framework local configuration properties
+# should be specified in this file.
+# For more information on which parameters can be configured see
+# ${scripts.dir}/parameters.xml
+</echo>
+ </target>
+
<!-- ==================================================================