You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2009/04/24 03:35:42 UTC

svn commit: r768115 - in /harmony/enhanced: common_resources/trunk/make/ jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/ jdktools/trunk/modules/samsa/src/main/resources/data/

Author: ndbeyer
Date: Fri Apr 24 01:35:41 2009
New Revision: 768115

URL: http://svn.apache.org/viewvc?rev=768115&view=rev
Log:
HARMONY-6170 - Upgrad ECJ to 3.4.2

Modified:
    harmony/enhanced/common_resources/trunk/make/depends.properties
    harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java
    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat
    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat
    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat

Modified: harmony/enhanced/common_resources/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/depends.properties?rev=768115&r1=768114&r2=768115&view=diff
==============================================================================
--- harmony/enhanced/common_resources/trunk/make/depends.properties (original)
+++ harmony/enhanced/common_resources/trunk/make/depends.properties Fri Apr 24 01:35:41 2009
@@ -18,15 +18,15 @@
 
 maven2.base=http://repo1.maven.org/maven2
 depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
-eclipse.base=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500
+eclipse.base=http://download.eclipse.org/eclipse/downloads/drops/R-3.4.2-200902111700
 
 junit.jar=${depends.jars}/junit_4.4/junit.jar
 junit.jar.url=${maven2.base}/junit/junit/4.4/junit-4.4.jar
 junit.jar.md5=f852bbb2bbe0471cef8e5b833cb36078
 
-ecj.jar=${depends.jars}/ecj_3.3/ecj_3.3.jar
-ecj.jar.url=${eclipse.base}/ecj.jar
-ecj.jar.md5=412d8badd227807ef2f52608435240fb
+ecj.jar=${depends.jars}/ecj_3.4.2/ecj-3.4.2.jar
+ecj.jar.url=${eclipse.base}/ecj-3.4.2.jar
+ecj.jar.md5=707420d25d4ced313184f32bc1443bd0
 
 # Cpptasks, version 1.0 beta 3 or above
 # http://sourceforge.net/project/showfiles.php?group_id=36177

