Author: stevel
Date: Thu Nov 24 08:04:44 2005
New Revision: 348762
URL: http://svn.apache.org/viewcvs?rev=348762&view=rev
Log:
apt fix. this should have gone in with the fork-only patch in march.
also: pulled java1.5 only rule. because java1.6 is coming.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Apt.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/AptExternalCompilerAdapter.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Apt.java
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Apt.java?rev=348762&r1=348761&r2=348762&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Apt.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Apt.java Thu Nov 24
08:04:44 2005
@@ -259,9 +259,6 @@
*/
public void execute()
throws BuildException {
- if (!JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_5)) {
- throw new BuildException(ERROR_WRONG_JAVA_VERSION);
- }
super.execute();
}
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/AptExternalCompilerAdapter.java
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/AptExternalCompilerAdapter.java?rev=348762&r1=348761&r2=348762&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/AptExternalCompilerAdapter.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/AptExternalCompilerAdapter.java
Thu Nov 24 08:04:44 2005
@@ -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.
@@ -53,13 +53,13 @@
cmd.setExecutable(apt.getAptExecutable());
setupModernJavacCommandlineSwitches(cmd);
AptCompilerAdapter.setAptCommandlineSwitches(apt, cmd);
-
+ int firstFileName = cmd.size();
//add the files
logAndAddFilesToCompile(cmd);
//run
return 0 == executeExternalCompile(cmd.getCommandline(),
- cmd.size(),
+ firstFileName,
true);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
