bodewig 2003/03/20 01:11:28
Modified: . Tag: ANT_15_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs/compilers Tag:
ANT_15_BRANCH Jvc.java
Log:
Merge fix for 18055 from HEAD
Revision Changes Path
No revision
No revision
1.263.2.127 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.263.2.126
retrieving revision 1.263.2.127
diff -u -r1.263.2.126 -r1.263.2.127
--- WHATSNEW 14 Mar 2003 15:32:21 -0000 1.263.2.126
+++ WHATSNEW 20 Mar 2003 09:11:27 -0000 1.263.2.127
@@ -27,6 +27,9 @@
attribute of <ear> or the webxml attribute of <war>, it would be
ignored. Bugzilla Report 17871.
+* Ant will no longer implicitly add Sun's rt.jar in <javac> when you
+ use jvc and don't specify a bootclasspath. Bugzilla Report 18055.
+
Changes from Ant 1.5.1 to Ant 1.5.2
===================================
No revision
No revision
1.9.2.3 +2 -11
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
Index: Jvc.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- Jvc.java 10 Feb 2003 14:24:54 -0000 1.9.2.2
+++ Jvc.java 20 Mar 2003 09:11:28 -0000 1.9.2.3
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@
* @author James Davidson <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @author Robin Green
* <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
- * @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
+ * @author Stefan Bodewig
* @author <a href="mailto:[EMAIL PROTECTED]">J D Glanville</a>
* @since Ant 1.3
*/
@@ -93,15 +93,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;
- } else {
- // there is a bootclasspath stated. By default, the
- // includeJavaRuntime is false. If the user has stated a
- // bootclasspath and said to include the java runtime, it's on
- // their head!
- }
classpath.append(getCompileClasspath());
// jvc has no option for source-path so we
