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/06/18 10:04:34 UTC
svn commit: r415106 - in
/incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules:
awt/make/build.xml misc/make/build.xml swing/make/build.xml
Author: hindessm
Date: Sun Jun 18 01:04:34 2006
New Revision: 415106
URL: http://svn.apache.org/viewvc?rev=415106&view=rev
Log:
Allow people to build misc, awt, and swing from here after building classlib.
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=415106&r1=415105&r2=415106&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 Sun Jun 18 01:04:34 2006
@@ -50,7 +50,7 @@
-->
<property name="build.dir" value=".."/>
- <property name="harmony.path" location="../.." />
+ <property name="harmony.path" location="../../../.." />
<property name="harmony.depends.build.path" location="${harmony.path}/depends/jars/build" />
<property name="build.path" location="${build.dir}/../build" />
<property environment="env"/>
@@ -133,11 +133,11 @@
<property name="src.tst" value="${basedir}/test" />
<property name="src.tst.common" value="${src.tst}/common" />
- <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" />
- <property name="build.bin.path" location="${harmony.path}/${harmonybin.path}/bin" />
+ <property name="harmonybin.path" value="${harmony.path}/deploy/jdk/jre"/>
+ <property name="build.lib.path" location="${harmonybin.path}/bin" />
+ <property name="build.jars.path" location="${harmonybin.path}/lib/boot" />
+ <property name="build.ext.path" location="${harmonybin.path}/lib/ext" />
+ <property name="build.bin.path" location="${harmonybin.path}/bin" />
<property name="tmp" location="${build.path}/tmp" />
<property name="source.ver" value="1.4" />
@@ -178,9 +178,9 @@
<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}/modules/luni/src/main/native/include/shared" />
+ <property name="native.include.path" value="${harmony.path}/deploy/jdk/include;${harmony.path}/deploy/include" />
<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="native.zlib.lib" value="${harmony.path}/deploy/lib" />
<property name="harmony.depends.native.build.path" location="${harmony.path}/depends/libs/build/" />
<property name="native.compiler" value="msvc" />
@@ -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}/modules/luni/src/main/native/include/shared" />
+ <property name="native.include.path" value="${harmony.path}/deploy/jdk/include:${harmony.path}/deploy/include" />
<property name="harmony.depends.native.build.path" location="${harmony.path}/depends/libs/build/" />
@@ -217,7 +217,7 @@
<property name="src.tst.common.ps" value="${src.tst}/linux" />
- <property name="jni_h.path" location="${native.include.path}"/>
+ <property name="jni_h.path" location="${harmony.path}/deploy/jdk/include"/>
</target>
@@ -384,7 +384,7 @@
<fileset dir="${src.tst.common}/unit/java/awt/geom/shapes/" />
</copy>
- <property name="vm.home" location="${harmony.path}/${harmonybin.path}" />
+ <property name="vm.home" location="${harmonybin.path}" />
<junit fork="yes"
forkmode="perTest"
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=415106&r1=415105&r2=415106&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 Sun Jun 18 01:04:34 2006
@@ -50,7 +50,7 @@
-->
<property name="build.dir" value=".."/>
- <property name="harmony.path" location="../.." />
+ <property name="harmony.path" location="../../../.." />
<property name="harmony.depends.build.path" location="${harmony.path}/depends/jars/build" />
<property name="build.path" location="${build.dir}/../build" />
<property environment="env"/>
@@ -133,11 +133,11 @@
<property name="src.tst" value="${basedir}/test" />
<property name="src.tst.common" value="${src.tst}/common" />
- <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" />
- <property name="build.bin.path" location="${harmony.path}/${harmonybin.path}/bin" />
+ <property name="harmonybin.path" location="${harmony.path}/deploy/jdk/jre"/>
+ <property name="build.lib.path" location="${harmonybin.path}/bin" />
+ <property name="build.jars.path" location="${harmonybin.path}/lib/boot" />
+ <property name="build.ext.path" location="${harmonybin.path}/lib/ext" />
+ <property name="build.bin.path" location="${harmonybin.path}/bin" />
<property name="tmp" location="${build.path}/tmp" />
<property name="source.ver" value="1.4" />
@@ -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}/modules/luni/src/main/native/include/shared" />
+ <property name="native.include.path" value="${harmony.path}/deploy/jdk/include;${harmony.path}/deploy/include" />
<property name="cPath" value="${PATH};${env.PATH}" />
<property name="cINCLUDE" value="${INCLUDE};${env.include};${env.INCLUDE};${native.include.path}" />
@@ -192,17 +192,17 @@
<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}/modules/luni/src/main/native/include/shared" />
+ <property name="native.include.path" value="${harmony.path}/deploy/jdk/include:${harmony.path}/deploy/include" />
<property name="cPath" value="${env.PATH}" />
- <property name="cINCLUDE" value="${env.INCLUDE};${native.include.path}" />
+ <property name="cINCLUDE" value="${env.INCLUDE}:${native.include.path}" />
<property name="cLIB" value="${env.LIB}" />
<property name="src.java" value="${src.linux.java}" />
<property name="compile.native.tail" value="linux" />
<property name="src.tst.common.ps" value="${src.tst}/linux" />
- <property name="jni_h.path" location="${native.include.path}"/>
+ <property name="jni_h.path" location="${harmony.path}/deploy/jdk/include"/>
</target>
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=415106&r1=415105&r2=415106&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 Sun Jun 18 01:04:34 2006
@@ -51,7 +51,7 @@
-->
<property name="build.dir" value="${basedir}/../../"/>
- <property name="harmony.path" location="../.." />
+ <property name="harmony.path" location="../../../.." />
<property name="harmony.depends.build.path" location="${harmony.path}/depends/jars/build" />
<property name="build.path" location="${build.dir}/build" />
<property name="src" location="${basedir}/src" />
@@ -130,11 +130,11 @@
<property name="src.tst" value="${basedir}/test" />
<property name="src.tst.common" value="${src.tst}/common" />
- <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" />
- <property name="build.bin.path" location="${harmony.path}/${harmonybin.path}/bin" />
+ <property name="harmonybin.path" location="${harmony.path}/deploy/jdk/jre"/>
+ <property name="build.lib.path" location="${harmonybin.path}/bin" />
+ <property name="build.jars.path" location="${harmonybin.path}/lib/boot" />
+ <property name="build.ext.path" location="${harmonybin.path}/lib/ext" />
+ <property name="build.bin.path" location="${harmonybin.path}/bin" />
<property name="tmp" location="${build.path}/tmp" />
<property name="source.ver" value="1.4" />
@@ -384,7 +384,7 @@
<property name="tests.output" value="${basedir}/tmp/testout" />
<mkdir dir="${tests.output}" />
- <property name="vm.home" location="${harmony.path}/${harmonybin.path}" />
+ <property name="vm.home" location="${harmonybin.path}" />
<junit fork="yes"
forkmode="perTest"