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 2007/01/03 17:50:35 UTC

svn commit: r492214 - in /harmony/enhanced/classlib/trunk: depends/files/ depends/jars/ depends/jars/icu4jni_3.4/ depends/manifests/icu4jni_3.4/ depends/manifests/icu4jni_3.4/META-INF/ make/

Author: tellison
Date: Wed Jan  3 08:50:34 2007
New Revision: 492214

URL: http://svn.apache.org/viewvc?view=rev&rev=492214
Log:
Move ICU4JNI JAR into subfolder, like other dependencies.
Define it's manifest.

Added:
    harmony/enhanced/classlib/trunk/depends/jars/icu4jni_3.4/
    harmony/enhanced/classlib/trunk/depends/jars/icu4jni_3.4/icu4jni-3.4.jar
      - copied unchanged from r492128, harmony/enhanced/classlib/trunk/depends/jars/icu4jni-3.4.jar
    harmony/enhanced/classlib/trunk/depends/manifests/icu4jni_3.4/
    harmony/enhanced/classlib/trunk/depends/manifests/icu4jni_3.4/META-INF/
    harmony/enhanced/classlib/trunk/depends/manifests/icu4jni_3.4/META-INF/MANIFEST.MF
Removed:
    harmony/enhanced/classlib/trunk/depends/jars/icu4jni-3.4.jar
Modified:
    harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
    harmony/enhanced/classlib/trunk/make/build-java.xml

Modified: harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties?view=diff&rev=492214&r1=492213&r2=492214
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties (original)
+++ harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties Wed Jan  3 08:50:34 2007
@@ -165,7 +165,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.32=icu4jni_3.4/icu4jni-3.4.jar
 bootclasspath.33=icu4j_3.4.4/icu4j_3_4_4.jar
 
 # The following JARs are from Xerces/Xalan

Added: harmony/enhanced/classlib/trunk/depends/manifests/icu4jni_3.4/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/manifests/icu4jni_3.4/META-INF/MANIFEST.MF?view=auto&rev=492214
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/manifests/icu4jni_3.4/META-INF/MANIFEST.MF (added)
+++ harmony/enhanced/classlib/trunk/depends/manifests/icu4jni_3.4/META-INF/MANIFEST.MF Wed Jan  3 08:50:34 2007
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ICU4JNI
+Bundle-SymbolicName: com.ibm.icu4jni
+Bundle-Version: 3.4
+Bundle-ClassPath: .
+Eclipse-JREBundle: true
+Import-Package: java.io,
+ java.lang,
+ java.nio,
+ java.nio.charset,
+ java.nio.charset.spi,
+ java.text,
+ java.util
+Export-Package: com.ibm.icu4jni.charset,
+ com.ibm.icu4jni.common,
+ com.ibm.icu4jni.converters,
+ com.ibm.icu4jni.text

Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?view=diff&rev=492214&r1=492213&r2=492214
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Wed Jan  3 08:50:34 2007
@@ -206,15 +206,15 @@
         <!-- Copy across the boot dependency jars -->
         <copy todir="${hy.jdk}/jre/lib/boot">
             <fileset dir="${depends.jars}">
-                <patternset includes="*.jar" />
-                <patternset includes="xerces_2.8.0/*.jar" />
-                <patternset includes="xalan-j_2.7.0/*.jar" />
+                <patternset includes="bcel-5.2/*.jar" />
                 <patternset includes="icu4j_3.4.4/*.jar" />
+                <patternset includes="icu4jni_3.4/*.jar" />
                 <patternset includes="mx4j_3.0.1/*.jar" />
+                <patternset includes="xalan-j_2.7.0/*.jar" />
+                <patternset includes="xerces_2.8.0/*.jar" />
                 <patternset includes="yoko_M1-20061027/yoko-rmi.jar" />
                 <patternset includes="yoko_M2-20061115/yoko.jar" />
                 <patternset includes="yoko_M2-20061115/yoko-core.jar" />
-                <patternset includes="bcel-5.2/*.jar" />
             </fileset>
             <fileset dir="${depends.manifests}"/>
         </copy>