harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r645430 - in /harmony/enhanced/buildtest/trunk/infra: build.xml scripts/cc-project.xml
Date Mon, 07 Apr 2008 09:36:54 GMT
Author: smishura
Date: Mon Apr  7 02:36:53 2008
New Revision: 645430

URL: http://svn.apache.org/viewvc?rev=645430&view=rev
Log:
Switch run-cc target to using props generated by 'config.xml'

This is the last commit for switching all top-level targets
to using properties generated during install stage

Now I'm going to cleanup debris of previous implementation and update the docs.

Modified:
    harmony/enhanced/buildtest/trunk/infra/build.xml
    harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml

Modified: harmony/enhanced/buildtest/trunk/infra/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/build.xml?rev=645430&r1=645429&r2=645430&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/build.xml Mon Apr  7 02:36:53 2008
@@ -220,8 +220,6 @@
     <target name="generate-config"
             depends="-check-selected-names,create-local-configuration">
 
-        <!-- TODO: properties generated here currently are unused
-             need to check/fix properties flow -->
         <subant genericantfile="${scripts.dir}/config.xml"
                 target="generate-config"
                 inheritall="true"
@@ -335,9 +333,32 @@
             description="run-cc"
             depends="check-setup,
                      -prepare-cc,
-                     init-framework,
-                     create-cc-configuration">
+                     -get-installed-suites,
+                     load-suites-configuration">
+
+        <!-- Create Main CC Configuration File -->
+        <delete file="${cc.config.file}" />
+        <copy file="${cc.config.template}" tofile="${cc.config.file}" />
+
+        <subant genericantfile="${scripts.dir}/cc-project.xml"
+                target="generate-cc-config"
+                inheritall="true"
+                inheritrefs="true">
+            <dirset dir="${adaptors.dir}" includes="${installed.suites.list}" />
+        </subant>
+
+        <!-- setup CC properties and clear last token in main config file -->
+        <replace file="${cc.config.file}">
+            <replacefilter token="@BT.ROOTDIR@" value="${root.dir}" />
+            <replacefilter token="@BT.PROPERTIES@"
+                           value="${framework.properties.file}" />
+
+            <replacetoken>@PROJECT@</replacetoken>
+            <replacevalue>
+            </replacevalue>
+        </replace>
 
+        <!-- launch Cruise Control -->
         <java jar="${ext.cc.location}/lib/cruisecontrol-launcher.jar"
               dir="${cc.work.dir}"
               fork="true">

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml?rev=645430&r1=645429&r2=645430&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml Mon Apr  7 02:36:53 2008
@@ -18,20 +18,21 @@
 <!-- ====================================================================== 
                    Ant's script supplementing CC functionality
      ====================================================================== -->
-<project name="cc" default="create-cc-configuration" basedir=".">
+<project name="cc">
 
-    <target name="create-cc-configuration" depends="init-framework, init-suites">
-        <!-- Create Main CC Configuration File -->
-        <delete file="${cc.config.file}"/>
-        <copy file="${cc.config.template}" 
-              tofile="${cc.config.file}"/>
+    <target name="generate-cc-config">
+
+        <basename file="${basedir}" property="suite.name" />
+        <property file="${config.dir}/${suite.name}.properties" />
+
+        <create-cc-configuration suite.name="${suite.name}" />
+    </target>
+    
+    <macrodef name="create-cc-configuration">
+        <attribute name="suite.name"/>
 
         <!-- Create Project Files corresponding to selected Test Suites -->
-        <for list="${test.suites.names.list}" param="suite.name">
             <sequential>
-                <log message="==> Process CC Configuration File for '@{suite.name}'"/>
-                <!-- print-parameters suite="@{suite.name}"/ -->
-
                 <mkdir dir="${cc.log.dir}/@{suite.name}"/>
                 <property name="@{suite.name}.parameters.cc.filename"
                           value="cc-@{suite.name}-project.xml"/>
@@ -193,21 +194,7 @@
                 </replace>
 
             </sequential>
-        </for>
-
-        <!-- setup CC properties and clear last token in main config file -->
-        <replace file="${cc.config.file}">
-            <replacefilter 
-                token="@BT.ROOTDIR@" 
-                value="${root.dir}"/>
-            <replacefilter 
-                token="@BT.PROPERTIES@" 
-                value="${framework.properties.file}"/>
-
-            <replacetoken>@PROJECT@</replacetoken>
-            <replacevalue></replacevalue>
-        </replace>
-    </target>
+    </macrodef>
 
     <macrodef name="insert-adaptorcall">
         <attribute name="suite"/>



Mime
View raw message