harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r1049980 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ common_resources/make/properties.xml drlvm/ jdktools/
Date Thu, 16 Dec 2010 14:04:45 GMT
Author: tellison
Date: Thu Dec 16 14:04:45 2010
New Revision: 1049980

URL: http://svn.apache.org/viewvc?rev=1049980&view=rev
Log:
Merge change from harmony/enhanced/java/trunk@1049534

  r1045165 | tellison | 2010-12-13 15:16:27 +0000 (Mon, 13 Dec 2010) | 1 line

  Fix help text.  Dependencies now downloaded straight to target.

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/common_resources/make/properties.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 Thu Dec 16 14:04:45 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349,1043536,1043880
+/harmony/enhanced/java/trunk:929253-1049534
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 16 14:04:45 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-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349,1043536,1043880
+/harmony/enhanced/java/trunk/classlib:929253-1049534
 /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 Thu Dec 16 14:04:45 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349,1043536,1043880
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-1049534
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/common_resources/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/properties.xml?rev=1049980&r1=1049979&r2=1049980&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/properties.xml (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/properties.xml Thu Dec 16 14:04:45
2010
@@ -484,7 +484,7 @@ HY_LINKLIB_SUFFIX=${linklib.suffix}
                     </and>
                 </condition>
 The Eclipse compiler class for Ant could not be found. Please place the ECJ JAR in ANT_HOME/lib.
-The JAR can be downloaded directly from eclipse.org or copied from common_resources/depends/jars/ecj_3.x
folder after the fetch-depends target for jdktools has been run.
+The JAR can be downloaded directly from eclipse.org or copied from target/depends/jars/ecj_3.x
folder after the fetch-depends target for jdktools has been run.
 Alternatively, you can switch to another compiler, e.g. specify '-Dhy.javac.compiler=modern'
for classic javac.                
             </fail>
         </sequential>

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 16 14:04:45 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349,1043536,1043880
+/harmony/enhanced/java/trunk/drlvm:929253-1049534
 /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 Thu Dec 16 14:04:45 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349,1043536,1043880
+/harmony/enhanced/java/trunk/jdktools:929253-1049534
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message