Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 73854 invoked from network); 4 May 2007 21:54:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 May 2007 21:54:35 -0000 Received: (qmail 70172 invoked by uid 500); 4 May 2007 21:54:42 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 70069 invoked by uid 500); 4 May 2007 21:54:41 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 70060 invoked by uid 99); 4 May 2007 21:54:41 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2007 14:54:41 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2007 14:54:33 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 7B7AB1A9838; Fri, 4 May 2007 14:54:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r535389 - in /harmony/enhanced: classlib/trunk/make/depends.properties classlib/trunk/make/depends.xml jdktools/trunk/make/depends.properties jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Compiler.java Date: Fri, 04 May 2007 21:54:12 -0000 To: commits@harmony.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070504215413.7B7AB1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tellison Date: Fri May 4 14:54:11 2007 New Revision: 535389 URL: http://svn.apache.org/viewvc?view=rev&rev=535389 Log: Classlib no longer depends upon ecj. Update ecj version for jdktools Modified: harmony/enhanced/classlib/trunk/make/depends.properties harmony/enhanced/classlib/trunk/make/depends.xml harmony/enhanced/jdktools/trunk/make/depends.properties harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Compiler.java Modified: harmony/enhanced/classlib/trunk/make/depends.properties URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?view=diff&rev=535389&r1=535388&r2=535389 ============================================================================== --- harmony/enhanced/classlib/trunk/make/depends.properties (original) +++ harmony/enhanced/classlib/trunk/make/depends.properties Fri May 4 14:54:11 2007 @@ -56,11 +56,6 @@ icu4j.url=${mirror.base}/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar icu4j.md5=92422a9465ccc608bc7a8ae9cf594509 -ecj.dir=${depends.jars}/ecj_3.2 -ecj.jar=${ecj.dir}/ecj_3.2.jar -ecj.url=http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/ecj.jar -ecj.md5=633e14a4dc14ca578b5548c3c088172f - mx4j.dir=${depends.jars}/mx4j_3.0.2 mx4j.zip=${mx4j.dir}/mx4j.zip mx4j.url=${sf.base}/mx4j/mx4j-3.0.2.zip Modified: harmony/enhanced/classlib/trunk/make/depends.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?view=diff&rev=535389&r1=535388&r2=535389 ============================================================================== --- harmony/enhanced/classlib/trunk/make/depends.xml (original) +++ harmony/enhanced/classlib/trunk/make/depends.xml Fri May 4 14:54:11 2007 @@ -43,7 +43,6 @@

@@ -328,11 +327,7 @@ - - - - +

