Return-Path: 
 <commits-return-30896-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 16210 invoked from network); 19 Mar 2007 10:34:11 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 19 Mar 2007 10:34:11 -0000
Received: (qmail 76740 invoked by uid 500); 19 Mar 2007 10:34:18 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 76719 invoked by uid 500); 19 Mar 2007 10:34:18 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 76710 invoked by uid 99); 19 Mar 2007 10:34:18 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Mar 2007 03:34:18 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Mar 2007 03:34:09 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8C6BF1A9838; Mon, 19 Mar 2007 03:33:49 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r519896 - in /harmony/enhanced/buildtest/trunk: build.xml
 modules/classlib-drlvm/build.xml modules/classlib/build.xml
 modules/drlvm-test/build.xml modules/drlvm/build.xml properties.xml
Date: Mon, 19 Mar 2007 10:33:49 -0000
To: commits@harmony.apache.org
From: smishura@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070319103349.8C6BF1A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: smishura
Date: Mon Mar 19 03:33:48 2007
New Revision: 519896

URL: http://svn.apache.org/viewvc?view=rev&rev=519896
Log:
Move 'cc.properties' file generation to '-gen-config' target

Modified:
    harmony/enhanced/buildtest/trunk/build.xml
    harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/build.xml
    harmony/enhanced/buildtest/trunk/modules/classlib/build.xml
    harmony/enhanced/buildtest/trunk/modules/drlvm-test/build.xml
    harmony/enhanced/buildtest/trunk/modules/drlvm/build.xml
    harmony/enhanced/buildtest/trunk/properties.xml

Modified: harmony/enhanced/buildtest/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/build.xml?view=diff&rev=519896&r1=519895&r2=519896
==============================================================================
--- harmony/enhanced/buildtest/trunk/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/build.xml Mon Mar 19 03:33:48 2007
@@ -41,6 +41,7 @@
 
     <!-- generated configuration file -->
     <property name="configfile" location="${target.dir}/config.xml" />
+    <property name="propertyfile" location="${target.dir}/cc.properties" />
 
     <!-- url of the classlib and drlvm in SVN -->
     <property name="svn.classlib.url" value="https://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk" />
@@ -120,7 +121,7 @@
         <setproxy proxyhost="${http-proxy-host}" proxyport="${need.proxy.port}" />
 
         <!-- property file for CC -->
-        <echo file="${target.dir}/cc.properties" append="false">#This file was generated by 'build.xml'
+        <echo file="${propertyfile}" append="false">#This file was generated by 'build.xml'
 proxy.host.property=http.proxyHost
 proxy.port.property=http.proxyPort
 proxy.host.vm=env.http.proxyHost
@@ -133,7 +134,7 @@
     </target>
     <target name="no.proxy" unless="http-proxy-host">
         <!-- property file for CC -->
-        <echo file="${target.dir}/cc.properties" append="false">#This file was generated by 'build.xml'
+        <echo file="${propertyfile}" append="false">#This file was generated by 'build.xml'
 proxy.host.property=no.http.proxyHost
 proxy.port.property=no.http.proxyPort
 proxy.host.vm=no.env.http.proxyHost
@@ -170,7 +171,7 @@
     <!-- ==========================================
          Main setup - download, unpack, checkout
          ========================================== -->
-    <target name="setup" description="fetch and setup build/test/ci system" depends="set.proxy,no.proxy">
+    <target name="setup" description="fetch and setup build/test/ci system">
 
         <!-- get the version of CruiseControl unless we have the zip locally -->
 
@@ -218,18 +219,6 @@
         <antcall target="co-drlvm" />
         <antcall target="process-drlvm" />
 
-        <echo file="${target.dir}/cc.properties" append="true">
-wdir=${target.dir}
-timeout=${cycle_timeout}
-ttimeout=${task_timeout}
-build_cfg=${build_configuration}
-build_arch=${build.arch}
-cc_webcontent=${target.dir}/webapps/cruisecontrol
-server_addr=${mail_server}
-report_to=${report_failures_to}
-report_from=${report_failures_from}
-</echo>
-
     </target>
 
     <!-- ================================================
@@ -257,14 +246,6 @@
     </target>
 
     <target name="drlvm-win" if="is.windows">
