Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 91444 invoked from network); 13 Jan 2005 09:25:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 13 Jan 2005 09:25:35 -0000 Received: (qmail 56581 invoked by uid 500); 13 Jan 2005 09:25:32 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 56509 invoked by uid 500); 13 Jan 2005 09:25:32 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 56496 invoked by uid 500); 13 Jan 2005 09:25:32 -0000 Received: (qmail 56493 invoked by uid 99); 13 Jan 2005 09:25:32 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 13 Jan 2005 01:25:31 -0800 Received: (qmail 91356 invoked by uid 1146); 13 Jan 2005 09:25:30 -0000 Date: 13 Jan 2005 09:25:30 -0000 Message-ID: <20050113092530.91350.qmail@minotaur.apache.org> From: bodewig@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers JavacExternal.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bodewig 2005/01/13 01:25:29 Modified: . WHATSNEW src/main/org/apache/tools/ant/taskdefs/compilers JavacExternal.java Log: JDK 1.2's javac doesn't understand -source if forked, either - PR 32948 Revision Changes Path 1.711 +4 -1 ant/WHATSNEW Index: WHATSNEW =================================================================== RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.710 retrieving revision 1.711 diff -u -r1.710 -r1.711 --- WHATSNEW 13 Jan 2005 09:05:35 -0000 1.710 +++ WHATSNEW 13 Jan 2005 09:25:26 -0000 1.711 @@ -239,7 +239,10 @@ Bugzilla report 32667 * untar would go into infinite loop for some invalid tar files. - Bugzill report 29877 + Bugzilla report 29877 + +* forked won't pass -source to a JDK 1.1 or 1.2 javac anymore. + Bugzilla report 32948 Changes from Ant 1.6.1 to Ant 1.6.2 =================================== 1.18 +6 -2 ant/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java Index: JavacExternal.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- JavacExternal.java 22 Nov 2004 09:23:31 -0000 1.17 +++ JavacExternal.java 13 Jan 2005 09:25:28 -0000 1.18 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2004 The Apache Software Foundation + * Copyright 2001-2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +42,11 @@ Commandline cmd = new Commandline(); cmd.setExecutable(getJavac().getJavacExecutable()); - setupModernJavacCommandlineSwitches(cmd); + if (!assumeJava11() && !assumeJava12()) { + setupModernJavacCommandlineSwitches(cmd); + } else { + setupJavacCommandlineSwitches(cmd, true); + } int firstFileName = assumeJava11() ? -1 : cmd.size(); logAndAddFilesToCompile(cmd); //On VMS platform, we need to create a special java options file --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org