harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r613813 - in /harmony/enhanced/classlib/trunk/make: build-native.xml depends.properties depends.xml
Date Mon, 21 Jan 2008 09:32:08 GMT
Author: hindessm
Date: Mon Jan 21 01:32:07 2008
New Revision: 613813

URL: http://svn.apache.org/viewvc?rev=613813&view=rev
Log:
Fixing icu dependencies by moving platform-dependent files out of the
platform-independent header file zip.  Using my own patch from
"[#HARMONY-5405] [classlib][build] Move platform-specific link libraries 
from icu4c header zip files".

Modified:
    harmony/enhanced/classlib/trunk/make/build-native.xml
    harmony/enhanced/classlib/trunk/make/depends.properties
    harmony/enhanced/classlib/trunk/make/depends.xml

Modified: harmony/enhanced/classlib/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-native.xml?rev=613813&r1=613812&r2=613813&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-native.xml Mon Jan 21 01:32:07 2008
@@ -108,7 +108,7 @@
     <!-- ================================= 
           target: layout              
          ================================= -->
-    <target name="layout" depends="layout.windows,layout.zos"
+    <target name="layout" depends="-layout.windows,-layout.linklib"
         description="Construct the correct directory structure for native binaries">
 
     	<!-- Create the target directory structure -->
@@ -130,16 +130,18 @@
 
     </target>
 
-    <target name="layout.windows" if="is.windows" depends="-select-win-deps-x86_64,-select-win-deps-x86">
+    <target name="-layout.windows" if="is.windows"
+            depends="-select-win-deps-x86_64,-select-win-deps-x86">
         <!-- workaround until msdll is moved. -->
         <copy file="${msvcr.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
         <copy file="${msvcp.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
     </target>
 
-    <target name="layout.zos" if="is.zos">
-        <!-- on z/OS copy across .x files to link against -->
+    <target name="-layout.linklib" unless="shlib.is.linklib">
+        <!-- on windows copy .lib files and on z/OS copy across .x files
+             to link against -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${depends.libs}${hy.libstdc++.suffix}" includes="*${linklib.suffix}*"
/>
+            <fileset dir="${icudll.dir}" includes="*${linklib.suffix}*" />
         </copy>
     </target>
 
@@ -161,15 +163,6 @@
     <!-- ================================= 
           target: overlay-oss              
          ================================= -->
-    <condition property="iculib.zip"
-        value="${depends.oss}/icu4c-3.4-harmony-windows.x86_64.zip"
-        else="${depends.oss}/icu4c-3.4-harmony.zip">
-        <and>
-            <isset property="is.windows"/>
-            <isset property="is.x86_64"/>
-        </and>
-    </condition>
-
     <target name="overlay-oss">
         <ant dir="modules/luni" antfile="build.xml"
              target="overlay-oss" />
@@ -178,9 +171,8 @@
 	     target="overlay-oss" />        
     	
         <mkdir dir="${hy.hdk}/include/icu4c/unicode" />
-        <unzip src="${iculib.zip}" dest="${hy.hdk}/include/icu4c/unicode" />
+        <unzip src="${icuhdr.zip}" dest="${hy.hdk}/include/icu4c/unicode" />
         <chmod dir="${hy.hdk}/include/icu4c/unicode" perm="ugo+r" />
-        <copy file="${hy.hdk}/include/icu4c/unicode/icuuc.lib" todir="${native.lib.target}"
overwrite="yes"/>
     </target>
 
     <!-- ================================= 

Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?rev=613813&r1=613812&r2=613813&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Mon Jan 21 01:32:07 2008
@@ -144,3 +144,4 @@
 icudll.dir=${depends.dir}/libs/${hy.platform.variant}/icu-3.4
 icudll.zip=${depends.dir}/libs/${hy.platform.variant}/icu-3.4/icu-3.4.zip
 icudll.url=${depends.url}/libs/${hy.platform.variant}/icu-3.4.zip
+icuhdr.zip=${depends.dir}/oss/icu4c-3.4-harmony-includes.zip

Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=613813&r1=613812&r2=613813&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Mon Jan 21 01:32:07 2008
@@ -107,8 +107,29 @@
         <antcall target="-awt-tar-extract" />
     </target>
 
+    <target name="-temporary-warning" if="is.windows">
+        <!-- TODO: Remove this target in a week or two or when we
+             update to icu4c 3.8
+          -->
+        <condition property="windows.warn">
+            <not><available file="${icudll.dir}/icuuc.lib" /></not>
+        </condition>
+        <fail if="windows.warn">
+...
+
+
+Please remove the directory:
+
+  ${icudll.dir}
+
+and re-run "ant fetch-depends" to get a new version of icu-3.4.zip.  Sorry
+for the inconvinience.
+
+        </fail>
+    </target>
+
     <target name="-extract"
-         depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces,-extract-idea-from-bcprov,-extract-icudlls"
/>
+            depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces,-extract-idea-from-bcprov,-extract-icudlls,-temporary-warning"
/>
 
     <target name="-extract-props">
         <uptodate property="dejavu-fonts.uptodate"
@@ -131,6 +152,7 @@
                   targetfile="${icudll.dir}/uptodate" />
 
     </target>
+
 
     <target name="-extract-dejavu-fonts" unless="dejavu-fonts.uptodate">
         <unzip src="${dejavu-fonts.zip}" dest="${dejavu-fonts.dir}" />



Mime
View raw message