You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by od...@apache.org on 2007/11/12 23:31:29 UTC

svn commit: r594325 - in /harmony/enhanced/classlib/trunk: depends/oss/icu4c-3.4-harmony-windows.x86_64.zip depends/oss/icu4c-3.4-harmony.zip make/build-native.xml

Author: odeakin
Date: Mon Nov 12 14:31:28 2007
New Revision: 594325

URL: http://svn.apache.org/viewvc?rev=594325&view=rev
Log:
Reverting previous commit to fix DRLVM build.

Added:
    harmony/enhanced/classlib/trunk/depends/oss/icu4c-3.4-harmony-windows.x86_64.zip
      - copied unchanged from r594205, harmony/enhanced/classlib/trunk/depends/oss/icu4c-3.4-harmony-windows.x86_64.zip
    harmony/enhanced/classlib/trunk/depends/oss/icu4c-3.4-harmony.zip
      - copied unchanged from r594205, harmony/enhanced/classlib/trunk/depends/oss/icu4c-3.4-harmony.zip
Modified:
    harmony/enhanced/classlib/trunk/make/build-native.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=594325&r1=594324&r2=594325&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-native.xml Mon Nov 12 14:31:28 2007
@@ -160,12 +160,26 @@
     <!-- ================================= 
           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" />
 
     	<ant dir="modules/archive" antfile="build.xml" 
 	     target="overlay-oss" />        
+    	
+        <mkdir dir="${hy.hdk}/include/icu4c/unicode" />
+        <unzip src="${iculib.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>
 
     <!-- ================================= 
@@ -231,6 +245,7 @@
              target="clean-overlay-oss" />
      	<ant dir="modules/archive" antfile="build.xml" 
     	     target="clean-overlay-oss" />
+	<delete dir="${hy.hdk}/include/icu4c" quiet="true" />     
     </target>
 
 </project>