harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r414601 - in /incubator/harmony/enhanced/drlvm/trunk/build/make/components: classlib.xml classlib/ extra.xml vm/kernel_classes.xml vm/vmi.xml
Date Thu, 15 Jun 2006 14:54:34 GMT
Author: geirm
Date: Thu Jun 15 07:54:33 2006
New Revision: 414601

URL: http://svn.apache.org/viewvc?rev=414601&view=rev
Log:
changes that bring DRLVM working with the current 
classlib "in situ"

(partial commit - I'm going slowly here...)



Removed:
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/classlib/
Modified:
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/classlib.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/classlib.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/classlib.xml?rev=414601&r1=414600&r2=414601&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/classlib.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/classlib.xml Thu Jun 15 07:54:33
2006
@@ -28,26 +28,7 @@
 <project name="classlib">
     <target name="init" depends="common">
         <select arch="ia32">
-            <property name="build.depends" value="classlib.nio_char,
-                                                  classlib.regex,
-                                                  classlib.security,
-                                                  extra.icu4c,
-                                                  classlib.crypto,
-                                                  classlib.x_net,
-                                                  classlib.archive,
-                                                  classlib.common,
-                                                  classlib.fdlibm,
-                                                  classlib.luni,
-                                                  classlib.math,
-                                                  classlib.nio,
-                                                  classlib.pool,
-                                                  classlib.port,
-                                                  classlib.sig,
-                                                  classlib.sql,
-                                                  classlib.text,
-                                                  classlib.auth,
-                                                  classlib.zip,
-                                                  classlib.zlib" />
+            <property name="build.depends" value="extra.icu4c" />
             <select os="lnx">
                 <property name="os.native.dir" location="${build.CLASSLIB.home}/native-src/linux.IA32"
/>
             </select>

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml?rev=414601&r1=414600&r2=414601&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml Thu Jun 15 07:54:33
2006
@@ -32,8 +32,6 @@
                                               extra.aprutil,
                                               extra.bcprov,
                                               extra.eclipse_script,
-                                              extra.harmony39,
-                                              extra.harmony88,
                                               extra.hello,
                                               extra.icu4c,
                                               extra.hyplugin,
@@ -44,5 +42,6 @@
                                               extra.serializer,
                                               extra.xml_api_copy,
                                               extra.zlib" />
+       
     </target>
 </project>

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml?rev=414601&r1=414600&r2=414601&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml Thu
Jun 15 07:54:33 2006
@@ -28,7 +28,7 @@
 <project name="vm.kernel_classes">
     <target name="init" depends="common_vm">
         <property name="build.java.depends"
-                  value="classlib.luni,classlib.security,classlib.archive,classlib.regex,classlib.nio,classlib.nio_char"/>
+                  value=""/>
 
         <property name="src"
                   location="${build.vm.home}/vmcore/src/kernel_classes/native" />
@@ -42,12 +42,9 @@
 
         <path id="java.class.path">
             <pathelement location="${java.build.dir}"/>
-            <fileset dir="${classlib.luni.jardir}" includes="*.jar" />
-            <fileset dir="${classlib.security.jardir}" includes="*.jar" />
-            <fileset dir="${classlib.archive.jardir}" includes="*.jar" />
-            <fileset dir="${classlib.regex.jardir}" includes="*.jar" />
-            <fileset dir="${classlib.nio.jardir}" includes="*.jar" />
-            <fileset dir="${classlib.nio_char.jardir}" includes="*.jar" />
+
+            <fileset dir="${external.dep.CLASSLIB.jardir}" includes="*.jar" />
+
         </path>
 
         <property name="jarname" value="kernel.jar"/>

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml?rev=414601&r1=414600&r2=414601&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml Thu Jun 15 07:54:33
2006
@@ -27,12 +27,8 @@
 
 <project name="vm.vmi">
     <target name="init" depends="common_vm">
-        <property name="build.depends" value="classlib.vmi_includes,
-                                              extra.apr,
-                                              vm.vmcore,
-                                              classlib.pool,
-                                              classlib.zip,
-                                              classlib.port" />
+        <property name="build.depends" value="extra.apr,
+                                              vm.vmcore" />
         <property name="outtype" value="shared" />
         <property name="libname" value="vmi" />
         <property name="src" location="${build.vm.home}/vmi/src" />
@@ -63,7 +59,9 @@
                     </select>
                 </dirset>
 
-                <pathelement location="${classlib.vmi_includes.includes}" />
+                <pathelement location="${external.dep.CLASSLIB.includes}" />
+
+
             </includepath>
 
             <fileset dir="${src}">
@@ -92,9 +90,10 @@
                 <syslibset libs="msvcrt" />
             </select>
 
-            <libset libs="${classlib.pool.lib}" dir="${classlib.pool.libdir}" />
-            <libset libs="${classlib.zip.lib}"  dir="${classlib.zip.libdir}" />
-            <libset libs="${classlib.port.lib}" dir="${classlib.port.libdir}" />
+            <libset libs="hypool"  dir="${external.dep.CLASSLIB.libdir}" />
+            <libset libs="hyzip"  dir="${external.dep.CLASSLIB.libdir}" />
+            <libset libs="hyprt" dir="${external.dep.CLASSLIB.libdir}" />
+
         </linker>
     </target>
 </project>



Mime
View raw message