harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r516979 - in /harmony/enhanced/buildtest/trunk: README.txt build.xml cc.properties.example config/config-full.xml config/copyres.xml
Date Sun, 11 Mar 2007 18:18:19 GMT
Author: ndbeyer
Date: Sun Mar 11 11:18:18 2007
New Revision: 516979

URL: http://svn.apache.org/viewvc?view=rev&rev=516979
Log:
Cleanup build files (remove tabs, correct spacing, etc)

Modified:
    harmony/enhanced/buildtest/trunk/README.txt
    harmony/enhanced/buildtest/trunk/build.xml
    harmony/enhanced/buildtest/trunk/cc.properties.example   (contents, props changed)
    harmony/enhanced/buildtest/trunk/config/config-full.xml
    harmony/enhanced/buildtest/trunk/config/copyres.xml

Modified: harmony/enhanced/buildtest/trunk/README.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/README.txt?view=diff&rev=516979&r1=516978&r2=516979
==============================================================================
--- harmony/enhanced/buildtest/trunk/README.txt (original)
+++ harmony/enhanced/buildtest/trunk/README.txt Sun Mar 11 11:18:18 2007
@@ -18,10 +18,10 @@
 
 2) Apache Ant : http://ant.apache.org/  Please get the 
     latest release (1.6 or better) and install
-	as per project intstructions.
+    as per project intstructions.
 
 3) Subversion client : http://subversion.tigris.org
-	
+    
 To Setup
 --------
 

Modified: harmony/enhanced/buildtest/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/build.xml?view=diff&rev=516979&r1=516978&r2=516979
==============================================================================
--- harmony/enhanced/buildtest/trunk/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/build.xml Sun Mar 11 11:18:18 2007
@@ -117,7 +117,7 @@
         <setproxy proxyhost="${http-proxy-host}" proxyport="${need.proxy.port}" />
 
         <!-- property file for CC -->
-        <echo file="${target.dir}/cc.properties" append="false">#it is auto-generated
file
+        <echo file="${target.dir}/cc.properties" 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
@@ -130,7 +130,7 @@
     </target>
     <target name="no.proxy" unless="http-proxy-host">
         <!-- property file for CC -->
-        <echo file="${target.dir}/cc.properties" append="false">#it is auto-generated
file
+        <echo file="${target.dir}/cc.properties" 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

Modified: harmony/enhanced/buildtest/trunk/cc.properties.example
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/cc.properties.example?view=diff&rev=516979&r1=516978&r2=516979
==============================================================================
--- harmony/enhanced/buildtest/trunk/cc.properties.example (original)
+++ harmony/enhanced/buildtest/trunk/cc.properties.example Sun Mar 11 11:18:18 2007
@@ -12,7 +12,7 @@
 ##     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ##     See the License for the specific language governing permissions and
 ##     limitations under the License.
-## ======================================================================================
+## ============================================================================
 ##
 ##  example properties file.  Please rename to "cc.properties" and configure
 ##  appropriately

Propchange: harmony/enhanced/buildtest/trunk/cc.properties.example
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/buildtest/trunk/config/config-full.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/config/config-full.xml?view=diff&rev=516979&r1=516978&r2=516979
==============================================================================
--- harmony/enhanced/buildtest/trunk/config/config-full.xml (original)
+++ harmony/enhanced/buildtest/trunk/config/config-full.xml Sun Mar 11 11:18:18 2007
@@ -41,28 +41,28 @@
         </modificationset>
 
         <schedule interval="${timeout}">
-                <ant target="fetch-depends rebuild" antWorkingDir="projects/${project.name}/trunk"
timeout="${ttimeout}" usedebug="false">
-                    <jvmarg arg="-D${proxy.host.property}=${proxy.value}"/>
-                    <jvmarg arg="-D${proxy.port.property}=${port.value}"/>
-                    <jvmarg arg="-Xmx700M" />
-                </ant>
+            <ant target="fetch-depends rebuild" antWorkingDir="projects/${project.name}/trunk"
timeout="${ttimeout}" usedebug="false">
+                <jvmarg arg="-D${proxy.host.property}=${proxy.value}"/>
+                <jvmarg arg="-D${proxy.port.property}=${port.value}"/>
+                <jvmarg arg="-Xmx700M" />
+            </ant>
         </schedule>
 
         <publishers>
             <onfailure>
                 <xsltlogpublisher directory="."  outfilename="classlib.txt"  xsltfile="br.xsl"
