Browse Source

Don't include Sun's runtime when compiling with jvc unless the user

explicitly asks for it.

PR: 18055


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274295 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
b86016b5a5
2 changed files with 4 additions and 10 deletions
  1. +3
    -0
      WHATSNEW
  2. +1
    -10
      src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java

+ 3
- 0
WHATSNEW View File

@@ -201,6 +201,9 @@ Fixed bugs:
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
- 10
src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java View File

@@ -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 @@ public class Jvc extends DefaultCompilerAdapter {
// 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


Loading…
Cancel
Save