ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers JavacExternal.java CompilerAdapterFactory.java DefaultCompilerAdapter.java
Date Fri, 03 Aug 2001 14:36:48 GMT
bodewig     01/08/03 07:36:48

  Modified:    .        WHATSNEW
               docs/manual/CoreTasks javac.html
               src/main/org/apache/tools/ant/taskdefs Javac.java
               src/main/org/apache/tools/ant/taskdefs/compilers
                        CompilerAdapterFactory.java
                        DefaultCompilerAdapter.java
  Added:       src/main/org/apache/tools/ant/taskdefs/compilers
                        JavacExternal.java
  Log:
  Add fork attribute to <javac>.
  
  PR: 383
  Submitted by:	Brian Deitte <bdeitte@macromedia.com>
  
  Revision  Changes    Path
  1.138     +2 -1      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.137
  retrieving revision 1.138
  diff -u -r1.137 -r1.138
  --- WHATSNEW	2001/08/03 11:22:21	1.137
  +++ WHATSNEW	2001/08/03 14:36:47	1.138
  @@ -136,7 +136,8 @@
     per <patternset>. 
   
   * Two new supported compilers for javac: kjc for kopi and gcj for the
  -  gcc frontend.
  +  gcc frontend. In addition extJavac or the new fork attribute can be
  +  used to run the JDK's javac in a JVM separate from Ant.
   
   * <fixrlf> can now with CR only line-ends and can use an arbitraty
     between 2 and 80.
  
  
  
  1.8       +11 -1     jakarta-ant/docs/manual/CoreTasks/javac.html
  
  Index: javac.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/javac.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- javac.html	2001/08/01 15:54:24	1.7
  +++ javac.html	2001/08/03 14:36:48	1.8
  @@ -41,13 +41,17 @@
     <li>kjc (the <a href="http://www.dms.at/kopi/" target="_top">kopi</a>
       compiler)</li>
     <li>gcj (the gcj compiler from gcc)</li>
  +  <li>extJavac (run either modern or classic in a JVM of its own)</li>
   </ul>
  -<p>For JDK 1.1/1.2, classic is the default. For JDK 1.3, modern is the default.
  +<p>For JDK 1.1/1.2, classic is the default. For JDK 1.3/1.4, modern is the default.
   If you wish to use a different compiler interface than one of the four
   supplied, write a class that implements the CompilerAdapter interface
   (package org.apache.tools.ant.taskdefs.compilers). Supply the full
   classname in the &quot;build.compiler&quot; property.
   </p>
  +<p>The fork attribute overrides the build.compiler setting and expects
  +a JDK1.1 or higher to be set in java.home.
  +</p>
   <p>This task will drop all entries that point to non-existant
   files/directories from the CLASSPATH it passes to the compiler.</p>
   <h3>Parameters</h3>
  @@ -176,6 +180,12 @@
         libraries from the executing VM; defaults to <code>no</code>.</td>
       <td align="center" valign="top">No</td>
     </tr>
  +  <tr>
  +    <td valign="top">fork</td> 
  +    <td valign="top">whether to execute Javac using the JDK compiler externally;
  +    defaults to <code>no</code>.</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>  
     <tr>
       <td valign="top">failonerror</td> <td valign="top">
           indicates whether the build will continue even if there are compilation errors;
defaults to <code>true</code>.
  
  
  
  1.66      +19 -1     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- Javac.java	2001/06/08 19:39:47	1.65
  +++ Javac.java	2001/08/03 14:36:48	1.66
  @@ -114,6 +114,7 @@
       private Path extdirs;
       private boolean includeAntRuntime = true;
       private boolean includeJavaRuntime = false;
  +    private boolean fork = false;
   
       protected boolean failOnError = true;
       protected File[] compileList = new File[0];
  @@ -401,6 +402,15 @@
       }
   
       /**
  +     * Sets whether to fork the javac compiler.
  +     */    
  +    public void setFork(boolean fork) 
  +    {
  +	this.fork = fork;
  +    }
  +	
  +
  +    /**
        * Executes the task.
        */
       public void execute() throws BuildException {
  @@ -437,7 +447,15 @@
           // compile the source files
   
           String compiler = project.getProperty("build.compiler");
  -        if (compiler == null) {
  +	
  +	if (fork) {
  +	    if (compiler != null) {
  +		log("Since fork is true, ignoring build.compiler setting.", Project.MSG_WARN);
  +	    }	    
  +	    compiler = "extJavac";
  +	} 
  +
  +	if (compiler == null) {
               if (Project.getJavaVersion() != Project.JAVA_1_1 &&
                   Project.getJavaVersion() != Project.JAVA_1_2) {
                   compiler = "modern";
  
  
  
  1.3       +3 -0      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java
  
  Index: CompilerAdapterFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CompilerAdapterFactory.java	2001/08/01 15:54:24	1.2
  +++ CompilerAdapterFactory.java	2001/08/03 14:36:48	1.3
  @@ -100,6 +100,9 @@
               if ( compilerType.equalsIgnoreCase("jikes") ) {
                   return new Jikes();
               }
  +            if ( compilerType.equalsIgnoreCase("extJavac") ) {
  +                return new JavacExternal();
  +            }	    
               if ( compilerType.equalsIgnoreCase("classic") ||
                       compilerType.equalsIgnoreCase("javac1.1") ||
                       compilerType.equalsIgnoreCase("javac1.2")) {
  
  
  
  1.6       +11 -3     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  
  Index: DefaultCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultCompilerAdapter.java	2001/07/18 09:53:40	1.5
  +++ DefaultCompilerAdapter.java	2001/08/03 14:36:48	1.6
  @@ -201,10 +201,9 @@
   
       /**
        * Does the command line argument processing common to classic and
  -     * modern.  
  +     * modern.  Doesn't add the files to compile.
        */
  -    protected Commandline setupJavacCommand() {
  -        Commandline cmd = new Commandline();
  +    protected Commandline setupJavacCommandlineSwitches(Commandline cmd) {
           Path classpath = getCompileClasspath();
   
           if (deprecation == true) {
  @@ -280,7 +279,16 @@
           if (verbose) {
               cmd.createArgument().setValue("-verbose");
           }
  +        return cmd;
  +    }
   
  +    /**
  +     * Does the command line argument processing common to classic and
  +     * modern and adds the files to compile as well.
  +     */
  +    protected Commandline setupJavacCommand() {
  +        Commandline cmd = new Commandline();
  +        setupJavacCommandlineSwitches(cmd);
           logAndAddFilesToCompile(cmd);
           return cmd;
       }
  
  
  
  1.1                  jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
  
  Index: JavacExternal.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Ant", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.tools.ant.taskdefs.compilers;
  
  import org.apache.tools.ant.BuildException;
  import org.apache.tools.ant.Project;
  import org.apache.tools.ant.types.*;
  
  /**
   * Performs a compile using javac externally.
   *
   * @author Brian Deitte
   */
  public class JavacExternal extends DefaultCompilerAdapter {
  
      /**
       * Performs a compile using the Javac externally.
       */
      public boolean execute() throws BuildException {
          attributes.log("Using external javac compiler", Project.MSG_VERBOSE);
  
          Commandline cmd = new Commandline();
          setupJavacCommandlineSwitches(cmd);
          int firstFileName = cmd.size();
          logAndAddFilesToCompile(cmd);
  
          return executeExternalCompile(cmd.getCommandline(), firstFileName) == 0;
      }
  }
  
  
  
  

Mime
View raw message