/>
-                <antpublisher   
+                <antpublisher 
                      antworkingdir="."  
                      buildfile="copyres.xml"  
                      uselogger="true"  
                      usedebug="true"  
                      target="email.res"> 
-                     <property name="file" value="classlib.txt"/> 
-                     <property name="mailhost" value="${server_addr}"/>
-                     <property name="fromaddress" value="${report_from}"/>
-                     <property name="toaddress" value="${report_to}"/>
-                     <property name="subject" value="${cl.prefix}"/>
-                     <property name="flag" value="${project.name}"/>
+                    <property name="file" value="classlib.txt"/> 
+                    <property name="mailhost" value="${server_addr}"/>
+                    <property name="fromaddress" value="${report_from}"/>
+                    <property name="toaddress" value="${report_to}"/>
+                    <property name="subject" value="${cl.prefix}"/>
+                    <property name="flag" value="${project.name}"/>
                 </antpublisher> 
             </onfailure>
             <onsuccess>
@@ -73,12 +73,12 @@
                      uselogger="true"  
                      usedebug="true"  
                      target="email.res.ok"> 
-                     <property name="file" value="classlib.txt.ok"/> 
-                     <property name="mailhost" value="${server_addr}"/>
-                     <property name="fromaddress" value="${report_from}"/>
-                     <property name="toaddress" value="${report_to}"/>
-                     <property name="subject" value="${cl.prefix.ok}"/>
-                     <property name="flag" value="${project.name}"/>
+                    <property name="file" value="classlib.txt.ok"/> 
+                    <property name="mailhost" value="${server_addr}"/>
+                    <property name="fromaddress" value="${report_from}"/>
+                    <property name="toaddress" value="${report_to}"/>
+                    <property name="subject" value="${cl.prefix.ok}"/>
+                    <property name="flag" value="${project.name}"/>
                 </antpublisher> 
             </onsuccess>
         </publishers>
@@ -115,12 +115,12 @@
                     uselogger="true"  
                     usedebug="false"  
                     target="email.res"> 
-                    <property name="file" value="drlvm.txt"/> 
-                    <property name="mailhost" value="${server_addr}"/>
-                    <property name="fromaddress" value="${report_from}"/>
-                    <property name="toaddress" value="${report_to}"/>
-                    <property name="subject" value="${vm.prefix}"/>
-                    <property name="flag" value="${project.name}"/>
+                   <property name="file" value="drlvm.txt"/> 
+                   <property name="mailhost" value="${server_addr}"/>
+                   <property name="fromaddress" value="${report_from}"/>
+                   <property name="toaddress" value="${report_to}"/>
+                   <property name="subject" value="${vm.prefix}"/>
+                   <property name="flag" value="${project.name}"/>
                 </antpublisher> 
             </onfailure>
             <onsuccess>
@@ -131,12 +131,12 @@
                     uselogger="true"  
                     usedebug="false"  
                     target="email.res.ok"> 
-                    <property name="file" value="drlvm.txt.ok"/> 
-                    <property name="mailhost" value="${server_addr}"/>
-                    <property name="fromaddress" value="${report_from}"/>
-                    <property name="toaddress" value="${report_to}"/>
-                    <property name="subject" value="${vm.prefix.ok}"/>
-                    <property name="flag" value="${project.name}"/>
+                   <property name="file" value="drlvm.txt.ok"/> 
+                   <property name="mailhost" value="${server_addr}"/>
+                   <property name="fromaddress" value="${report_from}"/>
+                   <property name="toaddress" value="${report_to}"/>
+                   <property name="subject" value="${vm.prefix.ok}"/>
+                   <property name="flag" value="${project.name}"/>
                 </antpublisher> 
             </onsuccess>
         </publishers>
@@ -193,12 +193,12 @@
                      uselogger="true"  
                      usedebug="false"  
                      target="email.res"> 
