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 2006/10/26 16:14:06 UTC
svn commit: r468008 - in /incubator/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/ mod...
Author: hindessm
Date: Thu Oct 26 07:14:04 2006
New Revision: 468008
URL: http://svn.apache.org/viewvc?view=rev&rev=468008
Log:
Move make/properties.xml to hdk (because we'll need it for jdktools).
Modified:
incubator/harmony/enhanced/classlib/trunk/build.xml
incubator/harmony/enhanced/classlib/trunk/make/properties.xml
incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/portlib/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml
Modified: incubator/harmony/enhanced/classlib/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/build.xml Thu Oct 26 07:14:04 2006
@@ -65,6 +65,9 @@
</echo>
</target>
+ <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" />
@@ -82,7 +85,7 @@
target="support-jar"/>
</target>
- <target name="clean" depends="clean-java,clean-native"
+ <target name="clean" depends="clean-java,clean-native,-clean-hdk"
description="Removes all the files generated by a build" />
<!-- ================================
@@ -98,7 +101,7 @@
runs the build target in build-java.xml
================================= -->
- <target name="build-java"
+ <target name="build-java" depends="-init-hdk"
description="Compiles the java code only" >
<echo>
========================================
@@ -113,7 +116,7 @@
runs the clean target in build-java.xml
================================= -->
- <target name="clean-java"
+ <target name="clean-java" depends="-init-hdk-for-clean"
description="Removes the compiled java code" >
<ant antfile="make/build-java.xml" inheritall="false" target="clean" />
</target>
@@ -131,7 +134,7 @@
runs the build target in build-native.xml
================================= -->
- <target name="build-native"
+ <target name="build-native" depends="-init-hdk"
description="Compiles the native code only" >
<echo>
========================================
@@ -146,7 +149,7 @@
runs the clean target in build-native.xml
================================= -->
- <target name="clean-native"
+ <target name="clean-native" depends="-init-hdk-for-clean"
description="Removes the compiled native code" >
<ant antfile="make/build-native.xml" inheritall="false" target="clean" />
@@ -279,6 +282,41 @@
description="Display the properties that are use in the ant build files"
/>
+ <target name="-init-hdk">
+ <mkdir dir="${hy.hdk}/build/ant" />
+ <copy file="make/properties.xml"
+ tofile="${hy.hdk}/build/ant/properties.xml">
+ <filterchain>
+ <tokenfilter>
+ <replacestring from="Top-Level property definitions"
+ to="Common property definitions" />
+ </tokenfilter>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="-init-hdk-for-clean">
+ <!-- This is currently the same as "-init-hdk" but has
+ a different name since otherwise it would only
+ get called once - before the clean - during a rebuild
+ and not called a second time - before the build.
+ -->
+ <mkdir dir="${hy.hdk}/build/ant" />
+ <copy file="make/properties.xml"
+ tofile="${hy.hdk}/build/ant/properties.xml">
+ <filterchain>
+ <tokenfilter>
+ <replacestring from="Top-Level property definitions"
+ to="Common property definitions" />
+ </tokenfilter>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="-clean-hdk">
+ <delete dir="${hy.hdk}/build/ant" />
+ </target>
+
<macrodef name="chksum">
<attribute name="file" />
<attribute name="type" default="md5" />
Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Thu Oct 26 07:14:04 2006
@@ -19,7 +19,7 @@
-->
-<project name="Common Platform definitions" default="echo" basedir="..">
+<project name="Top-Level property definitions" default="echo" basedir="..">
<description>
Ant file of common properties to be imported by other ant files
</description>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for ACCESSIBILITY component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for ANNOTATION component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for APPLET component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for ARCHIVE component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml Thu Oct 26 07:14:04 2006
@@ -21,7 +21,8 @@
<description>Build for AUTH component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for AWT component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for BEANS component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for CONCURRENT component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for CRYPTO component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for ImageIO component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for INSTRUMENT component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for JNDI component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for LANG-MANAGEMENT component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for LOGGING component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml Thu Oct 26 07:14:04 2006
@@ -22,7 +22,8 @@
<description>Build for luni kernel stub jar</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <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" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for LUNI component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for MATH component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for MISC component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for NIO component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Thu Oct 26 07:14:04 2006
@@ -22,7 +22,8 @@
<description>Build for NIO_CHAR component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/portlib/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for PORTLIB component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml Thu Oct 26 07:14:04 2006
@@ -22,7 +22,8 @@
<description>Build for PREFS component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for Print component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml Thu Oct 26 07:14:04 2006
@@ -21,8 +21,8 @@
<project name="REGEX Build" default="build" basedir=".">
<description>Build for REGEX component</description>
- <!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for RMI component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml Thu Oct 26 07:14:04 2006
@@ -22,7 +22,8 @@
<description>Build for security kernel stub jar</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <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" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for SECURITY component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for SOUND component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for SQL component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for Sun Compat component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for SWING component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for TEXT component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for Tools component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?view=diff&rev=468008&r1=468007&r2=468008
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml Thu Oct 26 07:14:04 2006
@@ -20,7 +20,8 @@
<description>Build for X-NET component</description>
<!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
+ <property name="hy.hdk" location="${basedir}/../../deploy" />
+ <import file="${hy.hdk}/build/ant/properties.xml" />
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />