svn commit: r675842 - in /ant/core/trunk: WHATSNEW docs/manual/CoreTasks/javac.html src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java

[bo...@apache.org]

Author: bodewig
Date: Fri Jul 11 00:00:56 2008
New Revision: 675842

URL: http://svn.apache.org/viewvc?rev=675842&view=rev
Log:
More cases whete includeJavaRuntime="false" may fail for gcj.  PR 34638.

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/docs/manual/CoreTasks/javac.html
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=675842&r1=675841&r2=675842&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Jul 11 00:00:56 2008
@@ -84,6 +84,11 @@
  * Length task did not process nonexistent Resources even though these might
    conceivably still carry file length information.  Bugzilla report 45271.
 
+ * <javac>'s includeJavaRuntime="false" should work for gcj now.  Note
+   that you may need to set includeAntRuntime to false in order to
+   have full control.
+   Bugzilla Report 34638.
+
 Other changes:
 --------------
 

Modified: ant/core/trunk/docs/manual/CoreTasks/javac.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/CoreTasks/javac.html?rev=675842&r1=675841&r2=675842&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/CoreTasks/javac.html (original)
+++ ant/core/trunk/docs/manual/CoreTasks/javac.html Fri Jul 11 00:00:56 2008
@@ -295,7 +295,11 @@
     <td valign="top">includeJavaRuntime</td>
     <td valign="top">Whether to include the default run-time
       libraries from the executing VM in the classpath;
-      defaults to <code>no</code>.</td>
+      defaults to <code>no</code>.<br/>
+      <b>Note:</b> In some setups the run-time libraries may be part
+      of the "Ant run-time libraries" so you may need to explicitly
+      set includeAntRuntime to false to ensure that the Java
+      run-time libraries are not included.</td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java?rev=675842&r1=675841&r2=675842&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java Fri Jul 11 00:00:56 2008
@@ -66,7 +66,9 @@
 
         // gcj doesn't support an extension dir (-extdir)
         // so we'll emulate it for compatibility and convenience.
-        classpath.addExtdirs(extdirs);
+        if (extdirs != null || includeJavaRuntime) {
+            classpath.addExtdirs(extdirs);
+        }
 
         classpath.append(getCompileClasspath());