ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
Date Tue, 11 Jan 2005 13:57:22 GMT
bodewig     2005/01/11 05:57:22

  Modified:    .        Tag: ANT_16_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/taskdefs/compilers Tag:
                        ANT_16_BRANCH Jikes.java
  Log:
  jikes supports -bootclasspath
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.503.2.156 +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.155
  retrieving revision 1.503.2.156
  diff -u -r1.503.2.155 -r1.503.2.156
  --- WHATSNEW	10 Jan 2005 17:12:28 -0000	1.503.2.155
  +++ WHATSNEW	11 Jan 2005 13:57:19 -0000	1.503.2.156
  @@ -40,6 +40,9 @@
   
   * added a new mapper <filtermapper>
   
  +* The jikes compiler adapter now supports -bootclasspath.  Bugzilla
  +  Report 32609.
  +
   Fixed bugs:
   -----------
   
  
  
  
  No                   revision
  No                   revision
  1.22.2.7  +8 -9      ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
  
  Index: Jikes.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
  retrieving revision 1.22.2.6
  retrieving revision 1.22.2.7
  diff -u -r1.22.2.6 -r1.22.2.7
  --- Jikes.java	8 Dec 2004 07:58:41 -0000	1.22.2.6
  +++ Jikes.java	11 Jan 2005 13:57:21 -0000	1.22.2.7
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2001-2004 The Apache Software Foundation
  + * Copyright  2001-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -35,23 +35,17 @@
        * Performs a compile using the Jikes compiler from IBM.
        * Mostly of this code is identical to doClassicCompile()
        * However, it does not support all options like
  -     * bootclasspath, extdirs, deprecation and so on, because
  +     * extdirs, deprecation and so on, because
        * there is no option in jikes and I don't understand
        * what they should do.
        *
  -     * It has been successfully tested with jikes >1.10
  +     * It has been successfully tested with jikes &gt;1.10
        */
       public boolean execute() throws BuildException {
           attributes.log("Using jikes compiler", Project.MSG_VERBOSE);
   
           Path classpath = new Path(project);
   
  -        // Jikes doesn't support bootclasspath dir (-bootclasspath)
  -        // so we'll emulate it for compatibility and convenience.
  -        if (bootclasspath != null) {
  -            classpath.append(bootclasspath);
  -        }
  -
           // Jikes doesn't support an extension dir (-extdir)
           // so we'll emulate it for compatibility and convenience.
           classpath.addExtdirs(extdirs);
  @@ -202,6 +196,11 @@
   
           int firstFileName = cmd.size();
           logAndAddFilesToCompile(cmd);
  +
  +        if (bootclasspath != null) {
  +            cmd.createArgument().setValue("-bootclasspath");
  +            cmd.createArgument().setPath(bootclasspath);
  +        }
   
           return
               executeExternalCompile(cmd.getCommandline(), firstFileName) == 0;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message