harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r410479 - in /incubator/harmony/enhanced/classlib/trunk: ./ make/ modules/annotation/make/common/ modules/applet/make/common/ modules/archive/make/common/ modules/auth/make/common/ modules/awt/make/common/ modules/beans/make/common/ modules...
Date Wed, 31 May 2006 09:17:01 GMT
Author: tellison
Date: Wed May 31 02:16:58 2006
New Revision: 410479

URL: http://svn.apache.org/viewvc?rev=410479&view=rev
Log:
Apply patch HARMONY-469 (Refactor deploy directory layout into HDK shape)

Modified:
    incubator/harmony/enhanced/classlib/trunk/README.txt
    incubator/harmony/enhanced/classlib/trunk/RUNNING-TESTS.txt
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
    incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
    incubator/harmony/enhanced/classlib/trunk/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/regex/README.TXT
    incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/README.TXT
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/native-src/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/README.txt?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/README.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/README.txt Wed May 31 02:16:58 2006
@@ -92,21 +92,23 @@
        |
        \---deploy
              |
-             \---jre
+             \---jdk
                   |
-                  +---bin           <- classlibrary native code & launcher
-                  |   |
-                  |   +---default   <- VM-specific files for launcher's default VM
-                  |   +---vm1       <- VM-specific files for 'vm1'
-                  |   \---vm2       <- VM-specific files for 'vm2', and so on
-                  |
-                  \---lib
-                      |
-                      +---boot      <- common JARs for bootclasspath
-                      | 
-                      +---ext       <- extensions directory
-                      |
-                      \---security
+                  \---jre
+                       |
+                       +---bin           <- classlibrary native code & launcher
+                       |   |
+                       |   +---default   <- VM-specific files for launcher's default VM
+                       |   +---vm1       <- VM-specific files for 'vm1'
+                       |   \---vm2       <- VM-specific files for 'vm2', and so on
+                       |
+                       \---lib
+                           |
+                           +---boot      <- common JARs for bootclasspath
+                           | 
+                           +---ext       <- extensions directory
+                           |
+                           \---security
     
 
 
@@ -200,7 +202,7 @@
 In addition there is minimal support for the Java security framework. Users 
 wishing to experiment with introducing JCE support to these class libraries are 
 recommended to download the latest release of the Bouncy Castle Cryptography API
-and install the provider jar into the <EXTRACT_DIR>/deploy/jre/lib/ext
+and install the provider jar into the <EXTRACT_DIR>/deploy/jdk/jre/lib/ext
 location. 
 See http://www.bouncycastle.org
 
@@ -217,7 +219,7 @@
 environment setting. Until this bug is fixed users should be aware that When
 running Java applications with the built class library components on a
 compatible VM the JAVA_HOME variable should either be unset or else explicitly
-set to EXTRACT_DIR>/deploy/jre. Any other value risks crashing
+set to EXTRACT_DIR>/deploy/jdk/jre. Any other value risks crashing
 the launcher. 
 
                                   ----------
@@ -253,12 +255,12 @@
 object file: No such file or directory
 
 On some systems this error can occur even when the shared library
-(e.g. <EXTRACT_DIR>/deploy/jre/bin/libhysig.so) has been built correctly
+(e.g. <EXTRACT_DIR>/deploy/jdk/jre/bin/libhysig.so) has been built correctly
 and is present in the correct location. This is not a problem with the built
 shared library but instead is dependent on how the operating system locates and 
 loads dynamically linked libraries at runtime. Updating the LD_LIBRARY_PATH 
 environment variable to include the directory
-<EXTRACT_DIR>/deploy/jre/bin should solve this. An alternative remedy 
+<EXTRACT_DIR>/deploy/jdk/jre/bin should solve this. An alternative remedy 
 would be to add new entries for each of the shared libraries built from the
 contributed native source code to the local /etc/ld.so.conf file and then 
 running the ldconfig program to rebuild the /etc/ld.so.cache. 

Modified: incubator/harmony/enhanced/classlib/trunk/RUNNING-TESTS.txt
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/RUNNING-TESTS.txt?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/RUNNING-TESTS.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/RUNNING-TESTS.txt Wed May 31 02:16:58 2006
@@ -43,7 +43,7 @@
    This is IBM's VM that works with the Harmony class libraries.
    We will use this until our own VM efforts come up to speed.
    
-   Installation - drop into deploy/jre/bin/default
+   Installation - drop into deploy/jdk/jre/bin/default
    
 
  Once the prereqs are there : 

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Wed May 31 02:16:58 2006
@@ -38,7 +38,8 @@
     <property name="depends.jars" location="depends/jars" />
     <property name="depends.manifests" location="depends/manifests" />
     <property name="depends.files" location="depends/files" />
-    <property name="target.output" location="deploy" />
+	<property name="hy.hdk" location="deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
     <property file="make/depends.properties" />
 
 
@@ -114,7 +115,7 @@
             </classpath>
         </javac>
 
-        <mkdir dir="${target.output}/jre/lib/boot" />
+        <mkdir dir="${hy.jdk}/jre/lib/boot" />
 
         <call-modules target="build" />
 
@@ -142,13 +143,13 @@
         depends="compile" 
         description="Construct the correct directory structure for the class libs">
         <!-- Create the structure -->
-        <mkdir dir="${target.output}/jre/bin" />
-        <mkdir dir="${target.output}/jre/lib/boot" />
-        <mkdir dir="${target.output}/jre/lib/ext" />
-        <mkdir dir="${target.output}/jre/lib/security" />
+        <mkdir dir="${hy.jdk}/jre/bin" />
+        <mkdir dir="${hy.jdk}/jre/lib/boot" />
+        <mkdir dir="${hy.jdk}/jre/lib/ext" />
+        <mkdir dir="${hy.jdk}/jre/lib/security" />
 
         <!-- Copy across the dependency jars -->
-        <copy todir="${target.output}/jre/lib/boot" overwrite="yes"
+        <copy todir="${hy.jdk}/jre/lib/boot" overwrite="yes"
               verbose="yes">
             <fileset dir="${depends.jars}">
                 <patternset includes="*.jar" />
@@ -160,21 +161,21 @@
         </copy>
 
         <!-- Copy across the extension dependency jars -->
-        <copy todir="${target.output}/jre/lib/ext" overwrite="yes"
+        <copy todir="${hy.jdk}/jre/lib/ext" overwrite="yes"
               verbose="yes" flatten="yes">
             <fileset file="${bcprov.jar}" />
         </copy>
 
         <!-- Copy across the support files -->
-        <copy todir="${target.output}/jre/lib/boot" overwrite="yes">
+        <copy todir="${hy.jdk}/jre/lib/boot" overwrite="yes">
             <fileset dir="${depends.files}">
                 <include name="bootclasspath.properties" />
             </fileset>
         </copy>
-        <fixcrlf srcdir="${target.output}/jre/lib/boot"
+        <fixcrlf srcdir="${hy.jdk}/jre/lib/boot"
             includes="bootclasspath.properties" />
 
-        <copy todir="${target.output}/jre/lib/security" overwrite="yes">
+        <copy todir="${hy.jdk}/jre/lib/security" overwrite="yes">
              <fileset dir="${depends.files}">
                  <include name="java.policy" />
                  <include name="java.security" />
@@ -189,7 +190,7 @@
          ================================= -->
     <target name="clean-layout">
         <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="${target.output}">
+            <fileset dir="${hy.jdk}">
                 <exclude name="jre/bin/default/**" />
             	<exclude name="jre/bin/**" />
                 <exclude name="jre/lib/ext/**" />

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-test.xml Wed May 31 02:16:58 2006
@@ -27,11 +27,12 @@
     <property name="build.compiler" value="modern"/>
 
     <property name="tests.output" location="build/test_report" />
-    <property name="target.output" location="deploy" />
+	<property name="hy.hdk" location="deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
 
     <property name="tests.build.output" location="build/tests" />
     <property name="support.dir" location="support"/>
-    <property name="tests.depends.jars" location="deploy/jre/lib/boot" />
+    <property name="tests.depends.jars" location="deploy/jdk/jre/lib/boot" />
     <property file="make/depends.properties" />
 
 	<!-- this list of components to test will grow to eventually be all modules -->
@@ -267,7 +268,7 @@
     	<!-- The location of the Harmony launcher can be overridden by 
     	     the "harmony.vm.exe" property. Default value of property
     	     is set assuming it is under the deploy tree -->
