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/04/03 12:33:48 UTC
svn commit: r390995 - in /incubator/harmony/enhanced/classlib/trunk:
depends/files/bootclasspath.properties depends/jars/
depends/jars/icu4j_3_4.jar make/build-java.xml make/depends.properties
make/depends.xml
Author: tellison
Date: Mon Apr 3 03:33:18 2006
New Revision: 390995
URL: http://svn.apache.org/viewcvs?rev=390995&view=rev
Log:
Update to ICU4J version 3.4.4 and make it a downloaded dependency
Removed:
incubator/harmony/enhanced/classlib/trunk/depends/jars/icu4j_3_4.jar
Modified:
incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
incubator/harmony/enhanced/classlib/trunk/depends/jars/ (props changed)
incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
incubator/harmony/enhanced/classlib/trunk/make/depends.properties
incubator/harmony/enhanced/classlib/trunk/make/depends.xml
Modified: incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties?rev=390995&r1=390994&r2=390995&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties Mon Apr 3 03:33:18 2006
@@ -161,7 +161,7 @@
# ICU functionality for text/characters is provided by JNI wrappers
# to ICU4C and pure-Java implementation in the ICU4J JAR file.
bootclasspath.32=icu4jni-3.4.jar
-bootclasspath.33=icu4j_3_4.jar
+bootclasspath.33=icu4j_3.4.4/icu4j_3_4_4.jar
# The following JARs are from Xerces/Xalan
bootclasspath.34=xalan-j_2.6.0/xalan.jar
Propchange: incubator/harmony/enhanced/classlib/trunk/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 3 03:33:18 2006
@@ -3,3 +3,4 @@
xerces_2.6.2
bcprov-jdk14-131
bcprov-jdk14-132
+icu4j_3.4.4
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=390995&r1=390994&r2=390995&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Mon Apr 3 03:33:18 2006
@@ -253,16 +253,11 @@
<src path="modules/security/src/linux/javasrc" />
<src path="modules/security-kernel/src/main/java" />
<src path="modules/x-net/src/main/java/" />
-
<src path="modules/rmi/src/main/java" />
<src path="modules/sql/src/main/java" />
-
<src path="modules/text/src/main/java" />
-
<src path="modules/jndi/src/main/java" />
-
<src path="modules/logging/src/main/java" />
-
<src path="modules/prefs/src/main/java" />
<classpath location="${build.output}" />
@@ -338,6 +333,8 @@
<patternset includes="*.jar" />
<patternset includes="xerces_2.6.2/*.jar" />
<patternset includes="xalan-j_2.6.0/*.jar" />
+ <patternset includes="icu4j_3.4.4/*.jar" />
+
</fileset>
</copy>
Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/depends.properties?rev=390995&r1=390994&r2=390995&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.properties Mon Apr 3 03:33:18 2006
@@ -54,3 +54,8 @@
msvcr71.dll=${msvcr71.dir}/msvcr71.dll
msvcr71.url=http://www.dlldump.com/cgi-bin/testwrap/downloadcounts.cgi?rt=count&path=dllfiles/M/MSVCR71.dll
msvcr71.md5=86f1895ae8c5e8b17d99ece768a70732
+
+icu4j.dir=${depends.jars}/icu4j_3.4.4
+icu4j.jar=${icu4j.dir}/icu4j_3_4_4.jar
+icu4j.url=ftp://ftp.software.ibm.com/software/globalization/icu/icu4j/3.4.4/icu4j_3_4_4.jar
+icu4j.md5=92422a9465ccc608bc7a8ae9cf594509
Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/depends.xml?rev=390995&r1=390994&r2=390995&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Mon Apr 3 03:33:18 2006
@@ -42,6 +42,8 @@
<check-one-file src="${bcprov.url}" dest="${signed.bcprov.jar}" />
+ <check-one-file src="${icu4j.url}" dest="${icu4j.jar}" />
+
<uptodate property="bcprov.uptodate"
srcfile="${signed.bcprov.jar}"
targetfile="${bcprov.jar}" />
@@ -80,6 +82,10 @@
<mkdir dir="${bcprov.dir}" />
<download-one-file src="${bcprov.url}" dest="${signed.bcprov.jar}"
md5="${signed.bcprov.md5}" />
+
+ <mkdir dir="${icu4j.dir}" />
+ <download-one-file src="${icu4j.url}" dest="${icu4j.jar}"
+ md5="${icu4j.md5}" />
<antcall target="download-win" />
Re: svn commit: r390995 - in /incubator/harmony/enhanced/classlib/trunk:
depends/files/bootclasspath.properties depends/jars/ depends/jars/icu4j_3_4.jar
make/build-java.xml make/depends.properties make/depends.xml
Posted by Tim Ellison <t....@gmail.com>.
Heads up once again, the build now expects that your ICU4J jar file
resides in a particular directory and will complain if it doesn't exist.
You can download the checked dependencies using
ant -f make/depends.xml download
Regards,
Tim
tellison@apache.org wrote:
> Author: tellison
> Date: Mon Apr 3 03:33:18 2006
> New Revision: 390995
>
> URL: http://svn.apache.org/viewcvs?rev=390995&view=rev
> Log:
> Update to ICU4J version 3.4.4 and make it a downloaded dependency
>
> Removed:
> incubator/harmony/enhanced/classlib/trunk/depends/jars/icu4j_3_4.jar
> Modified:
> incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
> incubator/harmony/enhanced/classlib/trunk/depends/jars/ (props changed)
> incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
> incubator/harmony/enhanced/classlib/trunk/make/depends.properties
> incubator/harmony/enhanced/classlib/trunk/make/depends.xml
>
> Modified: incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
> URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties?rev=390995&r1=390994&r2=390995&view=diff
> ==============================================================================
> --- incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties (original)
> +++ incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties Mon Apr 3 03:33:18 2006
> @@ -161,7 +161,7 @@
> # ICU functionality for text/characters is provided by JNI wrappers
> # to ICU4C and pure-Java implementation in the ICU4J JAR file.
> bootclasspath.32=icu4jni-3.4.jar
> -bootclasspath.33=icu4j_3_4.jar
> +bootclasspath.33=icu4j_3.4.4/icu4j_3_4_4.jar
>
> # The following JARs are from Xerces/Xalan
> bootclasspath.34=xalan-j_2.6.0/xalan.jar
>
> Propchange: incubator/harmony/enhanced/classlib/trunk/depends/jars/
> ------------------------------------------------------------------------------
> --- svn:ignore (original)
> +++ svn:ignore Mon Apr 3 03:33:18 2006
> @@ -3,3 +3,4 @@
> xerces_2.6.2
> bcprov-jdk14-131
> bcprov-jdk14-132
> +icu4j_3.4.4
>
> 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=390995&r1=390994&r2=390995&view=diff
> ==============================================================================
> --- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
> +++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Mon Apr 3 03:33:18 2006
> @@ -253,16 +253,11 @@
> <src path="modules/security/src/linux/javasrc" />
> <src path="modules/security-kernel/src/main/java" />
> <src path="modules/x-net/src/main/java/" />
> -
> <src path="modules/rmi/src/main/java" />
> <src path="modules/sql/src/main/java" />
> -
> <src path="modules/text/src/main/java" />
> -
> <src path="modules/jndi/src/main/java" />
> -
> <src path="modules/logging/src/main/java" />
> -
> <src path="modules/prefs/src/main/java" />
>
> <classpath location="${build.output}" />
> @@ -338,6 +333,8 @@
> <patternset includes="*.jar" />
> <patternset includes="xerces_2.6.2/*.jar" />
> <patternset includes="xalan-j_2.6.0/*.jar" />
> + <patternset includes="icu4j_3.4.4/*.jar" />
> +
> </fileset>
> </copy>
>
>
> Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.properties
> URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/depends.properties?rev=390995&r1=390994&r2=390995&view=diff
> ==============================================================================
> --- incubator/harmony/enhanced/classlib/trunk/make/depends.properties (original)
> +++ incubator/harmony/enhanced/classlib/trunk/make/depends.properties Mon Apr 3 03:33:18 2006
> @@ -54,3 +54,8 @@
> msvcr71.dll=${msvcr71.dir}/msvcr71.dll
> msvcr71.url=http://www.dlldump.com/cgi-bin/testwrap/downloadcounts.cgi?rt=count&path=dllfiles/M/MSVCR71.dll
> msvcr71.md5=86f1895ae8c5e8b17d99ece768a70732
> +
> +icu4j.dir=${depends.jars}/icu4j_3.4.4
> +icu4j.jar=${icu4j.dir}/icu4j_3_4_4.jar
> +icu4j.url=ftp://ftp.software.ibm.com/software/globalization/icu/icu4j/3.4.4/icu4j_3_4_4.jar
> +icu4j.md5=92422a9465ccc608bc7a8ae9cf594509
>
> Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.xml
> URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/depends.xml?rev=390995&r1=390994&r2=390995&view=diff
> ==============================================================================
> --- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
> +++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Mon Apr 3 03:33:18 2006
> @@ -42,6 +42,8 @@
>
> <check-one-file src="${bcprov.url}" dest="${signed.bcprov.jar}" />
>
> + <check-one-file src="${icu4j.url}" dest="${icu4j.jar}" />
> +
> <uptodate property="bcprov.uptodate"
> srcfile="${signed.bcprov.jar}"
> targetfile="${bcprov.jar}" />
> @@ -80,6 +82,10 @@
> <mkdir dir="${bcprov.dir}" />
> <download-one-file src="${bcprov.url}" dest="${signed.bcprov.jar}"
> md5="${signed.bcprov.md5}" />
> +
> + <mkdir dir="${icu4j.dir}" />
> + <download-one-file src="${icu4j.url}" dest="${icu4j.jar}"
> + md5="${icu4j.md5}" />
>
> <antcall target="download-win" />
>
>
>
>
--
Tim Ellison (t.p.ellison@gmail.com)
IBM Java technology centre, UK.
---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org