harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r645400 - in /harmony/enhanced/buildtest/trunk/infra: build.xml scripts/cc-project.xml
Date Mon, 07 Apr 2008 07:00:25 GMT
Author: smishura
Date: Mon Apr  7 00:00:22 2008
New Revision: 645400

URL: http://svn.apache.org/viewvc?rev=645400&view=rev
Log:
Move support target '-prepare-cc' to build.xml

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=645400&r1=645399&r2=645400&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/build.xml Mon Apr  7 00:00:22 2008
@@ -333,8 +333,11 @@
 
     <target name="run-cc"
             description="run-cc"
-            depends="check-setup, init-framework,
-                        create-cc-configuration">
+            depends="check-setup,
+                     -prepare-cc,
+                     init-framework,
+                     create-cc-configuration">
+
         <java jar="${ext.cc.location}/lib/cruisecontrol-launcher.jar"
               dir="${cc.work.dir}"
               fork="true">
@@ -348,6 +351,23 @@
             <arg line="-configfile ${cc.config.file} -webapppath ${ext.cc.location}/webapps/cruisecontrol
-jmxport ${framework.parameters.cc.jmxport} -webport ${framework.parameters.cc.webport}" />
             <jvmarg line="-Xmx700M" />
         </java>
+    </target>
+
+    <target name="-prepare-cc"
+            depends="define-ant-contrib,load-framework-parameters">
+        <sequential>
+            <if>
+                <istrue value="${framework.parameters.cc.doclean}" />
+                <then>
+                    <delete quiet="true" verbose="false">
+                        <fileset dir="${build.dir}/cc" includes="**/*" />
+                    </delete>
+                </then>
+            </if>
+            <mkdir dir="${cc.work.dir}" />
+            <mkdir dir="${cc.log.dir}" />
+            <touch file="${cc.execution.status.file}" />
+        </sequential>
     </target>
 
     <target name="check-setup">

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=645400&r1=645399&r2=645400&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml Mon Apr  7 00:00:22 2008
@@ -20,27 +20,7 @@
      ====================================================================== -->
 <project name="cc" default="create-cc-configuration" basedir=".">
 
-    <!--
-                        Framework Retated Functionality
-    -->
-
-    <target name="-prepare-cc">
-        <sequential>
-        <if>
-            <istrue value="${framework.parameters.cc.doclean}"/>
-        <then>
-            <delete quiet="true" verbose="false">
-                <fileset dir="${build.dir}/cc" includes="**/*"/>
-            </delete>
-        </then>
-        </if>
-        <mkdir dir="${cc.work.dir}"/>
-        <mkdir dir="${cc.log.dir}"/>
-        <touch file="${cc.execution.status.file}"/>
-        </sequential>
-    </target>
-    
-    <target name="create-cc-configuration" depends="init-framework, init-suites, -prepare-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}" 



Mime
View raw message