-    	<property name="harmony.vm.exe" location="${target.output}/jre/bin/java"/>
+    	<property name="harmony.vm.exe" location="${hy.jdk}/jre/bin/java"/>
     	
         <!-- Delete "junitCompleted" - an empty file that can be used to
              check that the junit test VM does not exit prematurely -->
@@ -305,7 +306,7 @@
     	<!-- The location of the Harmony launcher can be overridden by 
     	     the "harmony.vm.exe" property. Default value of property
     	     is set assuming it is under the deploy tree -->
-    	<property name="harmony.vm.exe" location="${target.output}/jre/bin/java"/>
+    	<property name="harmony.vm.exe" location="${hy.jdk}/jre/bin/java"/>
 
         <!-- Delete "junitCompleted" - an empty file that can be used to
              check that the junit test VM does not exit prematurely -->
@@ -318,7 +319,7 @@
                jvm="${harmony.vm.exe}"
                errorproperty="tests.failed"
                failureproperty="tests.failed">
-            <env key="JAVA_HOME" value="${target.output}/jre" />
+            <env key="JAVA_HOME" value="${hy.jdk}/jre" />
             <env key="LD_LIBRARY_PATH" value="" />
             <!-- required to be unset on Linux -->
             

Modified: incubator/harmony/enhanced/classlib/trunk/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build.xml Wed May 31 02:16:58 2006
@@ -112,12 +112,12 @@
             <tarfileset dir="${basedir}" prefix="Harmony">
                 <include name="LICENSE" />
                 <include name="THIRD_PARTY_NOTICES.txt" />
-                <include name="deploy/**" />
-                <exclude name="deploy/jre/bin/default/**" /> 
-                <exclude name="deploy/jre/bin/java" /> 
+                <include name="deploy/jdk/**" />
+                <exclude name="deploy/jdk/jre/bin/default/**" /> 
+                <exclude name="deploy/jdk/jre/bin/java" /> 
             </tarfileset>
             <tarfileset dir="${basedir}" prefix="Harmony" mode="755">
-                <include name="deploy/jre/bin/java" />
+                <include name="deploy/jdk/jre/bin/java" />
             </tarfileset>
             <tarfileset dir="${basedir}/make/resources"
                 includes="README-snapshot.txt"
@@ -139,8 +139,8 @@
             <zipfileset dir="${basedir}" prefix="Harmony">
                 <include name="LICENSE" />
                 <include name="THIRD_PARTY_NOTICES.txt" />
-                <include name="deploy/**" />
-                <exclude name="deploy/jre/bin/default/**" /> 
+                <include name="deploy/jdk/**" />
+                <exclude name="deploy/jdk/jre/bin/default/**" /> 
             </zipfileset>
             <zipfileset dir="${basedir}/make/resources"
                 includes="README-snapshot.txt"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/${hy.annotation.packaging.jarname}.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.annotation.packaging.jarname}.jar"
              manifest="${hy.annotation}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.annotation}/make/patternset.txt" />
@@ -59,7 +59,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -72,7 +72,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -37,7 +37,8 @@
       </packaging>
    </annotation>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/applet.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/applet.jar"
              manifest="${hy.applet}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.applet}/make/patternset.txt" />
@@ -59,7 +59,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -72,7 +72,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -36,7 +36,8 @@
       </packaging>
    </applet>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/archive.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/archive.jar"
              manifest="${hy.archive}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.archive}/make/patternset.txt" />
@@ -59,7 +59,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -72,7 +72,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -36,7 +36,8 @@
       </packaging>
    </archive>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml Wed May 31 02:16:58 2006
@@ -42,7 +42,7 @@
             </src>
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -50,7 +50,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/${hy.auth.packaging.jarname}.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.auth.packaging.jarname}.jar"
              manifest="${hy.auth}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.auth}/make/patternset.txt" />
@@ -83,7 +83,7 @@
             <include name="tests/api/javax/security/auth/x500/X500PrincipalTest.java" />
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -95,7 +95,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -37,7 +37,8 @@
       </packaging>
    </auth>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/awt.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/awt.jar"
              manifest="${hy.awt}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.awt}/make/patternset.txt" />
@@ -59,7 +59,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -72,7 +72,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -36,7 +36,8 @@
       </packaging>
    </awt>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/beans.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/beans.jar"
              manifest="${hy.beans}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.beans}/make/patternset.txt" />
