Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 93139 invoked from network); 17 Aug 2007 09:54:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Aug 2007 09:54:46 -0000 Received: (qmail 97390 invoked by uid 500); 17 Aug 2007 09:54:43 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 97354 invoked by uid 500); 17 Aug 2007 09:54:43 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 97343 invoked by uid 500); 17 Aug 2007 09:54:43 -0000 Received: (qmail 97340 invoked by uid 99); 17 Aug 2007 09:54:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Aug 2007 02:54:43 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Aug 2007 09:54:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E7C381A981D; Fri, 17 Aug 2007 02:54:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r566991 - in /ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs: compilers/Jikes.java optional/junit/JUnitTask.java Date: Fri, 17 Aug 2007 09:54:24 -0000 To: ant-cvs@apache.org From: peterreilly@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070817095424.E7C381A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: peterreilly Date: Fri Aug 17 02:54:23 2007 New Revision: 566991 URL: http://svn.apache.org/viewvc?view=rev&rev=566991 Log: sync: reduce method length Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java?view=diff&rev=566991&r1=566990&r2=566991 ============================================================================== --- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java (original) +++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java Fri Aug 17 02:54:23 2007 @@ -132,6 +132,36 @@ cmd.createArgument().setValue(target); } + addPropertyParams(cmd); + + if (attributes.getSource() != null) { + cmd.createArgument().setValue("-source"); + String source = attributes.getSource(); + if (source.equals("1.1") || source.equals("1.2")) { + // support for -source 1.1 and -source 1.2 has been + // added with JDK 1.4.2, Jikes doesn't like it + attributes.log("Jikes doesn't support '-source " + source + + "', will use '-source 1.3' instead"); + cmd.createArgument().setValue("1.3"); + } else { + cmd.createArgument().setValue(source); + } + } + addCurrentCompilerArgs(cmd); + + int firstFileName = cmd.size(); + + Path boot = getBootClassPath(); + if (boot.size() > 0) { + cmd.createArgument().setValue("-bootclasspath"); + cmd.createArgument().setPath(boot); + } + logAndAddFilesToCompile(cmd); + + return executeExternalCompile(cmd.getCommandline(), firstFileName) == 0; + } + + private void addPropertyParams(Commandline cmd) { /** * XXX * Perhaps we shouldn't use properties for these Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java?view=diff&rev=566991&r1=566990&r2=566991 ============================================================================== --- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java (original) +++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java Fri Aug 17 02:54:23 2007 @@ -926,34 +926,9 @@ cmd.createArgument().setValue(Constants.HALT_ON_ERROR + test.getHaltonerror()); cmd.createArgument().setValue(Constants.HALT_ON_FAILURE + test.getHaltonfailure()); - if (includeAntRuntime) { - Vector v = Execute.getProcEnvironment(); - Enumeration e = v.elements(); - while (e.hasMoreElements()) { - String s = (String) e.nextElement(); - if (s.startsWith(CLASSPATH)) { - cmd.createClasspath(getProject()).createPath() - .append(new Path(getProject(), - s.substring(CLASSPATH.length() - ))); - } - } - log("Implicitly adding " + antRuntimeClasses + " to CLASSPATH", - Project.MSG_VERBOSE); - cmd.createClasspath(getProject()).createPath() - .append(antRuntimeClasses); - } + checkIncludeAntRuntime(cmd); - if (summary) { - String prefix = ""; - if ("withoutanderr".equalsIgnoreCase(summaryValue)) { - prefix = "OutErr"; - } - cmd.createArgument() - .setValue(Constants.FORMATTER - + "org.apache.tools.ant.taskdefs.optional.junit." - + prefix + "SummaryJUnitResultFormatter"); - } + checkIncludeSummary(cmd); cmd.createArgument().setValue(Constants.SHOWOUTPUT + String.valueOf(showOutput)); @@ -1070,6 +1045,42 @@ } return result; + } + + /** + * Adding ant runtime. + */ + private void checkIncludeAntRuntime(CommandlineJava cmd) { + if (includeAntRuntime) { + Vector v = Execute.getProcEnvironment(); + Enumeration e = v.elements(); + while (e.hasMoreElements()) { + String s = (String) e.nextElement(); + if (s.startsWith(CLASSPATH)) { + cmd.createClasspath(getProject()).createPath() + .append(new Path(getProject(), + s.substring(CLASSPATH.length() + ))); + } + } + log("Implicitly adding " + antRuntimeClasses + " to CLASSPATH", + Project.MSG_VERBOSE); + cmd.createClasspath(getProject()).createPath() + .append(antRuntimeClasses); + } + } + + private void checkIncludeSummary(CommandlineJava cmd) { + if (summary) { + String prefix = ""; + if ("withoutanderr".equalsIgnoreCase(summaryValue)) { + prefix = "OutErr"; + } + cmd.createArgument() + .setValue(Constants.FORMATTER + + "org.apache.tools.ant.taskdefs.optional.junit." + + prefix + "SummaryJUnitResultFormatter"); + } } /** --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org