You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/05/03 14:01:36 UTC
svn commit: r399278 - in /incubator/harmony/enhanced/classlib/trunk:
make/build-java.xml native-src/build.xml
Author: tellison
Date: Wed May 3 05:01:35 2006
New Revision: 399278
URL: http://svn.apache.org/viewcvs?rev=399278&view=rev
Log:
Apply patch HARMONY-284 (Native build.xml should move NLS catalogs to jre/bin, not java-build.xml)
Modified:
incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=399278&r1=399277&r2=399278&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Wed May 3 05:01:35 2006
@@ -375,13 +375,6 @@
<fixcrlf srcdir="${target.output}/jre/lib/boot"
includes="bootclasspath.properties" />
- <!-- NLS catalog files -->
- <copy todir="${target.output}/jre/bin" overwrite="yes">
- <fileset dir="${depends.files}">
- <include name="harmony*.properties" />
- </fileset>
- </copy>
-
<copy todir="${target.output}/jre/lib/security" overwrite="yes">
<fileset dir="${depends.files}">
<include name="java.policy" />
@@ -405,6 +398,7 @@
<delete includeemptydirs="true" failonerror="false">
<fileset dir="${target.output}">
<exclude name="jre/bin/default/**" />
+ <exclude name="jre/bin/**" />
<exclude name="jre/lib/ext/**" />
</fileset>
</delete>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/build.xml?rev=399278&r1=399277&r2=399278&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/build.xml Wed May 3 05:01:35 2006
@@ -53,6 +53,7 @@
<property name="target.output" location="../deploy" />
<property name="depends.oss" location="../depends/oss" />
<property name="depends.libs" location="../depends/libs/${target.platform}" />
+ <property name="depends.files" location="../depends/files" />
<property name="build.output" location="../native-bin/${target.platform}" />
<property name="native.src.root" location="${basedir}/${target.platform}" />
<property name="native.shared.src.root" location="${basedir}/shared" />
@@ -150,6 +151,13 @@
<patternset includes="javaw${exe.suffix}" />
</fileset>
</copy>
+
+ <!-- NLS catalog files -->
+ <copy todir="${target.output}/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" />
@@ -180,6 +188,7 @@
<include name="**/bin/java${exe.suffix}" />
<include name="**/bin/javaw${exe.suffix}" />
<include name="**/bin/*${shlib.suffix}*" />
+ <include name="**/bin/harmony*.properties" />
</fileset>
</delete>
</target>