Return-Path: 
 <harmony-commits-return-5214-apmail-incubator-harmony-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org
Received: (qmail 97065 invoked from network); 15 Jun 2006 14:55:23 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 15 Jun 2006 14:55:23 -0000
Received: (qmail 41758 invoked by uid 500); 15 Jun 2006 14:55:15 -0000
Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org
Received: (qmail 41701 invoked by uid 500); 15 Jun 2006 14:55:15 -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 41636 invoked by uid 99); 15 Jun 2006 14:55:14 -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:55:14 -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:55:11 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 650AF1A9842; Thu, 15 Jun 2006 07:54:51 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r414602 - in
 /incubator/harmony/enhanced/drlvm/trunk/build/make:
 build.xml deploy.xml setup.xml targets/build.java.xml
 targets/common_classlib.xml win.properties
Date: Thu, 15 Jun 2006 14:54:49 -0000
To: harmony-commits@incubator.apache.org
From: geirm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060615145451.650AF1A9842@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:49 2006
New Revision: 414602

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

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



Modified:
    incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_classlib.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml?rev=414602&r1=414601&r2=414602&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml Thu Jun 15 07:54:49 2006
@@ -54,6 +54,20 @@
 
 <project name="build" default="build">
 
+    <!-- ===============================================================
+        Define locations of external dependencies
+      ================================================================== -->
+    <target name="extern_dep">
+
+        <!-- set the path root for the classlib : must be relative to the build directory -->
+        <property name="external.dep.CLASSLIB" value="../../../../classlib/trunk" />
+
+        <!-- some derived values -->
+        <property name="external.dep.CLASSLIB.includes" value="${external.dep.CLASSLIB}/deploy/include" />
+        <property name="external.dep.CLASSLIB.libdir" value="${external.dep.CLASSLIB}/deploy/lib" />
+        <property name="external.dep.CLASSLIB.jardir" value="${external.dep.CLASSLIB}/deploy/jdk/jre/lib/boot"/>
+    </target>
+
     <target name="detect.os.arch.cxx.cfg">
         <property environment="env" />
 
@@ -199,9 +213,6 @@
 
         <property name="generated.properties.file" value="${build.semi.dir}/env.properties" />
 
-        <!-- set Eclipse java compiler -->
-        <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
         <!-- product binary deploy location -->
         <property name="build.deploy.dir" location="../${build.os.short}_${build.arch}_${build.cxx}_${build.cfg}/deploy/jre" />
 
@@ -261,6 +272,7 @@
             <equals arg1="${COMPONENTS}" arg2="deploy" />
             <then>
                 <property name="build.deploy.components" value="${build.deploy.all.components}" />
+                <property name="build.deploy.components" value="${build.deploy.all.components}" />
             </then>
             <else>
                 <!-- Convert 'a b c' into 'a|b|c'.
@@ -278,7 +290,18 @@
             </else>
         </if>
 
+        <!-- javac source and target -->
+        <property name="javac.source" value="1.5"/>
+        <property name="javac.target" value="jsr14"/>
+
+        <!-- set the modern java compiler -->
+        <property name="build.compiler" value="modern" />
+
+        <!-- set Eclipse java compiler  someday, we'll switch back-->
+ <!--       <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" /> -->
+
         <echo message="Configuration:" />
+        <echo message="    classlib root = ${external.dep.CLASSLIB}" />
         <echo message="               os = ${build.os}" />
         <echo message="             arch = ${build.arch}" />
         <echo message="              cxx = ${build.cxx}" />
@@ -286,7 +309,7 @@
         <echo message="       components = ${COMPONENTS}" />
     </target>
 
-    <target name="setup" depends="detect.os.arch.cxx.cfg, set.semis.dirs">
+    <target name="setup" depends="extern_dep,detect.os.arch.cxx.cfg, set.semis.dirs">
         <ant antfile="setup.xml" target="setup" inheritall="true" />
     </target>
 
