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 2007/03/29 09:44:48 UTC
svn commit: r523604 - in /harmony/enhanced/common_resources/build:
depends.properties depends.xml
Author: apetrenko
Date: Thu Mar 29 00:44:47 2007
New Revision: 523604
URL: http://svn.apache.org/viewvc?view=rev&rev=523604
Log:
Patch for HARMONY-3502 "[build][winx64][common_resources] build of common_resources should support win on x86_64"
Modified:
harmony/enhanced/common_resources/build/depends.properties
harmony/enhanced/common_resources/build/depends.xml
Modified: harmony/enhanced/common_resources/build/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/build/depends.properties?view=diff&rev=523604&r1=523603&r2=523604
==============================================================================
--- harmony/enhanced/common_resources/build/depends.properties (original)
+++ harmony/enhanced/common_resources/build/depends.properties Thu Mar 29 00:44:47 2007
@@ -47,10 +47,17 @@
bcprov.md5=dac389845d499bfa901f30bbe63250d1
bcprov.url=http://www.bouncycastle.org/download/bcprov-jdk14-134.jar
-msvcr71.dir=${depends.dir}/libs/windows.x86
-msvcr71.dll=${msvcr71.dir}/msvcr71.dll
-msvcr71.url=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
-msvcr71.md5=86f1895ae8c5e8b17d99ece768a70732
+msvcr.dir.x86=${depends.dir}/libs/windows.x86
+msvcr.dll.x86=${msvcr.dir.x86}/msvcr71.dll
+msvcr.dll.file.x86=msvcr71.dll
+msvcr.url.x86=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
+msvcr.md5.x86=86f1895ae8c5e8b17d99ece768a70732
+
+msvcr.dir.x86_64=${depends.dir}/libs/windows.x86_64
+msvcr.dll.x86_64=${msvcr.dir.x86_64}/msvcr80.dll
+msvcr.dll.file.x86_64=msvcr80.dll
+msvcr.url.x86_64=file:///${hyenv.SystemRoot}/system32/msvcr80.dll
+msvcr.md5.x86_64=465cebd7da2ceaba5e552fc9118a1415
icu4j.dir=${depends.jars}/icu4j_3.4.4
icu4j.jar=${icu4j.dir}/icu4j_3_4_4.jar
@@ -100,13 +107,21 @@
servlet-api.md5=c27c02fb0a00cc3a7d05ea993a9bf56e
servlet-api.url=${ibiblio.base}/maven2/jetty/servlet-api/2.5-6.0.0/servlet-api-2.5-6.0.0.jar
-people.apache.base=http://people.apache.org/~geirm/harmony/
-awtdeps.dir=${depends.dir}/libs/windows.x86
-awtdeps.tar=${awtdeps.dir}/swing_awt_deps_winxp_2006-09-28.tgz
-awtdeps.url=${people.apache.base}swing_awt_deps_winxp_2006-09-28.tgz
-awtdeps.md5=d61a27e4b305d9fcabaaacf34f8f534a
-awtdeps.extract.dir=${depends.dir}/libs/build
-awtdeps.testfile=${awtdeps.extract.dir}/winxp_2006-09-28.txt
+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
cpptasks.dir=${depends.jars}/cpptasks-1.0b4
cpptasks.jarname=cpptasks.jar
Modified: harmony/enhanced/common_resources/build/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/build/depends.xml?view=diff&rev=523604&r1=523603&r2=523604
==============================================================================
--- harmony/enhanced/common_resources/build/depends.xml (original)
+++ harmony/enhanced/common_resources/build/depends.xml Thu Mar 29 00:44:47 2007
@@ -51,11 +51,43 @@
<check-one-file src="${cpptasks.url}" dest="${cpptasks.jar}" />
</target>
+ <target name="-select-win-deps-x86" if="is.x86">
+ <property name="people.apache.base" value="${people.apache.base.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.dll.file" value="${msvcr.dll.file.x86}"/>
+ <property name="msvcr.md5" value="${msvcr.md5.x86}"/>
+ </target>
+
+ <target name="-select-win-deps-x86_64" if="is.x86_64">
+ <property name="people.apache.base" value="${people.apache.base.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.dll.file" value="${msvcr.dll.file.x86_64}"/>
+ <property name="msvcr.md5" value="${msvcr.md5.x86_64}"/>
+ </target>
+
<target name="-check-win" if="is.windows" depends="-really-check-win" />
<target name="-really-check-win" if="is.windows">
<property environment="hyenv" />
- <check-one-file src="${msvcr71.url}" dest="${msvcr71.dll}" />
+ <check-one-file src="${msvcr.url}" dest="${msvcr.dll}" />
<check-one-file src="${awtdeps.url}" dest="${awtdeps.tar}" />
<uptodate property="awtdeps.uptodate"
srcfile="${awtdeps.tar}"
@@ -281,13 +313,13 @@
</target>
- <target name="-download-win" if="is.windows">
+ <target name="-download-win" if="is.windows" depends="-select-win-deps-x86,-select-win-deps-x86_64">
<property environment="hyenv" />
- <mkdir dir="${msvcr71.dir}" />
- <download-one-file src="${msvcr71.url}" dest="${msvcr71.dll}"
- md5="${msvcr71.md5}" />
+ <mkdir dir="${msvcr.dir}" />
+ <download-one-file src="${msvcr.url}" dest="${msvcr.dll}"
+ md5="${msvcr.md5}" />
<mkdir dir="${awtdeps.dir}" />
<download-one-file src="${awtdeps.url}" dest="${awtdeps.tar}"