-                     <property name="file" value="drlvmt.txt"/> 
-                     <property name="mailhost" value="${server_addr}"/>
-                     <property name="fromaddress" value="${report_from}"/>
-                     <property name="toaddress" value="${report_to}"/>
-                     <property name="subject" value="${vm.prefix}"/>
-                     <property name="flag" value="${project.name}"/>
+                    <property name="file" value="drlvmt.txt"/> 
+                    <property name="mailhost" value="${server_addr}"/>
+                    <property name="fromaddress" value="${report_from}"/>
+                    <property name="toaddress" value="${report_to}"/>
+                    <property name="subject" value="${vm.prefix}"/>
+                    <property name="flag" value="${project.name}"/>
                 </antpublisher> 
             </onfailure>
             <onsuccess>
@@ -210,12 +210,12 @@
                      uselogger="true"  
                      usedebug="false"  
                      target="email.res.ok"> 
-                     <property name="file" value="drlvmt.txt.ok"/> 
-                     <property name="mailhost" value="${server_addr}"/>
-                     <property name="fromaddress" value="${report_from}"/>
-                     <property name="toaddress" value="${report_to}"/>
-                     <property name="subject" value="${vm.prefix.ok}"/>
-                     <property name="flag" value="${project.name}"/>
+                    <property name="file" value="drlvmt.txt.ok"/> 
+                    <property name="mailhost" value="${server_addr}"/>
+                    <property name="fromaddress" value="${report_from}"/>
+                    <property name="toaddress" value="${report_to}"/>
+                    <property name="subject" value="${vm.prefix.ok}"/>
+                    <property name="flag" value="${project.name}"/>
                 </antpublisher> 
             </onsuccess>
         </publishers>
@@ -236,12 +236,12 @@
         </modificationset>
 
         <schedule interval="${timeout}">
-                <ant target="test" antWorkingDir="projects/classlib/trunk" timeout="${ttimeout}"
usedebug="false">
-                    <jvmarg arg="-Dtest.jre.home=${wdir}/projects/drlvm/trunk/build/${os}_${build_arch}_${cc}_${build_cfg}/deploy/jdk/jre"
/>
-                    <!--jvmarg arg="-Dhy.test.forkmode=perTest" /-->
-                    <jvmarg arg="-Dhy.test.vm.name=drl" />
-                    <jvmarg arg="-Xmx700M" />
-                </ant>
+            <ant target="test" antWorkingDir="projects/classlib/trunk" timeout="${ttimeout}"
usedebug="false">
+                <jvmarg arg="-Dtest.jre.home=${wdir}/projects/drlvm/trunk/build/${os}_${build_arch}_${cc}_${build_cfg}/deploy/jdk/jre"
/>
+                <!--jvmarg arg="-Dhy.test.forkmode=perTest" /-->
+                <jvmarg arg="-Dhy.test.vm.name=drl" />
+                <jvmarg arg="-Xmx700M" />
+            </ant>
         </schedule>
 
         <log dir="logs/${project.name}">
@@ -265,12 +265,12 @@
                      uselogger="true"  
                      usedebug="true"  
                      target="email.res"> 
-                     <property name="file" value="classlibt.txt"/> 
-                     <property name="mailhost" value="${server_addr}"/>
-                     <property name="fromaddress" value="${report_from}"/>
-                     <property name="toaddress" value="${report_to}"/>
-                     <property name="subject" value="${cl.prefix} over drlvm"/>
-                     <property name="flag" value="${project.name}"/>
+                    <property name="file" value="classlibt.txt"/> 
+                    <property name="mailhost" value="${server_addr}"/>
+                    <property name="fromaddress" value="${report_from}"/>
+                    <property name="toaddress" value="${report_to}"/>
+                    <property name="subject" value="${cl.prefix} over drlvm"/>
+                    <property name="flag" value="${project.name}"/>
                 </antpublisher> 
             </onfailure>
             <onsuccess>
@@ -281,17 +281,15 @@
                      uselogger="true"  
                      usedebug="true"  
                      target="email.res.ok"> 