Modified: harmony/enhanced/jdktools/trunk/make/depends.properties URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/depends.properties?view=diff&rev=535389&r1=535388&r2=535389 ============================================================================== --- harmony/enhanced/jdktools/trunk/make/depends.properties (original) +++ harmony/enhanced/jdktools/trunk/make/depends.properties Fri May 4 14:54:11 2007 @@ -17,10 +17,10 @@ depends.jars=${depends.dir}/jars mirror.base=http://mirrors.ibiblio.org/pub/mirrors/maven2 -ecj.dir=${depends.jars}/ecj_3.2 -ecj.jar=${ecj.dir}/ecj_3.2.jar -ecj.url=http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/ecj.jar -ecj.md5=633e14a4dc14ca578b5548c3c088172f +ecj.dir=${depends.jars}/ecj_3.3M7 +ecj.jar=${ecj.dir}/ecj_3.3M7.jar +ecj.url=http://download.eclipse.org/eclipse/downloads/drops/S-3.3M7-200705031400/ecj.jar +ecj.md5=23d38c997a6a0d47586965f7505bed67 junit.dir=${depends.jars}/junit_3.8.2 junit.jar=${junit.dir}/junit.jar Modified: harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Compiler.java URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Compiler.java?view=diff&rev=535389&r1=535388&r2=535389 ============================================================================== --- harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Compiler.java (original) +++ harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Compiler.java Fri May 4 14:54:11 2007 @@ -1,233 +1,233 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.harmony.tools.javac; - -import java.io.File; -import java.io.PrintWriter; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; -import org.apache.harmony.tools.toolutils.Util; - -/** - * A proxy to the Java source code compiler itself. - */ -class Compiler { - - /* FIXME: Hard-coded for now, the name of the ECJ JAR file */ - static final String ECJ_JAR_FILE = "ecj_3.2.jar"; //$NON-NLS-1$ - - static final String TOOLS_JAR_FILE = "tools.jar"; //$NON-NLS-1$ - - /* The name of the ECJ compiler class */ - static final String MAIN_CLASS_NAME = "org.eclipse.jdt.internal.compiler.batch.Main"; //$NON-NLS-1$ - - /* - * Invokes the compiler with the given command-line arguments. The supported - * arguments can be determined form the usage message. - * - * Answers the result of the compilation from ECJ; i.e. true if the compile - * succeeded, and false otherwise. - */ - public static boolean main(String[] args) { - return main(args, Util.getDefaultWriter(System.out), Util.getDefaultWriter(System.err)); - } - - public static boolean main(String[] args, PrintWriter out, PrintWriter err) { - Compiler myself = new Compiler(out, err); - - // If there is a problem invoking the method, simply dump the trace for - // now - try { - Object result = myself.staticCompileMth.invoke(myself.mainInst, - new Object[] { args }); - return (Boolean) result; - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - return false; - } - - // Reference to ECJ 'Main' compiler class. - Class ecjCompilerClass; - - // An instance of the ECJ compiler - Object mainInst; - - // The Main#printUsage() method. - Method printUsageMth; - - // The static Main#compile(string[]) method on the ECJ compiler - Method staticCompileMth; - - /** - * Default constructor. Returns a new initialized instance of the Java - * compiler. - */ - public Compiler(PrintWriter out, PrintWriter err) { - super(); - initialize(out, err); - } - - /* - * Initialize our local variables. Called during type construction. - */ - protected void initialize(PrintWriter out, PrintWriter err) { - try { - initializeMainClass(); - initializeInstance(out, err); - initializeMethods(); - } catch (Exception e) { - // If there is a problem we log it to the console - e.printStackTrace(); - } - } - - /* - * Defines the local instance of the ECJ compiler - */ - protected void initializeInstance(PrintWriter out, PrintWriter err) throws SecurityException, - NoSuchMethodException, IllegalArgumentException, - InstantiationException, IllegalAccessException, - InvocationTargetException { - - // Create a new instance of the compiler - Constructor ctor = ecjCompilerClass.getConstructor(new Class[] { - PrintWriter.class, PrintWriter.class, Boolean.TYPE }); - - mainInst = ctor.newInstance(new Object[] { out, err, - Boolean.FALSE }); - } - - /* - * Defines the compiler class from the ECJ jar file - */ - protected void initializeMainClass() throws ClassNotFoundException, - SecurityException, NoSuchMethodException, MalformedURLException, - IllegalArgumentException, InstantiationException, - IllegalAccessException, InvocationTargetException { - - // Find the ECJ JAR file, prefer those found near loaders - URL ecjURL = searchLoaders(); - if (ecjURL == null) { - ecjURL = searchPaths(); - } - if (ecjURL == null) { - throw new RuntimeException("Cannot find file " + ECJ_JAR_FILE); - } - - // Load the ECJ main class - URLClassLoader loader = new URLClassLoader(new URL[] { ecjURL }); - ecjCompilerClass = loader.loadClass(MAIN_CLASS_NAME); - } - - /* - * Looks for the ECJ JAR file in the current working directory, and in the - * jdk/lib of the current runtime. Answers with a URL of the JAR file if - * found, or null if not found. - */ - private URL searchPaths() throws MalformedURLException { - // Search in current working directory - File cwdFile = new File(ECJ_JAR_FILE); - if (cwdFile.exists()) { - return cwdFile.toURL(); - } - - // Look for it via the java.home - File javaHomeFile = new File(System.getProperty("java.home")); //$NON-NLS-1$ - String pathFromJDK = "lib" + File.separator + ECJ_JAR_FILE; //$NON-NLS-1$ - - // Is java.home pointing at a JDK? - File jdkBasedFile = new File(javaHomeFile, pathFromJDK); - if (jdkBasedFile.exists()) { - return jdkBasedFile.toURL(); - } - // Maybe it is pointing at a JRE. - File jdkHomeFile = javaHomeFile.getParentFile(); - if (jdkHomeFile == null) { - return null; - } - File jreBasedFile = new File(jdkHomeFile, pathFromJDK); - if (jreBasedFile.exists()) { - return jreBasedFile.toURL(); - } - - // We didn't find it - return null; - } - - /* - * Find the ECJ jar by searching for the tools.jar location and figuring - * that it is alongside that. - */ - private URL searchLoaders() throws MalformedURLException { - URLClassLoader bogusLoader = new URLClassLoader(new URL[] {}); - ClassLoader parentLoader = bogusLoader.getParent(); - while (parentLoader instanceof URLClassLoader) { - URLClassLoader parentURLLoader = (URLClassLoader) parentLoader; - URL[] uls = parentURLLoader.getURLs(); - for (int i = 0; i < uls.length; i++) { - URL l = uls[i]; - String filename = new File(l.getFile()).getName(); - if (filename.equals(TOOLS_JAR_FILE)) { - return new URL(l, ECJ_JAR_FILE); - } - } - // Not found here, move up a level - parentLoader = parentLoader.getParent(); - } - // We didn't find it - return null; - } - - /* - * Initialize our local references to compiler methods we may wish to - * invoke. - */ - protected void initializeMethods() throws SecurityException, - NoSuchMethodException { - staticCompileMth = ecjCompilerClass.getMethod("compile", //$NON-NLS-1$ - new Class[] { String[].class }); - printUsageMth = ecjCompilerClass - .getMethod("printUsage", (Class[]) null); //$NON-NLS-1$ - } - - /** - * Prints the compiler usage message out on the console. - */ - public void printUsage() { - // If there is a problem invoking the method, simply dump the trace for - // now - try { - printUsageMth.invoke(mainInst); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.harmony.tools.javac; + +import java.io.File; +import java.io.PrintWriter; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import org.apache.harmony.tools.toolutils.Util; + +/** + * A proxy to the Java source code compiler itself. + */ +class Compiler { + + /* FIXME: Hard-coded for now, the name of the ECJ JAR file */ + static final String ECJ_JAR_FILE = "ecj_3.3M7.jar"; //$NON-NLS-1$ + + static final String TOOLS_JAR_FILE = "tools.jar"; //$NON-NLS-1$ + + /* The name of the ECJ compiler class */ + static final String MAIN_CLASS_NAME = "org.eclipse.jdt.internal.compiler.batch.Main"; //$NON-NLS-1$ + + /* + * Invokes the compiler with the given command-line arguments. The supported + * arguments can be determined form the usage message. + * + * Answers the result of the compilation from ECJ; i.e. true if the compile + * succeeded, and false otherwise. + */ + public static boolean main(String[] args) { + return main(args, Util.getDefaultWriter(System.out), Util.getDefaultWriter(System.err)); + } + + public static boolean main(String[] args, PrintWriter out, PrintWriter err) { + Compiler myself = new Compiler(out, err); + + // If there is a problem invoking the method, simply dump the trace for + // now + try { + Object result = myself.staticCompileMth.invoke(myself.mainInst, + new Object[] { args }); + return (Boolean) result; + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } + return false; + } + + // Reference to ECJ 'Main' compiler class. + Class ecjCompilerClass; + + // An instance of the ECJ compiler + Object mainInst; + + // The Main#printUsage() method. + Method printUsageMth; + + // The static Main#compile(string[]) method on the ECJ compiler + Method staticCompileMth; + + /** + * Default constructor. Returns a new initialized instance of the Java + * compiler. + */ + public Compiler(PrintWriter out, PrintWriter err) { + super(); + initialize(out, err); + } + + /* + * Initialize our local variables. Called during type construction. + */ + protected void initialize(PrintWriter out, PrintWriter err) { + try { + initializeMainClass(); + initializeInstance(out, err); + initializeMethods(); + } catch (Exception e) { + // If there is a problem we log it to the console + e.printStackTrace(); + } + } + + /* + * Defines the local instance of the ECJ compiler + */ + protected void initializeInstance(PrintWriter out, PrintWriter err) throws SecurityException, + NoSuchMethodException, IllegalArgumentException, + InstantiationException, IllegalAccessException, + InvocationTargetException { + + // Create a new instance of the compiler + Constructor ctor = ecjCompilerClass.getConstructor(new Class[] { + PrintWriter.class, PrintWriter.class, Boolean.TYPE }); + + mainInst = ctor.newInstance(new Object[] { out, err, + Boolean.FALSE }); + } + + /* + * Defines the compiler class from the ECJ jar file + */ + protected void initializeMainClass() throws ClassNotFoundException, + SecurityException, NoSuchMethodException, MalformedURLException, + IllegalArgumentException, InstantiationException, + IllegalAccessException, InvocationTargetException { + + // Find the ECJ JAR file, prefer those found near loaders + URL ecjURL = searchLoaders(); + if (ecjURL == null) { + ecjURL = searchPaths(); + } + if (ecjURL == null) { + throw new RuntimeException("Cannot find file " + ECJ_JAR_FILE); + } + + // Load the ECJ main class + URLClassLoader loader = new URLClassLoader(new URL[] { ecjURL }); + ecjCompilerClass = loader.loadClass(MAIN_CLASS_NAME); + } + + /* + * Looks for the ECJ JAR file in the current working directory, and in the + * jdk/lib of the current runtime. Answers with a URL of the JAR file if + * found, or null if not found. + */ + private URL searchPaths() throws MalformedURLException { + // Search in current working directory + File cwdFile = new File(ECJ_JAR_FILE); + if (cwdFile.exists()) { + return cwdFile.toURL(); + } + + // Look for it via the java.home + File javaHomeFile = new File(System.getProperty("java.home")); //$NON-NLS-1$ + String pathFromJDK = "lib" + File.separator + ECJ_JAR_FILE; //$NON-NLS-1$ + + // Is java.home pointing at a JDK? + File jdkBasedFile = new File(javaHomeFile, pathFromJDK); + if (jdkBasedFile.exists()) { + return jdkBasedFile.toURL(); + } + // Maybe it is pointing at a JRE. + File jdkHomeFile = javaHomeFile.getParentFile(); + if (jdkHomeFile == null) { + return null; + } + File jreBasedFile = new File(jdkHomeFile, pathFromJDK); + if (jreBasedFile.exists()) { + return jreBasedFile.toURL(); + } + + // We didn't find it + return null; + } + + /* + * Find the ECJ jar by searching for the tools.jar location and figuring + * that it is alongside that. + */ + private URL searchLoaders() throws MalformedURLException { + URLClassLoader bogusLoader = new URLClassLoader(new URL[] {}); + ClassLoader parentLoader = bogusLoader.getParent(); + while (parentLoader instanceof URLClassLoader) { + URLClassLoader parentURLLoader = (URLClassLoader) parentLoader; + URL[] uls = parentURLLoader.getURLs(); + for (int i = 0; i < uls.length; i++) { + URL l = uls[i]; + String filename = new File(l.getFile()).getName(); + if (filename.equals(TOOLS_JAR_FILE)) { + return new URL(l, ECJ_JAR_FILE); + } + } + // Not found here, move up a level + parentLoader = parentLoader.getParent(); + } + // We didn't find it + return null; + } + + /* + * Initialize our local references to compiler methods we may wish to + * invoke. + */ + protected void initializeMethods() throws SecurityException, + NoSuchMethodException { + staticCompileMth = ecjCompilerClass.getMethod("compile", //$NON-NLS-1$ + new Class[] { String[].class }); + printUsageMth = ecjCompilerClass + .getMethod("printUsage", (Class[]) null); //$NON-NLS-1$ + } + + /** + * Prints the compiler usage message out on the console. + */ + public void printUsage() { + // If there is a problem invoking the method, simply dump the trace for + // now + try { + printUsageMth.invoke(mainInst); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } + } +}