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 Gcj.java
Date Wed, 27 Apr 2005 09:44:17 GMT
bodewig     2005/04/27 02:44:17

  Modified:    .        WHATSNEW
               src/main/org/apache/tools/ant/taskdefs/compilers Gcj.java
  Log:
  Don't override includeJavaRuntime in gcj-adapter, PR 34638
  
  Revision  Changes    Path
  1.813     +6 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.812
  retrieving revision 1.813
  diff -u -r1.812 -r1.813
  --- WHATSNEW	25 Apr 2005 10:15:10 -0000	1.812
  +++ WHATSNEW	27 Apr 2005 09:44:16 -0000	1.813
  @@ -214,6 +214,12 @@
     This means, the jikes compiler adapter now requires Jikes 1.15 or later.
     Bugzilla Reports 25868, 26404 and 32609.
   
  +* The gcj compiler adapter used to include the Java runtime classes
  +  even if includeJavaRuntime was set to false, unless the
  +  bootclasspath has been specified as well.  It will now always adhere
  +  to includeJavaRuntime, you may need to set it to true explicitly now
  +  if you relied on the old behavior.
  +
   Other changes:
   --------------
   
  
  
  
  1.23      +1 -5      ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
  
  Index: Gcj.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Gcj.java	21 Dec 2004 15:49:39 -0000	1.22
  +++ Gcj.java	27 Apr 2005 09:44:17 -0000	1.23
  @@ -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.
  @@ -61,10 +61,6 @@
           // so we'll emulate it for compatibility and convenience.
           classpath.addExtdirs(extdirs);
   
  -        if (bootclasspath == null || bootclasspath.size() == 0) {
  -            // no bootclasspath, therefore, get one from the java runtime
  -            includeJavaRuntime = true;
  -        }
           classpath.append(getCompileClasspath());
   
           // Gcj has no option for source-path so we
  
  
  

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


Mime
View raw message