-                     <property name="file" value="classlibt.txt.ok"/> 
-                     <property name="mailhost" value="${server_addr}"/>
-                     <property name="fromaddress" value="${report_from}"/>
-                     <property name="toaddress" value="${report_to}"/>
-                     <property name="subject" value="${cl.prefix.ok} over drlvm"/>
-                     <property name="flag" value="${project.name}"/>
+                    <property name="file" value="classlibt.txt.ok"/> 
+                    <property name="mailhost" value="${server_addr}"/>
+                    <property name="fromaddress" value="${report_from}"/>
+                    <property name="toaddress" value="${report_to}"/>
+                    <property name="subject" value="${cl.prefix.ok} over drlvm"/>
+                    <property name="flag" value="${project.name}"/>
                 </antpublisher> 
             </onsuccess>
         </publishers>
 
     </project>
 </cruisecontrol>
-
-

Modified: harmony/enhanced/buildtest/trunk/config/copyres.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/config/copyres.xml?view=diff&rev=516979&r1=516978&r2=516979
==============================================================================
--- harmony/enhanced/buildtest/trunk/config/copyres.xml (original)
+++ harmony/enhanced/buildtest/trunk/config/copyres.xml Sun Mar 11 11:18:18 2007
@@ -17,32 +17,54 @@
 <project name="copy_results" default="copy.res" basedir=".">
 
     <tstamp>
-       <format property="timestamp" pattern="yyyyMMdd" />
-       <format property="timestampfull" pattern="yyyyMMddhhmm" />
+        <format property="timestamp" pattern="yyyyMMdd" />
+        <format property="timestampfull" pattern="yyyyMMddhhmm" />
     </tstamp>
 
     <target name="copy.res">
-       <delete file="projects/classlib/trunk/results_${VM}_${timestamp}.zip" failonerror="false"
/>
-       <zip destfile="projects/classlib/trunk/results_${VM}_${timestamp}.zip" >
-           <zipfileset dir="projects/classlib/trunk/build/test_report" includes="**/*.xml"
/>
+        <delete file="projects/classlib/trunk/results_${VM}_${timestamp}.zip" failonerror="false"
/>
+        <zip destfile="projects/classlib/trunk/results_${VM}_${timestamp}.zip" >
+            <zipfileset dir="projects/classlib/trunk/build/test_report" includes="**/*.xml"
/>
         </zip>
     </target>
+
     <target name="copy.HUT-iterative.res">
         <zip destfile="projects/classlib/trunk/results_${VM}_${timestampfull}.zip" >
- 	    <zipfileset dir="projects/classlib/trunk/build" includes="test_report_*/**/*" />

- 	    <zipfileset dir="projects/classlib/trunk/build" includes="FAILURES.txt, ERRORS.txt,
ZERO_LENGTH.txt, STATUS.txt" prefix="result" />
- 	    <zipfileset dir="projects/classlib/trunk" includes="log_*.txt" prefix="logs" />

-         </zip>
-					   
+            <zipfileset 
+                dir="projects/classlib/trunk/build" 
+                includes="test_report_*/**/*" /> 
+            <zipfileset 
+                dir="projects/classlib/trunk/build" 
+                includes="FAILURES.txt, ERRORS.txt, ZERO_LENGTH.txt, STATUS.txt" 
+                prefix="result" />
+            <zipfileset 
+                dir="projects/classlib/trunk" 
+                includes="log_*.txt" 
+                prefix="logs" /> 
+        </zip>
     </target>
+
     <target name="copy.vm.res">
