harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ghar...@apache.org
Subject svn commit: r407035 - in /incubator/harmony/enhanced/classlib/trunk: depends/oss/ depends/oss/linux.IA32/ depends/oss/win.IA32/ native-src/ native-src/linux.IA32/text/ native-src/win.IA32/text/
Date Tue, 16 May 2006 19:41:15 GMT
Author: gharley
Date: Tue May 16 12:41:14 2006
New Revision: 407035

URL: http://svn.apache.org/viewcvs?rev=407035&view=rev
Log:
HARMONY 451 : Consolidate icu4c zips

Added:
    incubator/harmony/enhanced/classlib/trunk/depends/oss/icu4c-3.4-harmony.zip   (with props)
Removed:
    incubator/harmony/enhanced/classlib/trunk/depends/oss/linux.IA32/
    incubator/harmony/enhanced/classlib/trunk/depends/oss/win.IA32/
Modified:
    incubator/harmony/enhanced/classlib/trunk/depends/oss/README.txt
    incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile

Modified: incubator/harmony/enhanced/classlib/trunk/depends/oss/README.txt
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/depends/oss/README.txt?rev=407035&r1=407034&r2=407035&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/depends/oss/README.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/depends/oss/README.txt Tue May 16 12:41:14 2006
@@ -26,10 +26,10 @@
 header files (with .h extension) that come straight from the ICU download
 available on the ICU home page. These have been grouped into a directory 
 called "unicode" which is expanded under the
-<EXTRACT_DIR>/Harmony/native-src/<target platform>/include directory as part
+<EXTRACT_DIR>/Harmony/native-src/<target platform>/text/unicode directory as
part
 of this contribution's native build. The icu4c-3.4-harmony.zip file also
 contains an ICUUC library which is expanded to the 
-<EXTRACT_DIR>/Harmony/native-src/<target platform>/text directory during the
+<EXTRACT_DIR>/Harmony/native-src/<target platform>/text/unicode directory during
the
 build where it used as part of the hytext shared library.
 
 The official ICU page is located at

Added: incubator/harmony/enhanced/classlib/trunk/depends/oss/icu4c-3.4-harmony.zip
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/depends/oss/icu4c-3.4-harmony.zip?rev=407035&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/harmony/enhanced/classlib/trunk/depends/oss/icu4c-3.4-harmony.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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=407035&r1=407034&r2=407035&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/build.xml Tue May 16 12:41:14 2006
@@ -60,7 +60,7 @@
 
         <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
         <property name="zlib.zip" location="${depends.oss}/zlib_1.2.3.zip" />
-        <property name="iculib.zip" location="${depends.oss}/${target.platform}/icu4c-3.4-harmony.zip"
/>
+        <property name="iculib.zip" location="${depends.oss}/icu4c-3.4-harmony.zip" />
     </target>
 
 
@@ -72,6 +72,7 @@
         <property name="make.command" value="nmake.exe" />
         <property name="exe.suffix" value=".exe" />
         <property name="shlib.suffix" value=".dll" />
+    	<property name="linklib.suffix" value=".lib" />
     </target>
 
 
@@ -83,6 +84,7 @@
         <property name="make.command" value="make" />
         <property name="exe.suffix" value="" />
         <property name="shlib.suffix" value=".so" />
+    	<property name="linklib.suffix" value=".so" />
     </target>
 
 
@@ -204,9 +206,9 @@
         <unzip src="${zlib.zip}" dest="${native.src.root}/zlib/dist" />
         <chmod dir="${native.src.root}/zlib/dist" perm="ugo+r" />
 
-        <unzip src="${iculib.zip}" dest="${native.src.root}" />
-        <chmod dir="${native.src.root}/include/unicode" perm="ugo+r" />
-        <chmod dir="${native.src.root}/text" perm="ugo+r" />
+		<mkdir dir="${native.src.root}/text/unicode" />
+    	<unzip src="${iculib.zip}" dest="${native.src.root}/text/unicode" />
+        <chmod dir="${native.src.root}/text/unicode" perm="ugo+r" />
     </target>
 
     <!-- ================================= 
@@ -215,10 +217,7 @@
     <target name="clean-overlay-oss" depends="properties">
         <delete dir="${native.src.root}/fdlibm/dist" quiet="true" />
         <delete dir="${native.src.root}/zlib/dist" quiet="true" />
-        <delete dir="${native.src.root}/include/unicode" quiet="true" />
-        <!-- should really only delete one of these per platform ... -->
-        <delete file="${native.src.root}/text/icuuc.lib" quiet="true" />
-        <delete file="${native.src.root}/text/libicuuc.so.34" quiet="true" />
+        <delete dir="${native.src.root}/text/unicode" quiet="true" />
     </target>
 
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile?rev=407035&r1=407034&r2=407035&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile Tue May
16 12:41:14 2006
@@ -22,7 +22,7 @@
 BUILDFILES = text_copyright.o $(SHAREDSUB)BidiWrapper.o
 
 MDLLIBFILES = \
-	libicuuc.so.34 \
+	unicode/libicuuc.so.34 \
 	../libhysig.so ../lib/libhyzip.a ../libhyzlib.so ../lib/libhycommon.a \
 	../lib/libhypool.a ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile?rev=407035&r1=407034&r2=407035&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile Tue May 16
12:41:14 2006
@@ -30,7 +30,7 @@
 
 MDLLIBFILES = \
   ..\lib\hysig.lib ..\lib\hycommon.lib ..\lib\hypool.lib ..\lib\hyfdlibm.lib \
-  ..\lib\hythr.lib ..\lib\vmi.lib icuuc.lib
+  ..\lib\hythr.lib ..\lib\vmi.lib unicode\icuuc.lib
 
 DLLBASE=0x13300000
 COMMENT=/comment:"Text component native code. (c) Copyright 1993, 2005 The Apache Software
Foundation or its licensors, as applicable."



Mime
View raw message