You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2009/07/21 00:42:10 UTC
svn commit: r796046 - in /harmony/enhanced/classlib/trunk: ./ make/
modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/
modules/auth/ modules/awt/ modules/beans/ modules/concurrent/
modules/crypto/ modules/imageio/ modules/instr...
Author: hindessm
Date: Mon Jul 20 22:42:08 2009
New Revision: 796046
URL: http://svn.apache.org/viewvc?rev=796046&view=rev
Log:
Refactor hy.jdk and hy.jre properties.
Modified:
harmony/enhanced/classlib/trunk/build.xml
harmony/enhanced/classlib/trunk/make/build-java.xml
harmony/enhanced/classlib/trunk/make/build-native.xml
harmony/enhanced/classlib/trunk/make/build-test.xml
harmony/enhanced/classlib/trunk/make/depends.xml
harmony/enhanced/classlib/trunk/make/properties.xml
harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
harmony/enhanced/classlib/trunk/modules/annotation/build.xml
harmony/enhanced/classlib/trunk/modules/applet/build.xml
harmony/enhanced/classlib/trunk/modules/archive/build.xml
harmony/enhanced/classlib/trunk/modules/auth/build.xml
harmony/enhanced/classlib/trunk/modules/awt/build.xml
harmony/enhanced/classlib/trunk/modules/beans/build.xml
harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
harmony/enhanced/classlib/trunk/modules/crypto/build.xml
harmony/enhanced/classlib/trunk/modules/imageio/build.xml
harmony/enhanced/classlib/trunk/modules/instrument/build.xml
harmony/enhanced/classlib/trunk/modules/jmx/build.xml
harmony/enhanced/classlib/trunk/modules/jndi/build.xml
harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
harmony/enhanced/classlib/trunk/modules/logging/build.xml
harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml
harmony/enhanced/classlib/trunk/modules/luni/build.xml
harmony/enhanced/classlib/trunk/modules/math/build.xml
harmony/enhanced/classlib/trunk/modules/misc/build.xml
harmony/enhanced/classlib/trunk/modules/nio/build.xml
harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
harmony/enhanced/classlib/trunk/modules/orb/build.xml
harmony/enhanced/classlib/trunk/modules/pack200/build.xml
harmony/enhanced/classlib/trunk/modules/portlib/build.xml
harmony/enhanced/classlib/trunk/modules/prefs/build.xml
harmony/enhanced/classlib/trunk/modules/print/build.xml
harmony/enhanced/classlib/trunk/modules/regex/build.xml
harmony/enhanced/classlib/trunk/modules/rmi/build.xml
harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml
harmony/enhanced/classlib/trunk/modules/security/build.xml
harmony/enhanced/classlib/trunk/modules/sound/build.xml
harmony/enhanced/classlib/trunk/modules/sql/build.xml
harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
harmony/enhanced/classlib/trunk/modules/swing/build.xml
harmony/enhanced/classlib/trunk/modules/text/build.xml
harmony/enhanced/classlib/trunk/modules/x-net/build.xml
Modified: harmony/enhanced/classlib/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/build.xml (original)
+++ harmony/enhanced/classlib/trunk/build.xml Mon Jul 20 22:42:08 2009
@@ -73,7 +73,6 @@
<property file="${user.home}/.harmony-classlib.properties" />
<property name="hy.hdk" location="deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
<!-- import properties for snapshot targets -->
<import file="${basedir}/make/properties.xml" />
Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Mon Jul 20 22:42:08 2009
@@ -25,6 +25,8 @@
Compile the Java source and package in component archives.
</description>
+ <property name="hy.hdk" location="deploy" />
+
<!-- import common properties -->
<import file="${basedir}/make/properties.xml" />
@@ -32,8 +34,6 @@
<property name="depends.jars" location="depends/jars" />
<property name="depends.manifests" location="depends/manifests" />
<property name="depends.files" location="depends/files" />
- <property name="hy.hdk" location="deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
<property file="make/depends.properties" />
Modified: harmony/enhanced/classlib/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-native.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-native.xml Mon Jul 20 22:42:08 2009
@@ -25,12 +25,12 @@
Compile the native source into component shared libs.
</description>
+ <property name="hy.hdk" location="deploy" />
+
<!-- import common properties -->
<import file="${basedir}/make/properties.xml" />
<import file="${basedir}/make/depends.xml" />
- <property name="hy.hdk" location="deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
<property name="depends.build" location="depends/build" />
<property name="depends.oss" location="depends/oss" />
<property name="depends.libs" location="depends/libs/${hy.platform}" />
Modified: harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-test.xml Mon Jul 20 22:42:08 2009
@@ -22,7 +22,6 @@
<description> Tests for classlib package</description>
<property name="hy.hdk" location="deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
<!-- import common properties -->
<import file="${basedir}/make/properties.xml" />
Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Mon Jul 20 22:42:08 2009
@@ -25,6 +25,8 @@
where possible.
</description>
+ <property name="hy.hdk" location="${basedir}/deploy" />
+
<import file="${basedir}/make/properties.xml" />
<import file="${basedir}/make/depends-common.xml" />
Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Mon Jul 20 22:42:08 2009
@@ -21,11 +21,20 @@
<project name="Top-Level property definitions" default="echo" basedir="..">
<description>
- Ant file of common properties to be imported by other ant files
+ Ant file of common properties to be imported by other ant files.
+ Property "hy.hdk" must be defined before this file is imported.
</description>
<property file="${user.home}/.harmony-classlib.properties" />
+ <fail message="Property 'hy.hdk' is not defined">
+ <condition>
+ <not><isset property="hy.hdk" /></not>
+ </condition>
+ </fail>
+ <property name="hy.jdk" location="${hy.hdk}/jdk" />
+ <property name="hy.jre" location="${hy.jdk}/jre" />
+
<!-- Debug or release version -->
<property name="hy.cfg" value="debug" />
@@ -404,7 +413,8 @@
make.command = ${make.command}
hy.hdk = ${hy.hdk}
-
+ hy.jdk = ${hy.jdk}
+ hy.jre = ${hy.jre}
The following property is only set if the "svn-prop" target has been
called:
@@ -487,7 +497,7 @@
</target>
<target name="-get-test-vm-output">
- <condition property="test.jre.home" value="${hy.jdk}/jre">
+ <condition property="test.jre.home" value="${hy.jre}">
<not><isset property="test.jre.home" /></not>
</condition>
<exec executable="${test.jre.home}/bin/java" failifexecutionfails="false">
@@ -678,7 +688,7 @@
<compilerarg line="${build.compilerarg}" />
<bootclasspath>
- <fileset dir="${hy.jdk}/jre/lib/boot">
+ <fileset dir="${hy.jre}/lib/boot">
<include name="**/*.jar" />
</fileset>
</bootclasspath>
Modified: harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/annotation/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/applet/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/applet/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/build.xml Mon Jul 20 22:42:08 2009
@@ -22,8 +22,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/jmx/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jmx/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jmx/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/jmx/build.xml Mon Jul 20 22:42:08 2009
@@ -22,7 +22,6 @@
<description>Build for JMX component</description>
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
<property name="depends.dir" location="${basedir}/../../depends" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<import file="${hy.hdk}/build/ant/depends.xml" />
Modified: harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/logging/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/logging/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml Mon Jul 20 22:42:08 2009
@@ -25,7 +25,6 @@
<property name="hy.hdk" location="${basedir}/../../deploy" />
<import file="${hy.hdk}/build/ant/properties.xml" />
- <property name="hy.jdk" location="../../deploy/jdk" />
<property name="hy.build" location="../../build/classes" />
<property name="stub.jar"
location="${hy.jdk}/jre/lib/boot/luni-kernel-stubs.jar" />
Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/math/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/math/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/orb/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/orb/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/orb/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/orb/build.xml Mon Jul 20 22:42:08 2009
@@ -22,7 +22,6 @@
<description>Build for ORB component</description>
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
<property name="depends.dir" location="${basedir}/../../depends" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<import file="${hy.hdk}/build/ant/depends.xml" />
Modified: harmony/enhanced/classlib/trunk/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/build.xml Mon Jul 20 22:42:08 2009
@@ -21,7 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
<property name="depends.dir" location="${basedir}/../../depends" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<import file="${hy.hdk}/build/ant/depends.xml" />
Modified: harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/build.xml Mon Jul 20 22:42:08 2009
@@ -23,8 +23,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/print/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/rmi/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml Mon Jul 20 22:42:08 2009
@@ -25,7 +25,6 @@
<property name="hy.hdk" location="${basedir}/../../deploy" />
<import file="${hy.hdk}/build/ant/properties.xml" />
- <property name="hy.jdk" location="../../deploy/jdk" />
<property name="hy.build" location="../../build/classes" />
<property name="stub.jar"
location="${hy.jdk}/jre/lib/boot/security-kernel-stubs.jar" />
Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sound/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sound/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/text/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />
Modified: harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?rev=796046&r1=796045&r2=796046&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/build.xml Mon Jul 20 22:42:08 2009
@@ -21,8 +21,6 @@
<!-- import common properties -->
<property name="hy.hdk" location="${basedir}/../../deploy" />
- <property name="hy.jdk" location="${hy.hdk}/jdk" />
- <property name="hy.jre" location="${hy.jdk}/jre" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="tests.output" location="../../build/test_report" />