From commits-return-50363-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org Fri Feb 01 11:47:52 2008
Return-Path: <commits-return-50363-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 80896 invoked from network); 1 Feb 2008 11:47:52 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Feb 2008 11:47:52 -0000
Received: (qmail 82530 invoked by uid 500); 1 Feb 2008 11:47:43 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 82514 invoked by uid 500); 1 Feb 2008 11:47:43 -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 82504 invoked by uid 99); 1 Feb 2008 11:47:43 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2008 03:47:43 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
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; Fri, 01 Feb 2008 11:47:16 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7C1821A9832; Fri,  1 Feb 2008 03:46:52 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r617480 - in /harmony/enhanced/buildtest/branches/2.0:
 adaptors/drlvm-reg-test/ adaptors/drlvm-test/ adaptors/drlvm/
 adaptors/ehwa-api/ scripts/
Date: Fri, 01 Feb 2008 11:46:46 -0000
To: commits@harmony.apache.org
From: varlax@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080201114652.7C1821A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: varlax
Date: Fri Feb  1 03:46:36 2008
New Revision: 617480

URL: http://svn.apache.org/viewvc?rev=617480&view=rev
Log:
Fix adaptors for new DRLVM build

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/parameters.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/parameters.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/parameters.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/parameters.xml
    harmony/enhanced/buildtest/branches/2.0/scripts/properties.xml

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/adaptor.xml?rev=617480&r1=617479&r2=617480&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/adaptor.xml Fri Feb  1 03:46:36 2008
@@ -38,17 +38,10 @@
         </tstamp>
 
         <!-- launch the tests -->
-        <exec-ant dir="${built.drlvm.trunk}/build"
-                  file="make/build.xml"
-                  targets="reg.test"
-                  lib="${built.drlvm.trunk}/build/make/tmp"
-                  failonerror="false"
-                  failproperty="drlvm-reg-test.run.failed">
+        <exec-ant dir="${built.drlvm.trunk}" targets="reg.test" 
+            failonerror="false" failproperty="drlvm-reg-test.run.failed">
             <sysproperty key="build.cfg" value="${drlvm.config}"/>
-            <sysproperty key="external.dep.CLASSLIB.loc"
-                         value='${built.classlib.trunk}'/>
-            <sysproperty key="machine.arch" value="${os.arch}"/>
-            <sysproperty key="junit.jar" value="${ext.junit.location}"/>
+            <sysproperty key="common.resources.loc" value="${common.resources}"/>
             <arg line="${tested.hdk.param}"/>
         </exec-ant>
 
@@ -91,33 +84,19 @@
     <target name="-update" if="is.snapshot" 
         description="adjusts tests to snapshot revision">
         <mkdir dir="${built.drlvm.trunk}" />
+        <mkdir dir="${common.resources}" />
         <loadproperties srcFile="${snapshot.svn.revision.file}" />
-        <exec executable="svn"
-              dir="${built.drlvm.trunk}"
-              failonerror="true">
+        <exec executable="svn" dir="${common.resources}" failonerror="true">
+            <arg line="co -r${svn.revision} ${common.resources.url} ." />
+        </exec>
+        <exec executable="svn" dir="${built.drlvm.trunk}" failonerror="true">
             <arg line="co -r${svn.revision} ${drlvm.trunk.url} ." />
         </exec>
 
-        <exec-ant dir="${built.drlvm.trunk}/build"
-                  file="make/build.xml"
-                  targets="clean"
-                  lib="${built.drlvm.trunk}/build/make/tmp"
-                  failonerror="true">
-            <sysproperty key="build.cfg" value="${drlvm.config}"/>
-            <sysproperty key="external.dep.CLASSLIB.loc"
-                         value='${built.classlib.trunk}'/>
-            <sysproperty key="machine.arch" value="${os.arch}"/>
-        </exec-ant>
-
-        <exec-ant dir="${built.drlvm.trunk}/build"
-                  file="make/build.xml"
-                  targets="update"
-                  lib="${built.drlvm.trunk}/build/make/tmp"
+        <exec-ant dir="${built.drlvm.trunk}" targets="clean fetch-depends"
                   failonerror="true">
             <sysproperty key="build.cfg" value="${drlvm.config}"/>
-            <sysproperty key="external.dep.CLASSLIB.loc"
-                         value='${built.classlib.trunk}'/>
-            <sysproperty key="machine.arch" value="${os.arch}"/>
+            <sysproperty key="common.resources.loc" value="${common.resources}"/>
         </exec-ant>
                     
     </target>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/parameters.xml?rev=617480&r1=617479&r2=617480&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/parameters.xml Fri Feb  1 03:46:36 2008
@@ -22,9 +22,9 @@
         <built.drlvm.trunk 
             description="Path to built drlvm trunk"
             value="${drlvm.parameters.shared.trunk.dir}" />