@@ -381,7 +404,8 @@
     <!-- put the rest of product (everything but components' output) to the deploy directory -->
     <target name="fill.up.deploy" depends="deploy.jni.n.jvmti.includes,
                                            deploy.readme,
-                                           deploy.getting_started">
+                                           deploy.getting_started,
+                                           deploy.copy_classlib">
         <if>
             <and>
                 <isset property="if.lnx" />
@@ -400,6 +424,24 @@
             </then>
         </if>
     </target>
+
+    <!-- copies the deploy stuff from classlib -->
+    <target name="deploy.copy_classlib">
+
+        <copy todir="${build.deploy.dir}/bin">
+            <fileset dir="${external.dep.CLASSLIB}/deploy/jdk/jre/bin">
+                <include name="*"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${build.deploy.dir}/lib/boot">
+            <fileset dir="${external.dep.CLASSLIB}/deploy/jdk/jre/lib/boot">
+                <include name="**/*"/>
+            </fileset>
+        </copy>
+
+    </target>
+
 
     <target name="deploy.jni.n.jvmti.includes">
         <copy todir="${build.deploy.dir}/include">

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml?rev=414602&r1=414601&r2=414602&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml Thu Jun 15 07:54:49 2006
@@ -70,74 +70,6 @@
         </hythr>
      </vm>
 
-    <select arch="ia32">
-        <classlib>
-            <auth>
-                <shared>bin:hyauth</shared>
-            </auth>
-
-            <archive>
-                <jar>lib/boot:archive</jar>
-                <shared>bin:hyarchive</shared>
-            </archive>
-
-            <luni>
-                <jar>lib/boot:luni</jar>
-                <shared>bin:hyluni</shared>
-            </luni>
-
-
-            <math>
-                <shared>bin:hymath</shared>
-            </math>
-
-            <nio>
-                <jar>lib/boot:nio</jar>
-                <shared>bin:hynio</shared>
-            </nio>
-
-            <nio_char>
-                <jar>lib/boot:nio_char</jar>
-            </nio_char>
-
-            <security>
-                <jar>lib/boot:security</jar>
-            </security>
-
-            <crypto>
-                <jar>lib/boot:crypto</jar>
-            </crypto>
-
-            <x_net>
-                <jar>lib/boot:x_net</jar>
-            </x_net>
-
-            <sql>
-                <jar>lib/boot:sql</jar>
-            </sql>
-
-            <text>
-                <jar>lib/boot:text</jar>
-                <shared>bin:hytext</shared>
-            </text>
-
-            <port>
-                <shared>bin:hyprt</shared>
-            </port>
-
-            <pool>
-                <shared>bin:hypool</shared>
-            </pool>
-
-            <sig>
-                <shared>bin:hysig</shared>
-            </sig>
-
-            <zlib>
-                <shared>bin:hyzlib</shared>
-            </zlib>
-        </classlib>
-    </select>
 
     <extra>
         <eclipse_script>
@@ -181,26 +113,6 @@
                 <other>bin:ij.sh</other>
             </select>
         </ij_script>
-
-        <harmony39>
-            <beans>
-                <jar>lib/boot:beans</jar>
-            </beans>
-
-            <regex>
-                <jar>lib/boot:regex</jar>
-            </regex>
-
-            <math>
-                <jar>lib/boot:math</jar>
-            </math>
-        </harmony39>
-
-        <harmony88>
-            <logging>
-                <jar>lib/boot:logging</jar>
-            </logging>
-        </harmony88>
 
         <bcprov>
             <jar>lib/boot:*</jar>

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml?rev=414602&r1=414601&r2=414602&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml Thu Jun 15 07:54:49 2006
@@ -88,7 +88,6 @@
                                                       unzip.resources,
                                                       check.unzipped.externals,
                                                       copy.nessessary.jars,
-                                                      apply.patches,
                                                       execute.cpptasks.patch.with.eclipse.compiler.in.classpath">
     </target>
 
@@ -105,11 +104,8 @@
         <property name="ECLIPSE.check.file" value="plugins/org.eclipse.jdt.core_3.1.1.jar" />
         <property name="XALAN.check.file" value="xalan.jar" />
         <property name="VM.check.file" value="vmstart/src/main.cpp" />
-        <property name="HARMONY39.check.file" value="src/common/javasrc/java/util/regex/EOLSet.java" />
-        <property name="HARMONY88.check.file" value="modules/logging/src/main/java/java/util/logging/Logger.java" />
         <property name="BCPROV.check.file" value="bcprov-jdk14-129.jar" />
         <property name="RESOLVER.check.file" value="resolver.jar" />
-        <property name="PATCHES.check.file" value="common/HYPLUGIN/src/org/apache/harmony/eclipse/jdt/launching/HyLaunchingPlugin.java" />
     </target>
 
     <!-- Patching CPPTASKS before using it. -->
@@ -180,8 +176,26 @@
 
         <for param="resource" list="${common.resources}" delimiter=",">
             <sequential>
-                <property name="local.@{resource}.home" value="${build.precopied.dir}/common/@{resource}" />
-                <check-resource resource="@{resource}" />
+
+                <!-- start treating CLASSLIB as special.  We'll remove this
+                     once we get a round of review
+
+                     If classlib, just hardwire according to the property
+                 -->
+
+                <if>
+                    <equals arg1="@{resource}" arg2="CLASSLIB"/>
+                    <then>
+                        <property name="local.@{resource}.home"
+                                  value="${external.dep.CLASSLIB}" />
+                        <check-resource resource="@{resource}" />
+                    </then>
+                    <else>
+                        <property name="local.@{resource}.home" value="${build.precopied.dir}/common/@{resource}" />
+                        <check-resource resource="@{resource}" />
+
+                    </else>
+                </if>
             </sequential>
         </for>
     </target>
@@ -299,7 +313,7 @@
     </target>
 
     <target name="setup.resources" depends="plugin.antcontrib">
-        <property name="common.resources" value="LOG4CXX,HYPLUGIN,CLASSLIB,CPPTASKS,XALAN,VM,HARMONY39,HARMONY88,BCPROV,RESOLVER,PATCHES" />
+        <property name="common.resources" value="LOG4CXX,HYPLUGIN,CLASSLIB,CPPTASKS,XALAN,VM,BCPROV,RESOLVER" />
         <property name="build.resources" value="CPPTASKS,ECLIPSE" />
         <if>
             <isset property="if.lnx" />

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml?rev=414602&r1=414601&r2=414602&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml Thu Jun 15 07:54:49 2006
@@ -22,8 +22,9 @@
         <echo message="## Building Java classes of '${component}'" />
 
         <mkdir dir="${java.build.dir}" />
-        <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-        <javac destdir="${java.build.dir}" source="1.4">
+
+        <javac destdir="${java.build.dir}" source="${javac.source}"
+                target="${javac.target}" debug="${java.debug.option}">
             <src refid="java.source" />
             <patternset refid="java.source.pattern" />
             <bootclasspath refid="java.class.path"/>

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_classlib.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_classlib.xml?rev=414602&r1=414601&r2=414602&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_classlib.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_classlib.xml Thu Jun 15 07:54:49 2006
@@ -75,13 +75,6 @@
         <compiler id="common.compiler">
             <!--common for cpp and c-->
             <includepath>
-
-<!-- $$$ geirm for what's coming...  
-                <pathelement location="${build.CLASSLIB.home}/deploy/include" />
-                <pathelement location="${build.CLASSLIB.home}/deploy/jdk/include" />
-                <pathelement location="${build.CLASSLIB.home}/modules/luni/src/main/native/include/shared" />
--->
-
                 <pathelement location="${os.native.dir}/include" />
                 <pathelement location="${shared.dir}/include" />
                 <pathelement location="${common.src}" />

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties?rev=414602&r1=414601&r2=414602&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties Thu Jun 15 07:54:49 2006
@@ -49,8 +49,11 @@
 
 # Harmony class libraries (sources & pre-built binaries)
 # https://svn.apache.org/repos/asf/incubator/harmony/enhanced/classlib/trunk
-remote.CLASSLIB.archive=-r 385366 https://svn.apache.org/repos/asf/incubator/harmony/enhanced/classlib/trunk
-remote.CLASSLIB.archive.type=svn
+# remote.CLASSLIB.archive=-r 385366 https://svn.apache.org/repos/asf/incubator/harmony/enhanced/classlib/trunk
+# remote.CLASSLIB.archive= https://svn.apache.org/repos/asf/incubator/harmony/enhanced/classlib/trunk
+# remote.CLASSLIB.archive.type=svn
+
+CLASSLIB_HOME=../../../classlib/trunk/
 
 # Apache Portable Runtime, version 1.1 or above
 # http://apr.apache.org/download.cgi
@@ -76,15 +79,7 @@
 # http://archive.apache.org/dist/xml/xalan-j 
 remote.XALAN.archive=http://www.reverse.net/pub/apache/xml/xalan-j/xalan-j_2_7_0-bin.zip
 
-# Intel's contribution of Beans/Regex/Math packages
-# http://issues.apache.org/jira/browse/HARMONY-39
-remote.HARMONY39.archive=http://issues.apache.org/jira/secure/attachment/12322254/regex_beans_math_src_20060120_1845-Harmony.zip
-
-# IBM's contribution of jndi, logging, prefs and sql
-# http://issues.apache.org/jira/browse/HARMONY-88
-remote.HARMONY88.archive=http://issues.apache.org/jira/secure/attachment/12322917/Harmony-Contribution.zip
-
-# BoundCastle Crypto API
+## BoundCastle Crypto API
 # http://www.bouncycastle.org/download/bcprov-jdk14-129.jar
 remote.BCPROV.archive=http://www.bouncycastle.org/download/bcprov-jdk14-129.jar
 remote.BCPROV.archive.type=asis
@@ -97,8 +92,8 @@
 PATCHES_HOME=../patches
 
 #proxy configuration
-# http.proxyHost=
-# http.proxyPort=
+# http.proxyHost=
+# http.proxyPort=
 
 # Default building mode, either release or debug
 BUILD_CFG=release