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/29 15:39:20 UTC
svn commit: r1002621 - in /harmony/enhanced/java/branches/java6: ./
classlib/ classlib/depends/libs/ classlib/modules/awt/make/
classlib/modules/jmx/make/ common_resources/make/ drlvm/ drlvm/make/
jdktools/
Author: hindessm
Date: Wed Sep 29 13:39:20 2010
New Revision: 1002621
URL: http://svn.apache.org/viewvc?rev=1002621&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@1002080:
r1002080 | sjanuary | 2010-09-28 10:51:59 +0100 (Tue, 28 Sep 2010) | 1 line
Autoselect sourceforge mirror for fetch-depends
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/modules/awt/make/depends.properties
harmony/enhanced/java/branches/java6/classlib/modules/jmx/make/depends.properties
harmony/enhanced/java/branches/java6/common_resources/make/depends.properties
harmony/enhanced/java/branches/java6/drlvm/ (props changed)
harmony/enhanced/java/branches/java6/drlvm/make/depends.properties
harmony/enhanced/java/branches/java6/jdktools/ (props changed)
Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 13:39:20 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,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751
+/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080
/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 29 13:39:20 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,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751
+/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080
/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 29 13:39:20 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,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
/incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394
Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/make/depends.properties?rev=1002621&r1=1002620&r2=1002621&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/make/depends.properties Wed Sep 29 13:39:20 2010
@@ -13,11 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-sf.base=http://dfn.dl.sourceforge.net/sourceforge
dejavu-fonts.dir=${depends.dir}/dejavu-fonts
dejavu-fonts.fonts.dir=${depends.dir}/dejavu-fonts/dejavu-ttf-2.18
dejavu-fonts.zip=${dejavu-fonts.dir}/dejavu-ttf-2.18-1.zip
-dejavu-fonts.url=${sf.base}/dejavu/dejavu-ttf-2.18-1.zip
+dejavu-fonts.url=http://downloads.sourceforge.net/sourceforge/dejavu/dejavu-ttf-2.18-1.zip?use_mirror=autoselect
dejavu-fonts.md5=72e0a87ec1f9c5c26c66eabcf1e2018e
depends.lib.dir=${depends.dir}/libs/${hy.platform}
Modified: harmony/enhanced/java/branches/java6/classlib/modules/jmx/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/jmx/make/depends.properties?rev=1002621&r1=1002620&r2=1002621&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/jmx/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/jmx/make/depends.properties Wed Sep 29 13:39:20 2010
@@ -14,12 +14,11 @@
# limitations under the License.
depends.jars=${depends.dir}/jars
-sf.base=http://dfn.dl.sourceforge.net/sourceforge
mx4j.version=3.0.2
mx4j.dir=${depends.jars}/mx4j_${mx4j.version}
mx4j.zip=${mx4j.dir}/mx4j.zip
-mx4j.url=${sf.base}/mx4j/mx4j-${mx4j.version}.zip
+mx4j.url=http://downloads.sourceforge.net/sourceforge/mx4j/mx4j-${mx4j.version}.zip?use_mirror=autoselect
mx4j.md5=443bd83ee36414de4b8fc5722b038b02
mx4j.jar=${mx4j.dir}/mx4j.jar
mx4j.remote.jar=${mx4j.dir}/mx4j-remote.jar
Modified: harmony/enhanced/java/branches/java6/common_resources/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/depends.properties?rev=1002621&r1=1002620&r2=1002621&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/depends.properties Wed Sep 29 13:39:20 2010
@@ -37,7 +37,7 @@ ecj.jar.md5=3ad7eff5648879a38729d6790229
cpptasks=${depends.jars}/cpptasks-1.0b4/cpptasks.zip
cpptasks.jar=${depends.jars}/cpptasks-1.0b4/cpptasks.jar
cpptasks.unzip.path=cpptasks-1.0b4/cpptasks.jar
-cpptasks.url=http://dfn.dl.sourceforge.net/sourceforge/ant-contrib/cpptasks-1.0b4.zip
+cpptasks.url=http://downloads.sourceforge.net/sourceforge/ant-contrib/cpptasks-1.0b4.zip?use_mirror=autoselect
cpptasks.md5=118e601b58a48519208efa9893c7c5c0
icuhdr=${depends.oss}/icu4c/icu4c-3.4-harmony-includes.zip
@@ -68,9 +68,6 @@ icudll.md5@freebsd.x86_64.8x@=3d76c796e7
############################## TO SORT OUT ##############################
-
-sf.base=http://dfn.dl.sourceforge.net/sourceforge
-
xalan.dir=${depends.jars}/xalan-j_2.7.0
xalan.jar=${xalan.dir}/xalan.jar
xalan.url=${maven2.base}/xalan/xalan/2.7.0/xalan-2.7.0.jar
@@ -117,7 +114,7 @@ msvcp.md5.x86_64=5ae0f01f02a03558da0cbd2
mx4j.dir=${depends.jars}/mx4j_3.0.2
mx4j.zip=${mx4j.dir}/mx4j.zip
-mx4j.url=${sf.base}/mx4j/mx4j-3.0.2.zip
+mx4j.url=http://downloads.sourceforge.net/sourceforge/mx4j/mx4j-3.0.2.zip?use_mirror=autoselect
mx4j.md5=443bd83ee36414de4b8fc5722b038b02
mx4j.jar=${mx4j.dir}/mx4j.jar
mx4j.remote.jar=${mx4j.dir}/mx4j-remote.jar
@@ -182,7 +179,7 @@ awtdeps.testfile.x86_64=${awtdeps.extrac
dejavu-fonts.dir=${depends.dir}/dejavu-fonts
dejavu-fonts.fonts.dir=${depends.dir}/dejavu-fonts/dejavu-ttf-2.18
dejavu-fonts.zip=${dejavu-fonts.dir}/dejavu-ttf-2.18-1.zip
-dejavu-fonts.url=http://dfn.dl.sourceforge.net/sourceforge/dejavu/dejavu-ttf-2.18-1.zip
+dejavu-fonts.url=http://downloads.sourceforge.net/sourceforge/dejavu/dejavu-ttf-2.18-1.zip?use_mirror=autoselect
dejavu-fonts.md5=72e0a87ec1f9c5c26c66eabcf1e2018e
derby.dir=${depends.jars}/derby-10.3.1.4
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 13:39:20 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,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751
+/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080
/harmony/enhanced/trunk/drlvm:476395-929252
/harmony/enhanced/trunk/working_vm:476396-920147
/incubator/harmony/enhanced/trunk/drlvm:292550-476394
Modified: harmony/enhanced/java/branches/java6/drlvm/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/depends.properties?rev=1002621&r1=1002620&r2=1002621&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/depends.properties Wed Sep 29 13:39:20 2010
@@ -42,5 +42,5 @@ ant-contrib.md5=c5a75fc28cbc52f09bd43b55
jasmin=${depends.jars}/jasmin-1.1/jasmin-1.1.zip
jasmin.jar=${depends.jars}/jasmin-1.1/jasmin.jar
jasmin.unzip.path=jasmin-1.1/jasmin.jar
-jasmin.url=http://dfn.dl.sourceforge.net/sourceforge/jasmin/jasmin-1.1.zip
+jasmin.url=http://downloads.sourceforge.net/sourceforge/jasmin/jasmin-1.1.zip?use_mirror=autoselect
jasmin.md5=bb96616023ab4efdffa173601004fa17
Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 13:39:20 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751
+/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147