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 2010/09/22 09:56:09 UTC
svn commit: r999790 - in /harmony/enhanced/java/branches/java6: ./ classlib/
classlib/depends/libs/ classlib/make/depends-common.xml
common_resources/make/depends.xml drlvm/ jdktools/
Author: hindessm
Date: Wed Sep 22 07:56:08 2010
New Revision: 999790
URL: http://svn.apache.org/viewvc?rev=999790&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@998759:
r998759 | regisxu | 2010-09-20 02:43:18 +0100 (Mon, 20 Sep 2010) | 1 line
Apply patch for HARMONY-6606: [build] download-one-file macro doesn't delete files that fail the md5 checksum
Modified:
harmony/enhanced/java/branches/java6/ (props changed)
harmony/enhanced/java/branches/java6/classlib/ (props changed)
harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed)
harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml
harmony/enhanced/java/branches/java6/common_resources/make/depends.xml
harmony/enhanced/java/branches/java6/drlvm/ (props changed)
harmony/enhanced/java/branches/java6/jdktools/ (props changed)
Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 07:56:08 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628
+/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759
/harmony/enhanced/trunk:476395-929252
/incubator/harmony/enhanced/trunk:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 07:56:08 2010
@@ -1,7 +1,7 @@
/harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
/harmony/enhanced/classlib/trunk/working_classlib:884014-884286
/harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628
+/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759
/harmony/enhanced/trunk/classlib:476395-929252
/harmony/enhanced/trunk/working_classlib:476396-920147
/incubator/harmony/enhanced/trunk/classlib:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 07:56:08 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
/incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394
Modified: harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml?rev=999790&r1=999789&r2=999790&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml Wed Sep 22 07:56:08 2010
@@ -60,7 +60,7 @@
</or>
</condition>
<antcall target="-remove-file-if-bad">
- <param name="jar" value="@{dest}" />
+ <param name="dest" value="@{dest}" />
</antcall>
<property name="@{dest}.fullpath" location="@{dest}" />
<fail unless="@{dest}.md5.verified">
Modified: harmony/enhanced/java/branches/java6/common_resources/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/depends.xml?rev=999790&r1=999789&r2=999790&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/depends.xml (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/depends.xml Wed Sep 22 07:56:08 2010
@@ -179,7 +179,7 @@
</or>
</condition>
<antcall target="-remove-file-if-bad">
- <param name="jar" value="@{dest}" />
+ <param name="dest" value="@{dest}" />
</antcall>
<property name="@{dest}.fullpath" location="@{dest}" />
<fail unless="@{dest}.md5.verified">
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 07:56:08 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628
+/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759
/harmony/enhanced/trunk/drlvm:476395-929252
/harmony/enhanced/trunk/working_vm:476396-920147
/incubator/harmony/enhanced/trunk/drlvm:292550-476394
Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 07:56:08 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628
+/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147