svn commit: r415053 - in /incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules: awt/make/build.xml misc/make/build.xml swing/make/build.xml

[hi...@apache.org]

Author: hindessm
Date: Sat Jun 17 13:05:08 2006
New Revision: 415053

URL: http://svn.apache.org/viewvc?rev=415053&view=rev
Log:
Applied patches from "[#HARMONY-607] Build scripts for HARMONY-528 contribution needs modification".

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/misc/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/swing/make/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/build.xml?rev=415053&r1=415052&r2=415053&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/make/build.xml Sat Jun 17 13:05:08 2006
@@ -133,7 +133,7 @@
         <property name="src.tst" value="${basedir}/test" />
         <property name="src.tst.common" value="${src.tst}/common" />
 
-        <property name="harmonybin.path" value="deploy/jre"/>
+        <property name="harmonybin.path" value="deploy/jdk/jre"/>
         <property name="build.lib.path" location="${harmony.path}/${harmonybin.path}/bin" />
         <property name="build.jars.path" location="${harmony.path}/${harmonybin.path}/lib/boot" />
         <property name="build.ext.path" location="${harmony.path}/${harmonybin.path}/lib/ext" />
@@ -178,7 +178,7 @@
     <target name="init.win" depends="init, init.java_home" if="if.win">
         <property name="target.os" value="windows"/>
 
-        <property name="native.include.path" value="${harmony.path}/native-src/win.IA32/include;${harmony.path}/native-src/shared/include" />
+        <property name="native.include.path" value="${harmony.path}/native-src/win.IA32/include;${harmony.path}/modules/luni/src/main/native/include/shared" />
         <property name="native.zlib.include" value="${harmony.path}/native-src/win.IA32/zlib;${harmony.path}/native-src/win.IA32/zlib/dist" />
         <property name="native.zlib.lib" value="${harmony.path}/native-src/win.IA32/lib" />
         <property name="harmony.depends.native.build.path" location="${harmony.path}/depends/libs/build/" />
@@ -202,7 +202,7 @@
     <target name="init.linux" depends="init, init.java_home" if="if.linux">
         <property name="target.os" value="unix"/>
 
-        <property name="native.include.path" value="${harmony.path}/native-src/linux.IA32/include:${harmony.path}/native-src/shared/include" />
+        <property name="native.include.path" value="${harmony.path}/native-src/linux.IA32/include:${harmony.path}/modules/luni/src/main/native/include/shared" />
         <property name="harmony.depends.native.build.path" location="${harmony.path}/depends/libs/build/" />
         
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/misc/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/misc/make/build.xml?rev=415053&r1=415052&r2=415053&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/misc/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/misc/make/build.xml Sat Jun 17 13:05:08 2006
@@ -133,7 +133,7 @@
         <property name="src.tst" value="${basedir}/test" />
         <property name="src.tst.common" value="${src.tst}/common" />
 
-        <property name="harmonybin.path" value="deploy/jre"/>
+        <property name="harmonybin.path" value="deploy/jdk/jre"/>
         <property name="build.lib.path" location="${harmony.path}/${harmonybin.path}/bin" />
         <property name="build.jars.path" location="${harmony.path}/${harmonybin.path}/lib/boot" />
         <property name="build.ext.path" location="${harmony.path}/${harmonybin.path}/lib/ext" />
@@ -175,7 +175,7 @@
 
     <target name="init.win" depends="init, init.java_home" if="if.win">
 
-        <property name="native.include.path" value="${harmony.path}/native-src/win.IA32/include;${harmony.path}/native-src/shared/include" />
+        <property name="native.include.path" value="${harmony.path}/native-src/win.IA32/include;${harmony.path}/modules/luni/src/main/native/include/shared" />
 
         <property name="cPath" value="${PATH};${env.PATH}" />
         <property name="cINCLUDE" value="${INCLUDE};${env.include};${env.INCLUDE};${native.include.path}" />
@@ -192,7 +192,7 @@
     
     <target name="init.linux" depends="init, init.java_home" if="if.linux">
 
-        <property name="native.include.path" value="${harmony.path}/native-src/linux.IA32/include:${harmony.path}/native-src/shared/include" />
+        <property name="native.include.path" value="${harmony.path}/native-src/linux.IA32/include:${harmony.path}/modules/luni/src/main/native/include/shared" />
 
         <property name="cPath" value="${env.PATH}" />
         <property name="cINCLUDE" value="${env.INCLUDE};${native.include.path}" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/swing/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/swing/make/build.xml?rev=415053&r1=415052&r2=415053&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/swing/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/swing/make/build.xml Sat Jun 17 13:05:08 2006
@@ -130,7 +130,7 @@
         <property name="src.tst" value="${basedir}/test" />
         <property name="src.tst.common" value="${src.tst}/common" />
 
-        <property name="harmonybin.path" value="deploy/jre"/>
+        <property name="harmonybin.path" value="deploy/jdk/jre"/>
         <property name="build.lib.path" location="${harmony.path}/${harmonybin.path}/bin" />
         <property name="build.jars.path" location="${harmony.path}/${harmonybin.path}/lib/boot" />
         <property name="build.ext.path" location="${harmony.path}/${harmonybin.path}/lib/ext" />