You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2009/02/23 16:31:41 UTC
svn commit: r747048 - in /harmony/enhanced/classlib/trunk/make:
build-native.xml depends.properties depends.xml
Author: hindessm
Date: Mon Feb 23 15:31:39 2009
New Revision: 747048
URL: http://svn.apache.org/viewvc?rev=747048&view=rev
Log:
Simplifying the depends little bit.
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=747048&r1=747047&r2=747048&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-native.xml Mon Feb 23 15:31:39 2009
@@ -113,8 +113,7 @@
</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">
<!-- 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" />
Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?rev=747048&r1=747047&r2=747048&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Mon Feb 23 15:31:39 2009
@@ -34,33 +34,32 @@
junit.md5=f852bbb2bbe0471cef8e5b833cb36078
-msvcr.dir.x86=${depends.dir}/libs/windows.x86
-msvcr.dll.x86=${msvcr.dir.x86}/msvcr71.dll
-msvcr.url.x86=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
+msvcr.dir=${depends.dir}/libs/${hy.platform}
+msvcp.dir=${depends.dir}/libs/${hy.platform}
+
+msvcr.dll@x86@=${msvcr.dir}/msvcr71.dll
+msvcr.url@x86@=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
# This is the md5 hash for the VS2003 version, 7.10.3052.4
-msvcr_VS2003.md5.x86=86f1895ae8c5e8b17d99ece768a70732
+msvcr.md5.deprecated@x86@=86f1895ae8c5e8b17d99ece768a70732
# This is the md5 hash for the VS2003 SP1 version, 7.10.6030.0
-msvcr_VS2003SP1.md5.x86=ca2f560921b7b8be1cf555a5a18d54c3
+msvcr.md5@x86@=ca2f560921b7b8be1cf555a5a18d54c3
-msvcp.dir.x86=${depends.dir}/libs/windows.x86
-msvcp.dll.x86=${msvcr.dir.x86}/msvcp71.dll
-msvcp.url.x86=file:///${hyenv.SystemRoot}/system32/msvcp71.dll
+msvcp.dll@x86@=${msvcr.dir}/msvcp71.dll
+msvcp.url@x86@=file:///${hyenv.SystemRoot}/system32/msvcp71.dll
# This is the md5 hash for the VS2003 version, 7.10.3077.0
-msvcp_VS2003.md5.x86=561fa2abb31dfa8fab762145f81667c2
+msvcp.md5.deprecated@x86@=561fa2abb31dfa8fab762145f81667c2
# This is the md5 hash for the VS2003 SP1 version, 7.10.6030.0
-msvcp_VS2003SP1.md5.x86=a94dc60a90efd7a35c36d971e3ee7470
+msvcp.md5@x86@=a94dc60a90efd7a35c36d971e3ee7470
-msvcr.dir.x86_64=${depends.dir}/libs/windows.x86_64
-msvcr.dll.x86_64=${msvcr.dir.x86_64}/msvcr80.dll
-msvcr.url.x86_64=file:///C:/Program%20Files%20(x86)/Microsoft%20Visual%20Studio%208/VC/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll
+msvcr.dll@x86_64@=${msvcr.dir}/msvcr80.dll
+msvcr.url@x86_64@=file:///C:/Program%20Files%20(x86)/Microsoft%20Visual%20Studio%208/VC/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll
# VS2005 version 8.00.50727.42
-msvcr.md5.x86_64=465cebd7da2ceaba5e552fc9118a1415
+msvcr.md5@x86_64@=465cebd7da2ceaba5e552fc9118a1415
-msvcp.dir.x86_64=${depends.dir}/libs/windows.x86_64
-msvcp.dll.x86_64=${msvcp.dir.x86_64}/msvcp80.dll
-msvcp.url.x86_64=file:///C:/Program%20Files%20(x86)/Microsoft%20Visual%20Studio%208/VC/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll
+msvcp.dll@x86_64@=${msvcp.dir}/msvcp80.dll
+msvcp.url@x86_64@=file:///C:/Program%20Files%20(x86)/Microsoft%20Visual%20Studio%208/VC/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll
# VS2005 version 8.00.50727.42
-msvcp.md5.x86_64=5ae0f01f02a03558da0cbd249e4df263
+msvcp.md5@x86_64@=5ae0f01f02a03558da0cbd249e4df263
mx4j.dir=${depends.jars}/mx4j_3.0.2
mx4j.zip=${mx4j.dir}/mx4j.zip
@@ -108,21 +107,19 @@
servlet-api.md5=c27c02fb0a00cc3a7d05ea993a9bf56e
servlet-api.url=${maven2.base}/jetty/servlet-api/2.5-6.0.0/servlet-api-2.5-6.0.0.jar
-awtdeps.base.x86=http://people.apache.org/~geirm/harmony/
-awtdeps.dir.x86=${depends.dir}/libs/windows.x86
-awtdeps.tar.x86=${awtdeps.dir.x86}/swing_awt_deps_winxp_2006-09-28.tgz
-awtdeps.url.x86=${awtdeps.base.x86}swing_awt_deps_winxp_2006-09-28.tgz
-awtdeps.md5.x86=d61a27e4b305d9fcabaaacf34f8f534a
-awtdeps.extract.dir.x86=${depends.dir}/libs/build
-awtdeps.testfile.x86=${awtdeps.extract.dir.x86}/winxp_2006-09-28.txt
-
-awtdeps.base.x86_64=http://people.apache.org/~ayza/harmony/64bit/
-awtdeps.dir.x86_64=${depends.dir}/libs/windows.x86_64
-awtdeps.tar.x86_64=${awtdeps.dir.x86_64}/swing_awt_deps_win64_2007-02-08.tgz
-awtdeps.url.x86_64=${awtdeps.base.x86_64}swing_awt_deps_win64_2007-02-08.tgz
-awtdeps.md5.x86_64=f2bbb1f4f23100393783fd02a77fcc68
-awtdeps.extract.dir.x86_64=${depends.dir}/libs/build
-awtdeps.testfile.x86_64=${awtdeps.extract.dir.x86_64}/win64_2007-02-08.txt
+awtdeps.extract.dir=${depends.dir}/libs/build
+awtdeps.dir=${depends.dir}/libs/${hy.platform}
+awtdeps.base@x86@=http://people.apache.org/~geirm/harmony/
+awtdeps.tar@x86@=${awtdeps.dir}/swing_awt_deps_winxp_2006-09-28.tgz
+awtdeps.url@x86@=${awtdeps.base@x86@}swing_awt_deps_winxp_2006-09-28.tgz
+awtdeps.md5@x86@=d61a27e4b305d9fcabaaacf34f8f534a
+awtdeps.testfile@x86@=${awtdeps.extract.dir}/winxp_2006-09-28.txt
+
+awtdeps.base@x86_64@=http://people.apache.org/~ayza/harmony/64bit/
+awtdeps.tar@x86_64@=${awtdeps.dir}/swing_awt_deps_win64_2007-02-08.tgz
+awtdeps.url@x86_64@=${awtdeps.base@x86_64@}swing_awt_deps_win64_2007-02-08.tgz
+awtdeps.md5@x86_64@=f2bbb1f4f23100393783fd02a77fcc68
+awtdeps.testfile@x86_64@=${awtdeps.extract.dir}/win64_2007-02-08.txt
dejavu-fonts.dir=${depends.dir}/dejavu-fonts
dejavu-fonts.fonts.dir=${depends.dir}/dejavu-fonts/dejavu-ttf-2.18
Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=747048&r1=747047&r2=747048&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Mon Feb 23 15:31:39 2009
@@ -26,7 +26,16 @@
</description>
<import file="${basedir}/make/properties.xml" />
- <property file="make/depends.properties" />
+ <loadproperties srcfile="${basedir}/make/depends.properties">
+ <filterchain>
+ <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
+ <param type="token" name="${hy.arch}" value=""/>
+ <param type="token" name="${hy.os.family}" value=""/>
+ <param type="token" name="${hy.platform}" value=""/>
+ <param type="token" name="${hy.platform.variant}" value=""/>
+ </filterreader>
+ </filterchain>
+ </loadproperties>
<target name="check" description="Check whether dependencies are available"
depends="-check,-check-win,-check-unix,-extract" />
@@ -52,47 +61,7 @@
<target name="-check-win" if="is.windows" depends="-really-check-win" />
- <target name="-select-win-deps-x86" if="is.x86">
- <property name="awtdeps.dir" value="${awtdeps.dir.x86}"/>
- <property name="awtdeps.tar" value="${awtdeps.tar.x86}"/>
- <property name="awtdeps.url" value="${awtdeps.url.x86}"/>
- <property name="awtdeps.md5" value="${awtdeps.md5.x86}"/>
- <property name="awtdeps.extract.dir" value="${awtdeps.extract.dir.x86}"/>
- <property name="awtdeps.testfile" value="${awtdeps.testfile.x86}"/>
-
- <property name="msvcr.dir" value="${msvcr.dir.x86}"/>
- <property name="msvcr.dll" value="${msvcr.dll.x86}"/>
- <property name="msvcr.url" value="${msvcr.url.x86}"/>
- <property name="msvcr.md5" value="${msvcr_VS2003SP1.md5.x86}"/>
- <property name="msvcr.md5.deprecated" value="${msvcr_VS2003.md5.x86}"/>
-
- <property name="msvcp.dir" value="${msvcp.dir.x86}"/>
- <property name="msvcp.dll" value="${msvcp.dll.x86}"/>
- <property name="msvcp.url" value="${msvcp.url.x86}"/>
- <property name="msvcp.md5" value="${msvcp_VS2003SP1.md5.x86}"/>
- <property name="msvcp.md5.deprecated" value="${msvcp_VS2003.md5.x86}"/>
- </target>
-
- <target name="-select-win-deps-x86_64" if="is.x86_64">
- <property name="awtdeps.dir" value="${awtdeps.dir.x86_64}"/>
- <property name="awtdeps.tar" value="${awtdeps.tar.x86_64}"/>
- <property name="awtdeps.url" value="${awtdeps.url.x86_64}"/>
- <property name="awtdeps.md5" value="${awtdeps.md5.x86_64}"/>
- <property name="awtdeps.extract.dir" value="${awtdeps.extract.dir.x86_64}"/>
- <property name="awtdeps.testfile" value="${awtdeps.testfile.x86_64}"/>
-
- <property name="msvcr.dir" value="${msvcr.dir.x86_64}"/>
- <property name="msvcr.dll" value="${msvcr.dll.x86_64}"/>
- <property name="msvcr.url" value="${msvcr.url.x86_64}"/>
- <property name="msvcr.md5" value="${msvcr.md5.x86_64}"/>
-
- <property name="msvcp.dir" value="${msvcp.dir.x86_64}"/>
- <property name="msvcp.dll" value="${msvcp.dll.x86_64}"/>
- <property name="msvcp.url" value="${msvcp.url.x86_64}"/>
- <property name="msvcp.md5" value="${msvcp.md5.x86_64}"/>
- </target>
-
- <target name="-really-check-win" if="is.windows" depends="-select-win-deps-x86_64,-select-win-deps-x86">
+ <target name="-really-check-win" if="is.windows">
<property environment="hyenv" />
<check-one-file src="${msvcr.url}" dest="${msvcr.dll}" />
@@ -258,7 +227,7 @@
md5="${asm.md5}" />
</target>
- <target name="-download-win" if="is.windows" depends="-select-win-deps-x86_64,-select-win-deps-x86">
+ <target name="-download-win" if="is.windows">
<property environment="hyenv" />