You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ap...@apache.org on 2006/12/27 16:11:23 UTC
svn commit: r490509 - in /harmony/enhanced/classlib/trunk/make:
build-native.xml depends.properties depends.xml
Author: apetrenko
Date: Wed Dec 27 07:11:22 2006
New Revision: 490509
URL: http://svn.apache.org/viewvc?view=rev&rev=490509
Log:
Class library dependency on msvcr71.dll has been removed.
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?view=diff&rev=490509&r1=490508&r2=490509
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-native.xml Wed Dec 27 07:11:22 2006
@@ -109,7 +109,7 @@
<!-- =================================
target: layout
================================= -->
- <target name="layout" depends="layout.windows"
+ <target name="layout"
description="Construct the correct directory structure for native binaries">
<!-- Create the target directory structure -->
@@ -129,11 +129,6 @@
<fileset dir="${depends.libs}" includes="*${shlib.suffix}*" />
</copy>
- </target>
-
- <target name="layout.windows" if="is.windows">
- <!-- workaround until msdll is moved. -->
- <copy file="${msvcr71.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
</target>
<!-- =================================
Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?view=diff&rev=490509&r1=490508&r2=490509
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Wed Dec 27 07:11:22 2006
@@ -45,11 +45,6 @@
bcprov.md5=6141379cf543ba9b24536d281181c6f3
bcprov.url=http://www.bouncycastle.org/download/bcprov-jdk15-134.jar
-msvcr71.dir=${depends.dir}/libs/windows.x86
-msvcr71.dll=${msvcr71.dir}/msvcr71.dll
-msvcr71.url=http://www.dlldump.com/dllfiles/M/MSVCR71.dll
-msvcr71.md5=86f1895ae8c5e8b17d99ece768a70732
-
icu4j.dir=${depends.jars}/icu4j_3.4.4
icu4j.jar=${icu4j.dir}/icu4j_3_4_4.jar
icu4j.url=${mirror.base}/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar
Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?view=diff&rev=490509&r1=490508&r2=490509
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Wed Dec 27 07:11:22 2006
@@ -54,7 +54,6 @@
<target name="-check-win" if="is.windows" depends="-really-check-win" />
<target name="-really-check-win" if="is.windows">
- <check-one-file src="${msvcr71.url}" dest="${msvcr71.dll}" />
<check-one-file src="${awtdeps.url}" dest="${awtdeps.tar}" />
<uptodate property="awtdeps.uptodate"
srcfile="${awtdeps.tar}"
@@ -276,10 +275,6 @@
<target name="-download-win" if="is.windows">
- <mkdir dir="${msvcr71.dir}" />
- <download-one-file src="${msvcr71.url}" dest="${msvcr71.dll}"
- md5="${msvcr71.md5}" />
-
<mkdir dir="${awtdeps.dir}" />
<download-one-file src="${awtdeps.url}" dest="${awtdeps.tar}"
md5="${awtdeps.md5}" />