-        <echo file="${target.dir}/cc.properties" append="true">
-os=win
-sh=cmd
-cmd.prefix=/c
-cmd=build.bat
-cc=msvc
-</echo>
-
         <replace file="${target.dir}/cruisecontrol.bat" token="REM set CC_OPTS=-Xms128m -Xmx256m">
             <replacevalue><![CDATA[set CC_OPTS=-Xmx500m
 set BUILD_CFG=@@@@@
@@ -295,14 +276,6 @@
     </target>
 
     <target name="drlvm-other" unless="is.windows">
-        <echo file="${target.dir}/cc.properties" append="true">
-os=lnx
-sh=sh
-cmd.prefix=
-cmd=build.sh
-cc=gcc
-</echo>
-
         <replace file="${target.dir}/cruisecontrol.sh" token='# CC_OPTS="-Xms128m -Xmx256m"'>
             <replacevalue><![CDATA[CC_OPTS="-Xmx500m"
 BUILD_CFG=@@@@@
@@ -331,11 +304,34 @@
         <delete dir="${target.dir}" includeEmptyDirs="true"/>
     </target>
 
+    <!-- =========================================================
+         Generate configuration files for CC
+         ========================================================= -->
     <property name="modules" value="drlvm-test,classlib-drlvm" />
 
-    <target name="gen-config">
-        
-        <!-- gen cruisecontrol config file -->
+    <target name="gen-config" depends="set.proxy,no.proxy">
+
+        <!-- clean up before generation -->
+        <delete>
+            <fileset dir="modules">
+                <include name="**/*.done" />
+            </fileset>
+        </delete>
+
+        <!-- generate cruisecontrol property file -->
+        <echo file="${propertyfile}" append="true">
+wdir=${target.dir}
+timeout=${cycle_timeout}
+ttimeout=${task_timeout}
+build_cfg=${build_configuration}
+build_arch=${build.arch}
+cc_webcontent=${target.dir}/webapps/cruisecontrol
+server_addr=${mail_server}
+report_to=${report_failures_to}
+report_from=${report_failures_from}
+</echo>
+
+        <!-- generate cruisecontrol config file -->
         <echo file="${configfile}">
 &lt;cruisecontrol&gt;
 
@@ -344,10 +340,12 @@
         <subant target="-gen-config">
             <dirset dir="modules" includes="${modules}" />
             <property name="configfile" value="${configfile}" />
+            <property name="propertyfile" value="${propertyfile}" />
+            <property name="is.windows" value="${is.windows}" />
         </subant>
         <echo file="${configfile}" message="&lt;/cruisecontrol&gt;" append="true" />
 
-        <!-- clean up -->
+        <!-- clean up after generation -->
         <delete>
             <fileset dir="modules">
                 <include name="**/*.done" />

Modified: harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/build.xml?view=diff&rev=519896&r1=519895&r2=519896
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/build.xml Mon Mar 19 03:33:48 2007
@@ -19,9 +19,10 @@
 
     <import file="../../properties.xml" />
 
-    <target name="-gen-config">
+    <target name="-gen-config" unless="setup.done">
         <subant target="-gen-config" buildpath="../drlvm" />
         <process-project-template project="classlib-drlvm" />
+        <touch file="setup.done" />
     </target>
 
 </project>

Modified: harmony/enhanced/buildtest/trunk/modules/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/classlib/build.xml?view=diff&rev=519896&r1=519895&r2=519896
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/classlib/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/modules/classlib/build.xml Mon Mar 19 03:33:48 2007
@@ -19,7 +19,8 @@
 
     <import file="../../properties.xml" />
 
-    <target name="-gen-config">
+    <target name="-gen-config" unless="setup.done">
         <process-project-template project="classlib" />
+        <touch file="setup.done" />
     </target>
 </project>

Modified: harmony/enhanced/buildtest/trunk/modules/drlvm-test/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/drlvm-test/build.xml?view=diff&rev=519896&r1=519895&r2=519896
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/drlvm-test/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/modules/drlvm-test/build.xml Mon Mar 19 03:33:48 2007
@@ -19,8 +19,9 @@
 
     <import file="../../properties.xml" />
 
-    <target name="-gen-config">
+    <target name="-gen-config" unless="setup.done">
         <subant target="-gen-config" buildpath="../drlvm" />
         <process-project-template project="drlvm-test" />
+        <touch file="setup.done" />
     </target>
 </project>

Modified: harmony/enhanced/buildtest/trunk/modules/drlvm/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/drlvm/build.xml?view=diff&rev=519896&r1=519895&r2=519896
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/drlvm/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/modules/drlvm/build.xml Mon Mar 19 03:33:48 2007
@@ -19,8 +19,34 @@
 
     <import file="../../properties.xml" />
 
-    <target name="-gen-config">
-        <subant target="-gen-config" buildpath="../classlib"/>
+    <target name="-gen-config" unless="setup.done">
+        <subant target="-gen-config" buildpath="../classlib" />
         <process-project-template project="drlvm" />
+
+        <subant target="-gen-config-win" buildpath="." />
+        <subant target="-gen-config-other" buildpath="." />
+
+        <touch file="setup.done" />
     </target>
+
+    <target name="-gen-config-win" if="is.windows">
+        <echo file="${propertyfile}" append="true">
+os=win
+sh=cmd
+cmd.prefix=/c
+cmd=build.bat
+cc=msvc
+</echo>
+    </target>
+
+    <target name="-gen-config-other" unless="is.windows">
+        <echo file="${propertyfile}" append="true">
+os=lnx
+sh=sh
+cmd.prefix=
+cmd=build.sh
+cc=gcc
+</echo>
+    </target>
+
 </project>

Modified: harmony/enhanced/buildtest/trunk/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/properties.xml?view=diff&rev=519896&r1=519895&r2=519896
==============================================================================
--- harmony/enhanced/buildtest/trunk/properties.xml (original)
+++ harmony/enhanced/buildtest/trunk/properties.xml Mon Mar 19 03:33:48 2007
@@ -17,23 +17,22 @@
 -->
 <project>
 
+    <available property="setup.done" file="setup.done" />
+
     <macrodef name="process-project-template">
         <attribute name="project" />
         <sequential>
-            <available property="@{project}.genconfig.done" file="@{project}.genconfig.done" />
-
             <concat destfile="${configfile}" append="true">
                 <fileset dir=".">
-                    <include name="project.template" unless="@{project}.genconfig.done" />
+                    <include name="project.template" />
                 </fileset>
                 <filterchain>
                     <striplinecomments>
                         <comment value="#" />
                     </striplinecomments>
-                    <prefixlines prefix="    "/>
+                    <prefixlines prefix="    " />
                 </filterchain>
             </concat>
-            <touch file="@{project}.genconfig.done" />
         </sequential>
     </macrodef>