From commits-return-50439-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org Mon Feb 04 13:20:26 2008
Return-Path: <commits-return-50439-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 7465 invoked from network); 4 Feb 2008 13:20:26 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Feb 2008 13:20:26 -0000
Received: (qmail 61070 invoked by uid 500); 4 Feb 2008 13:20:18 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 61057 invoked by uid 500); 4 Feb 2008 13:20: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 61048 invoked by uid 99); 4 Feb 2008 13:20:18 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2008 05:20:18 -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; Mon, 04 Feb 2008 13:20:10 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 689511A9832; Mon,  4 Feb 2008 05:20:02 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r618273 - in /harmony/enhanced/drlvm/trunk/make: build-java.xml
 vm/gc_gen.xml vm/interpreter.xml vm/jitrino.xml vm/port.xml vm/vmcore.xml
Date: Mon, 04 Feb 2008 13:20:01 -0000
To: commits@harmony.apache.org
From: varlax@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080204132002.689511A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: varlax
Date: Mon Feb  4 05:20:00 2008
New Revision: 618273

URL: http://svn.apache.org/viewvc?rev=618273&view=rev
Log:
Fixed the build to work with Ant 1.7

Modified:
    harmony/enhanced/drlvm/trunk/make/build-java.xml
    harmony/enhanced/drlvm/trunk/make/vm/gc_gen.xml
    harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml
    harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml
    harmony/enhanced/drlvm/trunk/make/vm/port.xml
    harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml

Modified: harmony/enhanced/drlvm/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/build-java.xml?rev=618273&r1=618272&r2=618273&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/build-java.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/build-java.xml Mon Feb  4 05:20:00 2008
@@ -25,6 +25,7 @@
         <attribute name="dest"/>
         <element name="javac-elements" implicit="yes" optional="yes"/>
         <sequential>
+            <ensure-javac/>
             <mkdir dir="@{dest}" />
             <hy.javac srcdir="@{src}" destdir="@{dest}" >
                 <include name="**/*.java"/>

Modified: harmony/enhanced/drlvm/trunk/make/vm/gc_gen.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/gc_gen.xml?rev=618273&r1=618272&r2=618273&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/gc_gen.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/gc_gen.xml Mon Feb  4 05:20:00 2008
@@ -61,7 +61,7 @@
         </path>
         
         <compiler id="cpp.compiler" extends="common.cpp.compiler">
-            <includepath refid="gc.includes"/>
+            <includepath><path refid="gc.includes"/></includepath>
             <fileset dir="${vm.home}/gc_gen/src">
                 <selector refid="gc.depends"/>
                 <include name="common/*.cpp" />

Modified: harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml?rev=618273&r1=618272&r2=618273&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml Mon Feb  4 05:20:00 2008
@@ -64,7 +64,7 @@
 
         <compile-cc>
         <compiler id="cpp.compiler" extends="common.cpp.compiler">
-            <includepath refid="int.includes"/>
+            <includepath><path refid="int.includes"/></includepath>
             <fileset dir="${vm.home}/interpreter/src">
                 <selector refid="int.depends"/>
                 <include name="*.cpp" />

Modified: harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml?rev=618273&r1=618272&r2=618273&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml Mon Feb  4 05:20:00 2008
@@ -56,7 +56,7 @@
 
         <compile-cc>
             <compiler id="cpp.compiler" extends="plaf.cpp.compiler">
-                <includepath refid="jit.includes"/>
+                <includepath><path refid="jit.includes"/></includepath>
                 <fileset dir="${vm.home}/jitrino/src">
                     <selector refid="jit.depends"/>
                     <include name="dynopt/*.cpp" />

Modified: harmony/enhanced/drlvm/trunk/make/vm/port.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/port.xml?rev=618273&r1=618272&r2=618273&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/port.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/port.xml Mon Feb  4 05:20:00 2008
@@ -64,7 +64,7 @@
         </compile-asm>
         
         <compile-cc>
-            <includepath refid="port.includes"/>
+            <includepath><path refid="port.includes"/></includepath>
 
             <defineset define="APR_DECLARE_EXPORT" />
             <defineset define="BUILDING_VM" />

Modified: harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml?rev=618273&r1=618272&r2=618273&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml Mon Feb  4 05:20:00 2008
@@ -131,7 +131,7 @@
 
         <compile-cc>
         <compiler id="cpp.compiler" extends="common.cpp.compiler">
-            <includepath refid="vmcore.includes"/>
+            <includepath><path refid="vmcore.includes"/></includepath>
             <fileset dir="${vm.home}/vmcore/src">
                 <selector refid="vmcore.depends"/>
                 <include name="class_support/*.cpp" />