@@ -59,7 +59,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -75,7 +75,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -88,7 +88,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
     	<!-- internal tests that need to run on the bootclasspath -->
     	<echo message="Running internal BEANS tests from ${hy.beans.src.test.internal}" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -38,7 +38,8 @@
       </packaging>
    </beans>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml Wed May 31 02:16:58 2006
@@ -32,7 +32,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -40,7 +40,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/${hy.crypto.packaging.jarname}.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.crypto.packaging.jarname}.jar"
              manifest="${hy.crypto}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.crypto}/make/patternset.txt" />
@@ -224,7 +224,7 @@
                 <javac-elements />
 
                 <bootclasspath>
-                    <fileset dir="${hy.target}/jre/lib/boot">
+                    <fileset dir="${hy.jdk}/jre/lib/boot">
                         <include name="**/*.jar" />
                     </fileset>
                 </bootclasspath>
@@ -242,7 +242,7 @@
 
             <mkdir dir="${hy.tests.reports}" />
 
-            <property name="test.jre.home" value="${hy.target}/jre" />
+            <property name="test.jre.home" value="${hy.jdk}/jre" />
 
             <junit fork="yes"
                 forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -36,7 +36,8 @@
       </packaging>
    </crypto>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/jndi.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/jndi.jar"
              manifest="${hy.jndi}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.jndi}/make/patternset.txt" />
@@ -59,7 +59,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -72,7 +72,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
         	forkmode="perBatch"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -36,7 +36,8 @@
       </packaging>
    </jndi>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml Wed May 31 02:16:58 2006
@@ -31,7 +31,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -39,7 +39,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/logging.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/logging.jar"
              manifest="${hy.logging}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.logging}/make/patternset.txt" />
@@ -61,7 +61,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -75,7 +75,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
                 <pathelement path="${hy.logging.bin.internal}"/>
@@ -89,7 +89,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"
@@ -105,7 +105,7 @@
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
                 <pathelement path="${hy.logging.bin.internal}"/>
@@ -145,7 +145,7 @@
     </target>
 
     <target name="copy.resources">
-        <copy todir="${hy.target}/jre/lib" overwrite="yes" flatten="yes">
+        <copy todir="${hy.jdk}/jre/lib" overwrite="yes" flatten="yes">
             <fileset dir="${hy.logging.src.main.java}">
                 <include name="**/logging.properties" />
             </fileset>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -38,7 +38,8 @@
       </packaging>
    </logging>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml Wed May 31 02:16:58 2006
@@ -21,10 +21,10 @@
 
     <description>Build for luni kernel stub jar</description>
 
-    <property name="hy.target" location="../../deploy" />
+    <property name="hy.jdk" location="../../deploy/jdk" />
     <property name="hy.build" location="../../build" />
     <property name="stub.jar"
-              location="${hy.target}/jre/lib/boot/luni-kernel-stubs.jar" />
+              location="${hy.jdk}/jre/lib/boot/luni-kernel-stubs.jar" />
 
     <target name="warn">
         <fail>...

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml Wed May 31 02:16:58 2006
@@ -31,7 +31,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -39,7 +39,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/luni.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/luni.jar"
              manifest="${hy.luni}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.luni}/make/patternset.txt" />
@@ -60,7 +60,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -73,7 +73,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -36,7 +36,8 @@
       </packaging>
    </luni>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/math.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/math.jar"
              manifest="${hy.math}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.math}/make/patternset.txt" />
@@ -59,7 +59,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -72,7 +72,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -36,7 +36,8 @@
       </packaging>
    </math>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/nio.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/nio.jar"
              manifest="${hy.nio}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.nio}/make/patternset.txt" />
@@ -59,7 +59,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -72,7 +72,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -36,7 +36,8 @@
       </packaging>
    </nio>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/${hy.nio_char.packaging.jarname}.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.nio_char.packaging.jarname}.jar"
              manifest="${hy.nio_char}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.nio_char}/make/patternset.txt" />
@@ -59,7 +59,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -72,7 +72,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -37,7 +37,8 @@
       </packaging>
    </nio_char>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/prefs.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/prefs.jar"
              manifest="${hy.prefs}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.prefs}/make/patternset.txt" />
