From b86016b5a5b242e066daa97ad4c98d5cc129667b Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Thu, 20 Mar 2003 09:10:54 +0000 Subject: [PATCH] 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 --- WHATSNEW | 3 +++ .../org/apache/tools/ant/taskdefs/compilers/Jvc.java | 11 +---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/WHATSNEW b/WHATSNEW index 8fe91d57e..612d0104d 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -201,6 +201,9 @@ Fixed bugs: attribute of or the webxml attribute of , it would be ignored. Bugzilla Report 17871. +* Ant will no longer implicitly add Sun's rt.jar in when you + use jvc and don't specify a bootclasspath. Bugzilla Report 18055. + Changes from Ant 1.5.1 to Ant 1.5.2 ============================================= diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java index e9aa8ad15..96f5e4893 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java @@ -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