harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r423400 - in /incubator/harmony/enhanced/classlib/trunk/make: build-native.xml depends.xml
Date Wed, 19 Jul 2006 08:03:10 GMT
Author: hindessm
Date: Wed Jul 19 01:03:09 2006
New Revision: 423400

URL: http://svn.apache.org/viewvc?rev=423400&view=rev
Log:
Fix windows dll fetch and copying.  Thanks to Paulex for pointing this out.

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

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-native.xml?rev=423400&r1=423399&r2=423400&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-native.xml Wed Jul 19 01:03:09 2006
@@ -26,6 +26,8 @@
     <!-- import common properties -->
     <import file="${basedir}/make/properties.xml" />
 
+    <property file="make/depends.properties" />
+
     <property name="hy.hdk" location="deploy" />
     <property name="hy.jdk" location="${hy.hdk}/jdk" />
     <property name="depends.build" location="depends/build" />
@@ -113,6 +115,9 @@
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${depends.libs}" includes="*${shlib.suffix}*" />
         </copy>
+
+        <!-- workaround until msdll is moved. -->
+        <copy file="${msvcr71.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
     </target>
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/depends.xml?rev=423400&r1=423399&r2=423400&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Wed Jul 19 01:03:09 2006
@@ -110,6 +110,7 @@
 
     <target name="download-win" if="is.windows">
         
+	<mkdir dir="${msvcr71.dir}" />
 	<download-one-file src="${msvcr71.url}" dest="${msvcr71.dll}"
                            md5="${msvcr71.md5}" />
 



Mime
View raw message