You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by va...@apache.org on 2008/02/04 14:20:01 UTC
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
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" />