@@ -59,7 +59,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -72,7 +72,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -36,7 +36,8 @@
       </packaging>
    </prefs>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/README.TXT
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/README.TXT?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/README.TXT (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/README.TXT Wed May 31 02:16:58 2006
@@ -112,16 +112,17 @@
        |
        +---deploy
              |
-             \---jre
-                  |
-                  |
-                  \---lib
+             \---jdk
+                 \---jre
                       |
-                      +---boot
-                             |
-                             +--- beans.jar
-                             +--- math.jar
-                             \--- regex.jar
+                      |
+                      \---lib
+                          |
+                          +---boot
+                                 |
+                                 +--- beans.jar
+                                 +--- math.jar
+                                 \--- regex.jar
        
 
 NOTE: To build regex and math packages in a self-hosting environment on Linux*, you also need 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/regex.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/regex.jar"
             manifest="${hy.regex}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.regex}/make/patternset.txt" />
@@ -59,7 +59,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -72,7 +72,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -36,7 +36,8 @@
       </packaging>
    </regex>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml Wed May 31 02:16:58 2006
@@ -32,7 +32,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -40,7 +40,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/${hy.rmi.packaging.jarname}.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.rmi.packaging.jarname}.jar"
              manifest="${hy.rmi}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.rmi}/make/patternset.txt" />
@@ -127,7 +127,7 @@
                 <javac-elements />
 
                 <bootclasspath>
-                    <fileset dir="${hy.target}/jre/lib/boot">
+                    <fileset dir="${hy.jdk}/jre/lib/boot">
                         <include name="**/*.jar" />
                     </fileset>
                 </bootclasspath>
@@ -145,7 +145,7 @@
 
             <mkdir dir="${hy.tests.reports}" />
 
-            <property name="test.jre.home" value="${hy.target}/jre" />
+            <property name="test.jre.home" value="${hy.jdk}/jre" />
 
             <junit fork="yes"
                 forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -36,7 +36,8 @@
       </packaging>
    </rmi>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/rmi.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/rmi.jar"
              manifest="${hy.rmi}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.rmi}/make/patternset.txt" />
@@ -59,7 +59,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -72,7 +72,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -36,7 +36,8 @@
       </packaging>
    </rmi>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml Wed May 31 02:16:58 2006
@@ -21,10 +21,10 @@
 
     <description>Build for security kernel stub jar</description>
 
-    <property name="hy.target" location="../../deploy" />
+    <property name="hy.jdk" location="../../deploy/jdk" />
     <property name="hy.build" location="../../build" />
     <property name="stub.jar"
-              location="${hy.target}/jre/lib/boot/security-kernel-stubs.jar" />
+              location="${hy.jdk}/jre/lib/boot/security-kernel-stubs.jar" />
 
     <target name="warn">
         <fail>...

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/README.TXT
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/README.TXT?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/README.TXT (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/README.TXT Wed May 31 02:16:58 2006
@@ -104,27 +104,28 @@
        |
        \---deploy
              |
-             \---jre
-                  |
-                  +---bin
-                  |    |
-                  |    \--- jaaswin.dll or libjaasnix.so
-                  |
-                  |
-                  \---lib
-                      |
-                      +---boot
-                      |      |
-                      |      +--- security.jar
-                      |      +--- crypto.jar
-                      |      \--- x-net.jar
-                      | 
-                      +---ext
-                      |
-                      \---security
-                             |
-                             +--- drl.policy
-                             \--- java.security 
+             \---jdk
+                \---jre
+                     |
+                     +---bin
+                     |    |
+                     |    \--- jaaswin.dll or libjaasnix.so
+                     |
+                     |
+                     \---lib
+                         |
+                         +---boot
+                         |      |
+                         |      +--- security.jar
+                         |      +--- crypto.jar
+                         |      \--- x-net.jar
+                         | 
+                         +---ext
+                         |
+                         \---security
+                                |
+                                +--- drl.policy
+                                \--- java.security 
 
 
 4. RUNNING CLASS LIBRARIES WITH AN EXTERNAL VM

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml Wed May 31 02:16:58 2006
@@ -32,7 +32,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -40,7 +40,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/${hy.security.packaging.jarname}.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.security.packaging.jarname}.jar"
             manifest="${hy.security}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.security}/make/patternset.txt" />
@@ -60,7 +60,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -73,7 +73,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -37,7 +37,8 @@
       </packaging>
    </security>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/sql.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/sql.jar"
              manifest="${hy.sql}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.sql}/make/patternset.txt" />
