harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r527703 - in /harmony/enhanced/drlvm/trunk/build/make: components/vm/kernel_classes.xml targets/build.java.xml targets/build.xml
Date Wed, 11 Apr 2007 22:09:20 GMT
Author: gshimansky
Date: Wed Apr 11 15:09:19 2007
New Revision: 527703

URL: http://svn.apache.org/viewvc?view=rev&rev=527703
Log:
Applied HARMONY-3622 [drlvm][build] failed to rebuild single kernel class


Modified:
    harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/build.xml

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml?view=diff&rev=527703&r1=527702&r2=527703
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml Wed Apr 11 15:09:19
2007
@@ -38,11 +38,18 @@
         </path>                 
 
         <path id="java.class.path">
-            <pathelement location="${java.build.dir}"/>
-
             <fileset dir="${external.dep.CLASSLIB.jardir}" includes="*.jar" />
             <fileset dir="${build.ANTLR.home}" includes="antlr-2.7.5.jar" />
             <fileset dir="${build.VMMAGIC.home}" includes="vmmagic-20070207.jar" />
+        </path>
+
+        <!-- 
+        the kernel classes destination directory must be in bootclasspath -
+        otherwise the Reference Java "kernel" classes are referred during
+        compilation of drlvm kernel classes - this produces incompatibility
+        -->
+        <path id="java.boot.class.path">
+            <pathelement location="${java.build.dir}"/>
         </path>
 
         <!-- compile time debug information - true by default for kernel classes -->

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml?view=diff&rev=527703&r1=527702&r2=527703
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml Wed Apr 11 15:09:19 2007
@@ -31,6 +31,7 @@
             <src refid="java.source" />
             <patternset refid="java.source.pattern" />
             <classpath refid="java.class.path"/>
+            <bootclasspath refid="java.boot.class.path"/>
         </javac>
         <fileset id="java.classes.fileset" dir="${java.build.dir}">
             <patternset refid="java.classes.pattern" />

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/build.xml?view=diff&rev=527703&r1=527702&r2=527703
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/build.xml Wed Apr 11 15:09:19 2007
@@ -33,6 +33,11 @@
             <pathelement location="." />
         </path>
 
+        <!-- defines empty BootCP to allow later redefinition if required -->
+        <path id="java.boot.class.path">
+            <pathelement location="" />
+        </path>
+
         <linker id="common.linker" />
 
         <!-- empty common ids, must be defined in component descriptors -->



Mime
View raw message