-       <delete file="projects/drlvm/trunk/results_${timestamp}.zip" failonerror="false"
/>
-       <zip destfile="projects/drlvm/trunk/results_${timestamp}.zip" >
-            <zipfileset dir="projects/drlvm/trunk/build/${BUILD}/semis/vm/_smoke.tests/reports"
prefix="smoke/" />
-            <zipfileset dir="projects/drlvm/trunk/build/${BUILD}/semis/vm/_cunit.tests/report"
prefix="cunit/" />
-            <zipfileset dir="projects/drlvm/trunk/build/${BUILD}/semis/kernel.tests/reports/jet.mode"
prefix="jet/" includes="**/*.xml" />
-            <zipfileset dir="projects/drlvm/trunk/build/${BUILD}/semis/kernel.tests/reports/opt.mode"
prefix="opt/" includes="**/*.xml" />
-            <zipfileset dir="projects/drlvm/trunk/build/${BUILD}/semis/kernel.tests/reports/int.mode"
prefix="int/" includes="**/*.xml" />
+        <delete file="projects/drlvm/trunk/results_${timestamp}.zip" failonerror="false"
/>
+        <zip destfile="projects/drlvm/trunk/results_${timestamp}.zip" >
+            <zipfileset 
+                dir="projects/drlvm/trunk/build/${BUILD}/semis/vm/_smoke.tests/reports" 
+                prefix="smoke/" />
+            <zipfileset 
+                dir="projects/drlvm/trunk/build/${BUILD}/semis/vm/_cunit.tests/report" 
+                prefix="cunit/" />
+            <zipfileset 
+                dir="projects/drlvm/trunk/build/${BUILD}/semis/kernel.tests/reports/jet.mode"

+                prefix="jet/" 
+                includes="**/*.xml" />
+            <zipfileset 
+                dir="projects/drlvm/trunk/build/${BUILD}/semis/kernel.tests/reports/opt.mode"

+                prefix="opt/" 
+                includes="**/*.xml" />
+            <zipfileset 
+                dir="projects/drlvm/trunk/build/${BUILD}/semis/kernel.tests/reports/int.mode"

+                prefix="int/" 
+                includes="**/*.xml" />
         </zip>
     </target>
 
@@ -57,38 +79,42 @@
     <target name="email.res" unless="already.sent.f" >
         <echo file="${flag}.fs" message="f.done: ${already.sent.f} ${already.sent.ok}"/>
         <delete file="${flag}.oks" failonerror="false"/>
-	<mail	from="${fromaddress}" 
-		tolist="${toaddress}"
-		messagefile="${file}"
-		failonerror="false"
-		mailhost="${mailhost}"
-		subject="${subject}"/>
+        <mail from="${fromaddress}" 
+            tolist="${toaddress}"
+            messagefile="${file}"
+            failonerror="false"
+            mailhost="${mailhost}"
+            subject="${subject}"/>
     </target>
 
     <target name="email.res.ok" unless="already.sent.ok" >
         <echo file="${flag}.oks" message="ok.done: ${already.sent.f} ${already.sent.ok}"/>
         <delete file="${flag}.fs" failonerror="false"/>
-	<mail	from="${fromaddress}" 
-		tolist="${toaddress}"
-		messagefile="${file}"
-		failonerror="false"
-		mailhost="${mailhost}"
-		subject="${subject}"/>
+        <mail from="${fromaddress}" 
+            tolist="${toaddress}"
+            messagefile="${file}"
+            failonerror="false"
+            mailhost="${mailhost}"
+            subject="${subject}"/>
     </target>
 
     <target name="email.always.res" >
-	<mail	from="${fromaddress}" 
-		tolist="${toaddress}" 
-		messagefile="${file}" 
-		failonerror="false" 
-		mailhost="${mailhost}" 
-		subject="${subject}" >
-		<fileset dir="projects/classlib/trunk/build" includes="FAILURES.txt, ERRORS.txt, ZERO_LENGTH.txt,
STATUS.txt" />
-	</mail>	
-	<delete dir="projects/classlib/trunk/build" /> 	
-	<delete> 
-	    <fileset dir="projects/classlib/trunk" includes="log_*.txt" /> 
-	</delete> 			   
+        <mail from="${fromaddress}" 
+            tolist="${toaddress}" 
+            messagefile="${file}" 
+            failonerror="false" 
+            mailhost="${mailhost}" 
+            subject="${subject}" >
+            <fileset 
+                dir="projects/classlib/trunk/build" 
+                includes="FAILURES.txt, ERRORS.txt, ZERO_LENGTH.txt, STATUS.txt" />
+        </mail> 
+        <delete dir="projects/classlib/trunk/build" />  
+        <delete> 
+            <fileset 
+                dir="projects/classlib/trunk" 
+                includes="log_*.txt" /> 
+        </delete>
     </target>
 
 </project>



Mime
View raw message