@@ -59,7 +59,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -72,7 +72,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -36,7 +36,8 @@
       </packaging>
    </sql>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/text.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/text.jar"
              manifest="${hy.text}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.text}/make/patternset.txt" />
@@ -59,7 +59,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -72,7 +72,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -36,7 +36,8 @@
       </packaging>
    </text>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml Wed May 31 02:16:58 2006
@@ -30,7 +30,7 @@
             debug="${java.debug.option}">
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -38,7 +38,7 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/${hy.x-net.packaging.jarname}.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.x-net.packaging.jarname}.jar"
             manifest="${hy.x-net}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.x-net}/make/patternset.txt" />
@@ -66,7 +66,7 @@
             <include name="org/apache/harmony/security/test/**/*" />
 
             <bootclasspath>
-                <fileset dir="${hy.target}/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
@@ -78,7 +78,7 @@
 
         <mkdir dir="${hy.tests.reports}" />
 
-        <property name="test.jre.home" value="${hy.target}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
             forkmode="once"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml Wed May 31 02:16:58 2006
@@ -37,7 +37,8 @@
       </packaging>
    </x-net>
 
-   <target location="../../deploy" />
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
    <build location="../../build" />
 
    <tests>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/build.xml?rev=410479&r1=410478&r2=410479&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/build.xml Wed May 31 02:16:58 2006
@@ -50,7 +50,8 @@
           target: properties
          ================================= -->
     <target name="properties" depends="init, windows-properties, linux-properties">
-        <property name="target.output" location="../deploy" />
+        <property name="hy.hdk" location="../deploy" />
+    	<property name="hy.jdk" location="${hy.hdk}/jdk" />
         <property name="depends.oss" location="../depends/oss" />
         <property name="depends.libs" location="../depends/libs/${target.platform}" />
     	<property name="depends.files" location="../depends/files" />
@@ -133,11 +134,11 @@
         description="Construct the correct directory structure for native binaries">
 
         <!-- Create the structure -->
-        <mkdir dir="${target.output}/jre/bin" />
-        <mkdir dir="${target.output}/include" />
+        <mkdir dir="${hy.jdk}/jre/bin" />
+        <mkdir dir="${hy.jdk}/include" />
 
         <!-- Copy across the built shared libs -->
-        <copy todir="${target.output}/jre/bin" overwrite="yes">
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${target.platform}">
                 <patternset includes="*${shlib.suffix}*" />
                 <!-- Don't copy the VMI library. the one we build is a stub that is
@@ -147,7 +148,7 @@
         </copy>
 
         <!-- Copy across the built executables -->
-        <copy todir="${target.output}/jre/bin" overwrite="yes">
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${target.platform}">
                 <patternset includes="java${exe.suffix}" />
                 <patternset includes="javaw${exe.suffix}" />
@@ -155,23 +156,23 @@
         </copy>
     	
     	<!-- NLS catalog files -->
-        <copy todir="${target.output}/jre/bin" overwrite="yes">
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${depends.files}">
                 <include name="harmony*.properties" />
             </fileset>
         </copy>
 
         <!-- Make sure the Linux launcher has execute permission -->
-        <chmod file="${target.output}/jre/bin/java${exe.suffix}" perm="ugo+x" />
+        <chmod file="${hy.jdk}/jre/bin/java${exe.suffix}" perm="ugo+x" />
 
         <!-- Copy across dependency shared libs -->
-        <copy todir="${target.output}/jre/bin" overwrite="yes">
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${depends.libs}" includes="*${shlib.suffix}*" />
         </copy>
 
         <!-- Copy across JNI include files -->
-        <copy todir="${target.output}/include" overwrite="yes">
-            <fileset dir="${native.src.root}/include">
+        <copy todir="${hy.jdk}/include" overwrite="yes">
+            <fileset dir="${native.shared.src.root}/include">
                 <include name="jni.h" />
             </fileset>
             <fileset dir="${native.shared.src.root}/include">
@@ -186,7 +187,7 @@
          ================================= -->
     <target name="clean-layout" depends="properties">
         <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="${target.output}">
+            <fileset dir="${hy.jdk}">
                 <include name="**/bin/java${exe.suffix}" />
                 <include name="**/bin/javaw${exe.suffix}" />
                 <include name="**/bin/*${shlib.suffix}*" />



Mime
View raw message