-        <built.classlib.trunk
-            description="Path to built classlib trunk" 
-            value="${classlib.parameters.shared.trunk.dir}"/>
+        <common.resources description="Path to shared pool" 
+            value="${built.drlvm.trunk}/../common_resources"
+            url="http://svn.apache.org/repos/asf/harmony/enhanced/common_resources"/>
         <drlvm.config
             description="The built drlvm configuration (debug/release)"
             value="${drlvm.parameters.shared.build.config}"/>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/adaptor.xml?rev=617480&r1=617479&r2=617480&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/adaptor.xml Fri Feb  1 03:46:36 2008
@@ -38,16 +38,10 @@
         </tstamp>
 
         <!-- launch the tests kernel.test -->
-        <exec-ant dir="${built.drlvm.trunk}/build"
-                  file="make/build.xml"
-                  targets="test"
-                  lib="${built.drlvm.trunk}/build/make/tmp"
-                  failonerror="false"
-                  failproperty="drlvm-test.run.failed">
+        <exec-ant dir="${built.drlvm.trunk}" targets="test"
+                  failonerror="false" failproperty="drlvm-test.run.failed">
             <sysproperty key="build.cfg" value="${drlvm.config}"/>
-            <sysproperty key="external.dep.CLASSLIB.loc"
-                         value='${built.classlib.trunk}'/>
-            <sysproperty key="machine.arch" value="${os.arch}"/>
+            <sysproperty key="common.resources.loc" value="${common.resources}"/>
             <sysproperty key="test.mode" 
                          value="${drlvm-test.parameters.optional.test.mode}"/>
             <sysproperty key="run.all.tests" value="true" />
@@ -92,35 +86,20 @@
     <target name="-update" if="is.snapshot" 
         description="adjusts tests to snapshot revision">
         <mkdir dir="${built.drlvm.trunk}" />
+        <mkdir dir="${common.resources}" />
         <loadproperties srcFile="${snapshot.svn.revision.file}" />
-        <exec executable="svn"
-              dir="${built.drlvm.trunk}"
-              failonerror="true">
+        <exec executable="svn" dir="${common.resources}" failonerror="true">
+            <arg line="co -r${svn.revision} ${common.resources.url} ." />
+        </exec>
+        <exec executable="svn" dir="${built.drlvm.trunk}" failonerror="true">
             <arg line="co -r${svn.revision} ${drlvm.trunk.url} ." />
         </exec>
 
-        <exec-ant dir="${built.drlvm.trunk}/build"
-                  file="make/build.xml"
-                  targets="clean"
-                  lib="${built.drlvm.trunk}/build/make/tmp"
-                  failonerror="true">
-            <sysproperty key="build.cfg" value="${drlvm.config}"/>
-            <sysproperty key="external.dep.CLASSLIB.loc"
-                         value='${built.classlib.trunk}'/>
-            <sysproperty key="machine.arch" value="${os.arch}"/>
-        </exec-ant>
-
-        <exec-ant dir="${built.drlvm.trunk}/build"
-                  file="make/build.xml"
-                  targets="update"
-                  lib="${built.drlvm.trunk}/build/make/tmp"
+        <exec-ant dir="${built.drlvm.trunk}" targets="clean fetch-depends"
                   failonerror="true">
             <sysproperty key="build.cfg" value="${drlvm.config}"/>
-            <sysproperty key="external.dep.CLASSLIB.loc"
-                         value='${built.classlib.trunk}'/>
-            <sysproperty key="machine.arch" value="${os.arch}"/>
+            <sysproperty key="common.resources.loc" value="${common.resources}"/>
         </exec-ant>
-                    
     </target>
 
 </project>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/parameters.xml?rev=617480&r1=617479&r2=617480&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/parameters.xml Fri Feb  1 03:46:36 2008
@@ -22,9 +22,9 @@
         <built.drlvm.trunk 
             description="Path to built drlvm trunk"
             value="${drlvm.parameters.shared.trunk.dir}" />
-        <built.classlib.trunk
-            description="Path to built classlib trunk" 
-            value="${classlib.parameters.shared.trunk.dir}"/>
+        <common.resources description="Path to shared pool" 
+            value="${built.drlvm.trunk}/../common_resources"
+            url="http://svn.apache.org/repos/asf/harmony/enhanced/common_resources"/>
         <drlvm.config
             description="The built drlvm configuration (debug/release)"
             value="${drlvm.parameters.shared.build.config}"/>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/adaptor.xml?rev=617480&r1=617479&r2=617480&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/adaptor.xml Fri Feb  1 03:46:36 2008
@@ -20,23 +20,21 @@
      ====================================================================== -->
 <project name="drlvm" default="run" basedir=".">
 
-    <!-- platform dependent suffix for executables, 
-         used in parameters.xml for 'path to jvm' definition -->
-    <condition property="exe" value=".exe" else="">
-        <os family="windows" />
-    </condition>
-
     <!-- define build configuration, 
          used in parameters.xml for assignment the value to shared parameter -->
     <property name="build.config" 
               value="${drlvm.parameters.optional.build.cfg}"/>
+    
+    <property name="common.resources" 
+              value="${checkouts.dir}/common_resources"/>
 
     <target name="setup" />
 
