bodewig 2003/03/20 01:10:54
Modified: . WHATSNEW
src/main/org/apache/tools/ant/taskdefs/compilers Jvc.java
Log:
Don't include Sun's runtime when compiling with jvc unless the user
explicitly asks for it.
PR: 18055
Revision Changes Path
1.369 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- WHATSNEW 19 Mar 2003 10:48:01 -0000 1.368
+++ WHATSNEW 20 Mar 2003 09:10:53 -0000 1.369
@@ -201,6 +201,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
=============================================
1.14 +1 -10
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Jvc.java 7 Mar 2003 11:23:04 -0000 1.13
+++ Jvc.java 20 Mar 2003 09:10:54 -0000 1.14
@@ -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
@@ -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