Return-Path: 
 <harmony-commits-return-5213-apmail-incubator-harmony-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org
Received: (qmail 96845 invoked from network); 15 Jun 2006 14:54:57 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 15 Jun 2006 14:54:57 -0000
Received: (qmail 39100 invoked by uid 500); 15 Jun 2006 14:54:56 -0000
Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org
Received: (qmail 39065 invoked by uid 500); 15 Jun 2006 14:54:56 -0000
Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:harmony-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:harmony-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:harmony-commits@incubator.apache.org>
List-Id: <harmony-commits.incubator.apache.org>
Reply-To: harmony-dev@incubator.apache.org
Delivered-To: mailing list harmony-commits@incubator.apache.org
Received: (qmail 39054 invoked by uid 99); 15 Jun 2006 14:54:55 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jun 2006 07:54:55 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jun 2006 07:54:55 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id EFA6A1A983E; Thu, 15 Jun 2006 07:54:34 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: harmony-commits@incubator.apache.org
From: geirm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060615145434.EFA6A1A983E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

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>