-    <target name="run" 
-            description="Checks DRLVM trunk can be build."> 
-        <drlvm-build targets="clean update"/>
-        <drlvm-build targets="build"/>
+    <target name="run" description="Verifies integrity of the DRLVM trunk"> 
+        <exec executable="svn" dir="${common.resources}" failonerror="true">
+            <arg line="update" />
+        </exec>
+        <drlvm-build targets="fetch-depends rebuild"/>
     </target>
 
     <target name="clean">
@@ -47,15 +45,13 @@
         <attribute name="targets"/>
         <sequential>
             <!-- Use BTI staff to execute Ant Build in new process -->
-            <exec-ant dir="${trunk.dir}/build"
-                      file="make/build.xml"
-                      targets="@{targets}"
-                      lib="${trunk.dir}/build/make/tmp">
+            <exec-ant dir="${trunk.dir}" targets="@{targets}">
                 <sysproperty key="deploy.canonical.flag" value="true"/>
                 <sysproperty key="build.cfg" value="${build.config}"/>
                 <sysproperty key="machine.arch" value="${os.arch}"/>
                 <sysproperty key="external.dep.CLASSLIB.loc"
                              value='${classlib.trunk}'/>
+                <sysproperty key="common.resources.loc" value="${common.resources}"/>
             </exec-ant>
         </sequential>
     </macrodef>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/parameters.xml?rev=617480&r1=617479&r2=617480&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/parameters.xml Fri Feb  1 03:46:36 2008
@@ -21,20 +21,19 @@
         <!-- the path to built DRLVM JRE -->
         <jre.dir value="${drlvm.parameters.shared.trunk.dir}/build/deploy/jdk/jre"/>
         <!-- the path to built DRLVM JVM -->
-        <jvm.location value="${drlvm.parameters.shared.trunk.dir}/build/deploy/jdk/jre/bin/java${exe}"/>
+        <jvm.location value="${drlvm.parameters.shared.trunk.dir}/build/deploy/jdk/jre/bin/java${exe.suffix}"/>
         <!-- DRLVM build configuration (debug/release) -->
         <build.config value="${build.config}"/>
     </shared>
 
     <svn>
       <drlvm url="http://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk" />
+      <common_resources url="http://svn.apache.org/repos/asf/harmony/enhanced/common_resources"/>
     </svn>
 
     <!-- CC specific configuration -->
     <cc publish="false"> 
         <!-- reference to the value by parameter ID -->
         <usesvn refid="trunk.dir.id"/>
-        <!-- reference to the value by property name -->
-        <trigger value="${drlvm.parameters.shared.trunk.dir}/${suite.name}.trigger"/>
     </cc>
 </parameters>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/adaptor.xml?rev=617480&r1=617479&r2=617480&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/adaptor.xml Fri Feb  1 03:46:36 2008
@@ -76,16 +76,12 @@
     <target name="run">
         <log message="============= Adaptor for ${suite.name}: Run ..."/>
 
-        <exec-ant dir="${built.drlvm.trunk}/build"
-                  file="make/build.xml"
+        <exec-ant dir="${built.drlvm.trunk}"
                   targets="ehwa.test"
-                  lib="${built.drlvm.trunk}/build/make/tmp"
                   failonerror="true"
                   failproperty="drlvm-ehwa-test.run.failed">
             <sysproperty key="build.cfg" value="${drlvm.config}"/>
-            <sysproperty key="external.dep.CLASSLIB.loc"
-                         value='${built.classlib.trunk}'/>
-            <sysproperty key="machine.arch" value="${os.arch}"/>
+            <sysproperty key="common.resources.loc" value="${common.resources}"/>
             <sysproperty key="eclipse.home" value="${eclipse-3.2.1.homedir}/eclipse"/>
             <sysproperty key="test.mode" 
                          value="${ehwa-api.parameters.optional.test.mode}"/>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/parameters.xml?rev=617480&r1=617479&r2=617480&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/parameters.xml Fri Feb  1 03:46:36 2008
@@ -22,9 +22,9 @@
         <built.drlvm.trunk 
             description="Path to built drlvm trunk"
             value="${drlvm.parameters.shared.trunk.dir}" />
-        <built.classlib.trunk
-            description="Path to built classlib trunk" 
-            value="${classlib.parameters.shared.trunk.dir}"/>
+        <common.resources description="Path to shared pool" 
+            value="${built.drlvm.trunk}/../common_resources"
+            url="http://svn.apache.org/repos/asf/harmony/enhanced/common_resources"/>
         <drlvm.config
             description="The built drlvm configuration (debug/release)"
             value="${drlvm.parameters.shared.build.config}"/>

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/properties.xml?rev=617480&r1=617479&r2=617480&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/properties.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/properties.xml Fri Feb  1 03:46:36 2008
@@ -181,4 +181,10 @@
             <isset property="is.x86_64" />
         </and>
     </condition>
+    
+    <condition property="exe.suffix" value=".exe">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="exe.suffix" value="" />
+
 </project>