Modified: harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java?rev=768115&r1=768114&r2=768115&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java Fri Apr 24 01:35:41 2009
@@ -33,7 +33,7 @@
 class Compiler {
 
     /* FIXME: Hard-coded for now, the name of the ECJ JAR file */
-    static final String ECJ_JAR_FILE = "ecj_3.3.jar"; //$NON-NLS-1$
+    static final String ECJ_JAR_FILE = "ecj-3.4.2.jar"; //$NON-NLS-1$
 
     static final String TOOLS_JAR_FILE = "tools.jar"; //$NON-NLS-1$
 

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat?rev=768115&r1=768114&r2=768115&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat Fri Apr 24 01:35:41 2009
@@ -1,3 +1,3 @@
-JDKToolJar = ecj_3.2.jar
+JDKToolJar = ecj-3.4.2.jar
 JDKToolJar = tools.jar
 

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat?rev=768115&r1=768114&r2=768115&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat Fri Apr 24 01:35:41 2009
@@ -1,3 +1,3 @@
-JDKToolJar = ecj_3.2.jar
+JDKToolJar = ecj-3.4.2.jar
 JDKToolJar = tools.jar
 

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat?rev=768115&r1=768114&r2=768115&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat Fri Apr 24 01:35:41 2009
@@ -1,3 +1,3 @@
-JDKToolJar = ecj_3.2.jar
+JDKToolJar = ecj-3.4.2.jar
 JDKToolJar = tools.jar
 



Re: svn commit: r768115 - in /harmony/enhanced: common_resources/trunk/make/ jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/ jdktools/trunk/modules/samsa/src/main/resources/data/

Posted by Regis <xu...@gmail.com>.
Nathan Beyer wrote:
> FYI - I upgrade the ECJ to the latest stable version, 3.4.2. You'll
> probably need to fetch dependencies again and copy the latest version
> to your Ant lib folder.
> 
> https://issues.apache.org/jira/browse/HARMONY-6170
> 
> -Nathan
> 
> On Thu, Apr 23, 2009 at 8:35 PM,  <nd...@apache.org> wrote:
>> Author: ndbeyer
>> Date: Fri Apr 24 01:35:41 2009
>> New Revision: 768115
>>
>> URL: http://svn.apache.org/viewvc?rev=768115&view=rev
>> Log:
>> HARMONY-6170 - Upgrad ECJ to 3.4.2
>>
>> Modified:
>>    harmony/enhanced/common_resources/trunk/make/depends.properties
>>    harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java
>>    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat
>>    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat
>>    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat
>>
>> Modified: harmony/enhanced/common_resources/trunk/make/depends.properties
>> URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/depends.properties?rev=768115&r1=768114&r2=768115&view=diff
>> ==============================================================================
>> --- harmony/enhanced/common_resources/trunk/make/depends.properties (original)
>> +++ harmony/enhanced/common_resources/trunk/make/depends.properties Fri Apr 24 01:35:41 2009
>> @@ -18,15 +18,15 @@
>>
>>  maven2.base=http://repo1.maven.org/maven2
>>  depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
>> -eclipse.base=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500
>> +eclipse.base=http://download.eclipse.org/eclipse/downloads/drops/R-3.4.2-200902111700
>>
>>  junit.jar=${depends.jars}/junit_4.4/junit.jar
>>  junit.jar.url=${maven2.base}/junit/junit/4.4/junit-4.4.jar
>>  junit.jar.md5=f852bbb2bbe0471cef8e5b833cb36078
>>
>> -ecj.jar=${depends.jars}/ecj_3.3/ecj_3.3.jar
>> -ecj.jar.url=${eclipse.base}/ecj.jar
>> -ecj.jar.md5=412d8badd227807ef2f52608435240fb
>> +ecj.jar=${depends.jars}/ecj_3.4.2/ecj-3.4.2.jar
>> +ecj.jar.url=${eclipse.base}/ecj-3.4.2.jar
>> +ecj.jar.md5=707420d25d4ced313184f32bc1443bd0
>>
>>  # Cpptasks, version 1.0 beta 3 or above
>>  # http://sourceforge.net/project/showfiles.php?group_id=36177
>>
>> Modified: harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java
>> URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java?rev=768115&r1=768114&r2=768115&view=diff
>> ==============================================================================
>> --- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java (original)
>> +++ harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java Fri Apr 24 01:35:41 2009
>> @@ -33,7 +33,7 @@
>>  class Compiler {
>>
>>     /* FIXME: Hard-coded for now, the name of the ECJ JAR file */
>> -    static final String ECJ_JAR_FILE = "ecj_3.3.jar"; //$NON-NLS-1$
>> +    static final String ECJ_JAR_FILE = "ecj-3.4.2.jar"; //$NON-NLS-1$
>>
>>     static final String TOOLS_JAR_FILE = "tools.jar"; //$NON-NLS-1$
>>
>>
>> Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat
>> URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat?rev=768115&r1=768114&r2=768115&view=diff
>> ==============================================================================
>> --- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat (original)
>> +++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat Fri Apr 24 01:35:41 2009
>> @@ -1,3 +1,3 @@
>> -JDKToolJar = ecj_3.2.jar
>> +JDKToolJar = ecj-3.4.2.jar
>>  JDKToolJar = tools.jar
>>
>>
>> Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat
>> URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat?rev=768115&r1=768114&r2=768115&view=diff
>> ==============================================================================
>> --- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat (original)
>> +++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat Fri Apr 24 01:35:41 2009
>> @@ -1,3 +1,3 @@
>> -JDKToolJar = ecj_3.2.jar
>> +JDKToolJar = ecj-3.4.2.jar
>>  JDKToolJar = tools.jar
>>
>>
>> Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat
>> URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat?rev=768115&r1=768114&r2=768115&view=diff
>> ==============================================================================
>> --- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat (original)
>> +++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat Fri Apr 24 01:35:41 2009
>> @@ -1,3 +1,3 @@
>> -JDKToolJar = ecj_3.2.jar
>> +JDKToolJar = ecj-3.4.2.jar
>>  JDKToolJar = tools.jar
>>
>>
>>
>>
> 

Great, Thanks Nathan!

-- 
Best Regards,
Regis.

Re: svn commit: r768115 - in /harmony/enhanced: common_resources/trunk/make/ jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/ jdktools/trunk/modules/samsa/src/main/resources/data/

Posted by Nathan Beyer <nd...@apache.org>.
FYI - I upgrade the ECJ to the latest stable version, 3.4.2. You'll
probably need to fetch dependencies again and copy the latest version
to your Ant lib folder.

https://issues.apache.org/jira/browse/HARMONY-6170

-Nathan

On Thu, Apr 23, 2009 at 8:35 PM,  <nd...@apache.org> wrote:
> Author: ndbeyer
> Date: Fri Apr 24 01:35:41 2009
> New Revision: 768115
>
> URL: http://svn.apache.org/viewvc?rev=768115&view=rev
> Log:
> HARMONY-6170 - Upgrad ECJ to 3.4.2
>
> Modified:
>    harmony/enhanced/common_resources/trunk/make/depends.properties
>    harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java
>    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat
>    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat
>    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat
>
> Modified: harmony/enhanced/common_resources/trunk/make/depends.properties
> URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/depends.properties?rev=768115&r1=768114&r2=768115&view=diff
> ==============================================================================
> --- harmony/enhanced/common_resources/trunk/make/depends.properties (original)
> +++ harmony/enhanced/common_resources/trunk/make/depends.properties Fri Apr 24 01:35:41 2009
> @@ -18,15 +18,15 @@
>
>  maven2.base=http://repo1.maven.org/maven2
>  depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
> -eclipse.base=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500
> +eclipse.base=http://download.eclipse.org/eclipse/downloads/drops/R-3.4.2-200902111700
>
>  junit.jar=${depends.jars}/junit_4.4/junit.jar
>  junit.jar.url=${maven2.base}/junit/junit/4.4/junit-4.4.jar
>  junit.jar.md5=f852bbb2bbe0471cef8e5b833cb36078
>
> -ecj.jar=${depends.jars}/ecj_3.3/ecj_3.3.jar
> -ecj.jar.url=${eclipse.base}/ecj.jar
> -ecj.jar.md5=412d8badd227807ef2f52608435240fb
> +ecj.jar=${depends.jars}/ecj_3.4.2/ecj-3.4.2.jar
> +ecj.jar.url=${eclipse.base}/ecj-3.4.2.jar
> +ecj.jar.md5=707420d25d4ced313184f32bc1443bd0
>
>  # Cpptasks, version 1.0 beta 3 or above
>  # http://sourceforge.net/project/showfiles.php?group_id=36177
>
> Modified: harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java
> URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java?rev=768115&r1=768114&r2=768115&view=diff
> ==============================================================================
> --- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java (original)
> +++ harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java Fri Apr 24 01:35:41 2009
> @@ -33,7 +33,7 @@
>  class Compiler {
>
>     /* FIXME: Hard-coded for now, the name of the ECJ JAR file */
> -    static final String ECJ_JAR_FILE = "ecj_3.3.jar"; //$NON-NLS-1$
> +    static final String ECJ_JAR_FILE = "ecj-3.4.2.jar"; //$NON-NLS-1$
>
>     static final String TOOLS_JAR_FILE = "tools.jar"; //$NON-NLS-1$
>
>
> Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat
> URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat?rev=768115&r1=768114&r2=768115&view=diff
> ==============================================================================
> --- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat (original)
> +++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/jartool.dat Fri Apr 24 01:35:41 2009
> @@ -1,3 +1,3 @@
> -JDKToolJar = ecj_3.2.jar
> +JDKToolJar = ecj-3.4.2.jar
>  JDKToolJar = tools.jar
>
>
> Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat
> URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat?rev=768115&r1=768114&r2=768115&view=diff
> ==============================================================================
> --- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat (original)
> +++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/javac.dat Fri Apr 24 01:35:41 2009
> @@ -1,3 +1,3 @@
> -JDKToolJar = ecj_3.2.jar
> +JDKToolJar = ecj-3.4.2.jar
>  JDKToolJar = tools.jar
>
>
> Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat
> URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat?rev=768115&r1=768114&r2=768115&view=diff
> ==============================================================================
> --- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat (original)
> +++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/resources/data/keysigner.dat Fri Apr 24 01:35:41 2009
> @@ -1,3 +1,3 @@
> -JDKToolJar = ecj_3.2.jar
> +JDKToolJar = ecj-3.4.2.jar
>  JDKToolJar = tools.jar
>
>
>
>