Return-Path: 
 <commits-return-46674-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 88267 invoked from network); 12 Nov 2007 22:31:52 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 12 Nov 2007 22:31:52 -0000
Received: (qmail 25989 invoked by uid 500); 12 Nov 2007 22:31:40 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 25968 invoked by uid 500); 12 Nov 2007 22:31:40 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 25959 invoked by uid 99); 12 Nov 2007 22:31:40 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Nov 2007 14:31:40 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Nov 2007 22:32:37 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6F2161A9832; Mon, 12 Nov 2007 14:31:29 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: 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
Date: Mon, 12 Nov 2007 22:31:29 -0000
To: commits@harmony.apache.org
From: odeakin@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071112223129.6F2161A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>