harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r479986 - in /harmony/enhanced/classlib/trunk: depends/oss/icu4c-3.4-harmony.zip make/build-native.xml modules/text/build.xml modules/text/src/main/native/text/linux/makefile
Date Tue, 28 Nov 2006 10:45:40 GMT
Author: hindessm
Date: Tue Nov 28 02:45:39 2006
New Revision: 479986

URL: http://svn.apache.org/viewvc?view=rev&rev=479986
Log:
Remove linux.x86 specific binary from icu4c zip file.  Instead of using
this copy, run 'layout' target in build-native.xml before 'make-all' and
use the copy in jre/bin.

Update documentation to reflect current usage of icu4c zip.

Modified:
    harmony/enhanced/classlib/trunk/depends/oss/icu4c-3.4-harmony.zip
    harmony/enhanced/classlib/trunk/make/build-native.xml
    harmony/enhanced/classlib/trunk/modules/text/build.xml
    harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/makefile

Modified: harmony/enhanced/classlib/trunk/depends/oss/icu4c-3.4-harmony.zip
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/oss/icu4c-3.4-harmony.zip?view=diff&rev=479986&r1=479985&r2=479986
==============================================================================
Binary files - no diff available.

Modified: harmony/enhanced/classlib/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-native.xml?view=diff&rev=479986&r1=479985&r2=479986
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-native.xml Tue Nov 28 02:45:39 2006
@@ -50,7 +50,7 @@
           target: build
          ================================= -->
     <target name="build"
-        depends="overlay-oss, copy-includes, make-all, layout" />
+        depends="overlay-oss, copy-includes, layout, make-all" />
 
 
     <!-- ================================= 
@@ -62,10 +62,6 @@
 
     <!-- This target invokes make on the all target to compile all natives -->
     <target name="make-all" depends="copy-makefile-includes">
-    	<!-- Create the target directory structure -->
-        <mkdir dir="${hy.jdk}/jre/bin" />
-        <mkdir dir="${hy.jdk}/include" />
-    	<mkdir dir="${native.lib.target}"/>
     	
     	<!-- These module targets take care of building and copying
              their shared libs -->
@@ -113,6 +109,11 @@
          ================================= -->
     <target name="layout" depends="layout.windows"
         description="Construct the correct directory structure for native binaries">
+
+    	<!-- Create the target directory structure -->
+        <mkdir dir="${hy.jdk}/jre/bin" />
+        <mkdir dir="${hy.jdk}/include" />
+    	<mkdir dir="${native.lib.target}"/>
 
     	<!-- NLS catalog files -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">

Modified: harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/build.xml?view=diff&rev=479986&r1=479985&r2=479986
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/text/build.xml Tue Nov 28 02:45:39 2006
@@ -60,13 +60,6 @@
         <mkdir dir="${hy.text.src.main.native}/icu4c/unicode" />
         <unzip src="${iculib.zip}" dest="${hy.text.src.main.native}/icu4c/unicode" />
         <chmod dir="${hy.text.src.main.native}/icu4c/unicode" perm="ugo+r" />
-        <antcall target="copy-libs" inheritall="true" />
-    </target>
-
-    <target name="copy-libs" if="is.64bit">
-        <copy todir="${hy.text.src.main.native}/icu4c/unicode" overwrite="yes">
-                <fileset dir="${depends.libs}" includes="*${shlib.suffix}*" />
-        </copy>
     </target>
 
     <target name="clean-overlay-oss">

Modified: harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/makefile?view=diff&rev=479986&r1=479985&r2=479986
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/makefile Tue Nov
28 02:45:39 2006
@@ -23,7 +23,7 @@
 BUILDFILES = $(SHAREDSUB)text_copyright.o $(SHAREDSUB)BidiWrapper.o
 
 MDLLIBFILES = \
-	../../icu4c/unicode/libicuuc.so.34 \
+	$(DLLPATH)libicuuc.so.34 \
 	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a
\
 	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
 



Mime
View raw message