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/26 12:21:58 UTC
svn commit: r641257 - /harmony/enhanced/buildtest/trunk/infra/build.xml
Author: smishura
Date: Wed Mar 26 04:21:53 2008
New Revision: 641257
URL: http://svn.apache.org/viewvc?rev=641257&view=rev
Log:
Minor fixes:
* setup doesn't depends on -init-install
* do config dir cleanup
* move create-local-configuration to install targets
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=641257&r1=641256&r2=641257&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/build.xml Wed Mar 26 04:21:53 2008
@@ -128,6 +128,8 @@
<mkdir dir="${results.dir}" />
<mkdir dir="${temp.files.dir}" />
<mkdir dir="${classes.dir}" />
+
+ <delete dir="${config.dir}" />
<mkdir dir="${config.dir}" />
<!-- init properties -->
@@ -137,6 +139,10 @@
<condition property="is.ant.1.7.0">
<contains string="${ant.version}" substring="1.7.0" />
</condition>
+
+ <condition property="framework.local.config.exists">
+ <available file="${framework.local.configuration.file}" />
+ </condition>
</target>
<target name="fetch-depends" depends="-init-install,-check-selected-names">
@@ -224,13 +230,24 @@
<!-- TODO check generated required-parameters.properties -->
</target>
+
+ <target name="create-local-configuration"
+ depends="-init-install"
+ unless="framework.local.config.exists">
+ <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>
+
<!-- ==================================================================
Framework Setup Functionality
================================================================== -->
<target name="setup"
- depends="-init-install,
- setup-framework,
+ depends="setup-framework,
-save-suites-configuration,
load-required-parameters,
save-required-parameters" />
@@ -255,23 +272,6 @@
</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>
-
-
<!-- ==================================================================
Test Execution Functionality