After updating to this revision I get:
C:\Harmony\build.xml:282: The following error occurred while executing
this line:
C:\Harmony\make\depends.xml:426: The following error occurred while
executing this line:
C:\Harmony\make\depends.xml:457: ...
File depends/libs/windows.x86/msvcp71.dll has incorrect md5 checksum.
Expected: ${msvcp_VS2003SP1.md5.x86} (or
561fa2abb31dfa8fab762145f81667c2)
Found: a94dc60a90efd7a35c36d971e3ee7470
Total time: 8 seconds
My version of msvcp71.dll is "7.10.6030.0" -- is that what you were
expecting?
Regards,
Tim
[EMAIL PROTECTED] wrote:
> Author: varlax
> Date: Thu Dec 6 22:54:42 2007
> New Revision: 602006
>
> URL: http://svn.apache.org/viewvc?rev=602006&view=rev
> Log:
> Fixed HARMONY-4962 [classlib][build] missing MSVCPxx.DLL dependency
> + dropped unused *.dll.file.* properties
>
> Modified:
> harmony/enhanced/classlib/trunk/make/depends.properties
> harmony/enhanced/classlib/trunk/make/depends.xml
>
> Modified: harmony/enhanced/classlib/trunk/make/depends.properties
> URL:
> http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?rev=602006&r1=602005&r2=602006&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/make/depends.properties (original)
> +++ harmony/enhanced/classlib/trunk/make/depends.properties Thu Dec 6
> 22:54:42 2007
> @@ -41,19 +41,29 @@
>
> 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
> # This is the md5 hash for the VS2003 version, 7.10.3052.4
> msvcr_VS2003.md5.x86=86f1895ae8c5e8b17d99ece768a70732
> # This is the md5 hash for the VS2003 SP1 version, 7.10.6030.0
> msvcr_VS2003SP1.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
> +# This is the md5 hash for the VS2003 version, 7.10.3077.0
> +msvcp_VS2003.md5.x86=561fa2abb31dfa8fab762145f81667c2
> +
> 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.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
> +
> +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
> +# VS2005 version 8.00.50727.42
> +msvcp.md5.x86_64=5ae0f01f02a03558da0cbd249e4df263
>
> mx4j.dir=${depends.jars}/mx4j_3.0.2
> mx4j.zip=${mx4j.dir}/mx4j.zip
>
> Modified: harmony/enhanced/classlib/trunk/make/depends.xml
> URL:
> http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=602006&r1=602005&r2=602006&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/make/depends.xml (original)
> +++ harmony/enhanced/classlib/trunk/make/depends.xml Thu Dec 6 22:54:42 2007
> @@ -63,9 +63,14 @@
> <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_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">
> @@ -80,14 +85,19 @@
> <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}"/>
> +
> + <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">
> <property environment="hyenv" />
>
> <check-one-file src="${msvcr.url}" dest="${msvcr.dll}" />
> + <check-one-file src="${msvcp.url}" dest="${msvcp.dll}" />
> <check-one-file src="${awtdeps.url}" dest="${awtdeps.tar}" />
> <uptodate property="awtdeps.uptodate"
> srcfile="${awtdeps.tar}"
> @@ -408,6 +418,12 @@
> dest="${msvcr.dll}"
> md5="${msvcr.md5}"
> md5-deprecated="${msvcr.md5.deprecated}" />
> +
> + <mkdir dir="${msvcp.dir}" />
> + <download-one-file src="${msvcp.url}"
> + dest="${msvcp.dll}"
> + md5="${msvcp.md5}"
> + md5-deprecated="${msvcp.md5.deprecated}" />
>
> <mkdir dir="${awtdeps.dir}" />
> <download-one-file src="${awtdeps.url}"
>
>
>
