cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
bodewig 2005/03/17 01:59:36
Modified:.WHATSNEW
docs/manual/CoreTasks javac.html
src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
Log:
Modernize Jikes (unconditionally) - PR 25868 and 26404
Revision ChangesPath
1.784 +5 -3 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.783
retrieving revision 1.784
diff -u -r1.783 -r1.784
--- WHATSNEW 17 Mar 2005 09:34:01 - 1.783
+++ WHATSNEW 17 Mar 2005 09:59:36 - 1.784
@@ -156,6 +156,11 @@
you must set filtertrace to false.
Bugzilla Report 22758
+* The jikes compiler adapter now supports -bootclasspath, -extdirs and
+ -sourcepath and also uses the same logic for debug flags as javac.
+ This means, the jikes compiler adapter now requires Jikes 1.15 or later.
+ Bugzilla Reports 25868, 26404 and 32609.
+
Other changes:
--
@@ -194,9 +199,6 @@
* added a new mapper filtermapper
-* The jikes compiler adapter now supports -bootclasspath. Bugzilla
- Report 32609.
-
* When a BuildListener tried to access System.err or System.out, Ant
would have thrown an exception - this has been changed. Ant now
silently ignores the message. BuildListeners still should avoid
1.51 +4 -2 ant/docs/manual/CoreTasks/javac.html
Index: javac.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/javac.html,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- javac.html7 Mar 2005 18:09:09 - 1.50
+++ javac.html17 Mar 2005 09:59:36 - 1.51
@@ -58,7 +58,7 @@
codejavac1.4/code and
codejavac1.5/code can be used as aliases./li
licodejikes/code (the a
-href=http://oss.software.ibm.com/developerworks/opensource/jikes/;
target=_topJikes/a
+href=http://jikes.sourceforge.net/; target=_topJikes/a
compiler)./li
licodejvc/code (the Command-Line Compiler from Microsoft's SDK
for Java / Visual J++) ndash; codemicrosoft/code can be used
@@ -209,7 +209,7 @@
td valign=topdebuglevel/td
td valign=topKeyword list to be appended to the code-g/code
command-line switch. This will be ignored by all implementations
except
- codemodern/code and codeclassic(ver gt;= 1.2)/code.
+ codemodern/code, codeclassic(ver gt;= 1.2)/code and
codejikes/code.
Legal values are codenone/code or a comma-separated list of the
following keywords:
codelines/code, codevars/code, and codesource/code.
@@ -536,6 +536,8 @@
h3Jikes Notes/h3
+pYou need Jikes 1.15 or later./p
+
pJikes supports some extra options, which can be set be defining
the properties shown below prior to invoking the task. The setting
for each property will be in affect for all codelt;javacgt;/code
1.32 +30 -20
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Jikes.java4 Feb 2005 15:41:39 - 1.31
+++ Jikes.java17 Mar 2005 09:59:36 - 1.32
@@ -44,11 +44,24 @@
public boolean execute() throws BuildException {
attributes.log(Using jikes compiler, Project.MSG_VERBOSE);
-Path classpath = new Path(project);
+Commandline cmd = new Commandline();
-// Jikes doesn't support an extension dir (-extdir)
-// so we'll emulate it for compatibility and convenience.
-classpath.addExtdirs(extdirs);
+// For -sourcepath, use the sourcepath value if present.
+// Otherwise default to the srcdir value.
+Path sourcepath = null;
+if (compileSourcepath != null) {
+sourcepath = compileSourcepath;
+} else {
+sourcepath = src;
+}
+// If the buildfile specifies sourcepath=, then don't
+// output any sourcepath.
+if (sourcepath.size() 0) {
+cmd.createArgument().setValue(-sourcepath);
+cmd.createArgument().setPath(sourcepath);
+}
+
+Path classpath = new Path(project);
if (bootclasspath == null || bootclasspath.size() == 0) {
// no bootclasspath, therefore, get one from the java runtime
@@ -61,21 +74,17 @@
}
classpath.append(getCompileClasspath());
-// Jikes has no option for source-path so we
-// will add it to classpath.
-if
Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
On 17 Mar 2005, [EMAIL PROTECTED] wrote: Modernize Jikes (unconditionally) - PR 25868 and 26404 the next Kaffe Gump run should tell us if something went wrong. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
bodewig 2005/03/17 02:19:19
Modified:.Tag: ANT_16_BRANCH WHATSNEW
docs/manual/CoreTasks Tag: ANT_16_BRANCH javac.html
src/main/org/apache/tools/ant/taskdefs/compilers Tag:
ANT_16_BRANCH Jikes.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.503.2.203 +5 -3 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.202
retrieving revision 1.503.2.203
diff -u -r1.503.2.202 -r1.503.2.203
--- WHATSNEW 17 Mar 2005 09:38:59 - 1.503.2.202
+++ WHATSNEW 17 Mar 2005 10:18:43 - 1.503.2.203
@@ -20,6 +20,11 @@
you must set filtertrace to false.
Bugzilla Report 22758
+* The jikes compiler adapter now supports -bootclasspath, -extdirs and
+ -sourcepath and also uses the same logic for debug flags as javac.
+ This means, the jikes compiler adapter now requires Jikes 1.15 or later.
+ Bugzilla Reports 25868, 26404 and 32609.
+
Other changes:
--
@@ -58,9 +63,6 @@
* added a new mapper filtermapper
-* The jikes compiler adapter now supports -bootclasspath. Bugzilla
- Report 32609.
-
* When a BuildListener tried to access System.err or System.out, Ant
would have thrown an exception - this has been changed. Ant now
silently ignores the message. BuildListeners still should avoid
No revision
No revision
1.42.2.10 +4 -2 ant/docs/manual/CoreTasks/javac.html
Index: javac.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/javac.html,v
retrieving revision 1.42.2.9
retrieving revision 1.42.2.10
diff -u -r1.42.2.9 -r1.42.2.10
--- javac.html28 Jan 2005 16:39:20 - 1.42.2.9
+++ javac.html17 Mar 2005 10:19:18 - 1.42.2.10
@@ -58,7 +58,7 @@
codejavac1.4/code and
codejavac1.5/code can be used as aliases./li
licodejikes/code (the a
-href=http://oss.software.ibm.com/developerworks/opensource/jikes/;
target=_topJikes/a
+href=http://jikes.sourceforge.net/; target=_topJikes/a
compiler)./li
licodejvc/code (the Command-Line Compiler from Microsoft's SDK
for Java / Visual J++) ndash; codemicrosoft/code can be used
@@ -209,7 +209,7 @@
td valign=topdebuglevel/td
td valign=topKeyword list to be appended to the code-g/code
command-line switch. This will be ignored by all implementations
except
- codemodern/code and codeclassic(ver gt;= 1.2)/code.
+ codemodern/code, codeclassic(ver gt;= 1.2)/code and
codejikes/code.
Legal values are codenone/code or a comma-separated list of the
following keywords:
codelines/code, codevars/code, and codesource/code.
@@ -536,6 +536,8 @@
h3Jikes Notes/h3
+pYou need Jikes 1.15 or later./p
+
pJikes supports some extra options, which can be set be defining
the properties shown below prior to invoking the task. The setting
for each property will be in affect for all codelt;javacgt;/code
No revision
No revision
1.22.2.9 +30 -20
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.22.2.8
retrieving revision 1.22.2.9
diff -u -r1.22.2.8 -r1.22.2.9
--- Jikes.java4 Feb 2005 15:42:03 - 1.22.2.8
+++ Jikes.java17 Mar 2005 10:19:18 - 1.22.2.9
@@ -44,11 +44,24 @@
public boolean execute() throws BuildException {
attributes.log(Using jikes compiler, Project.MSG_VERBOSE);
-Path classpath = new Path(project);
+Commandline cmd = new Commandline();
-// Jikes doesn't support an extension dir (-extdir)
-// so we'll emulate it for compatibility and convenience.
-classpath.addExtdirs(extdirs);
+// For -sourcepath, use the sourcepath value if present.
+// Otherwise default to the srcdir value.
+Path sourcepath = null;
+if (compileSourcepath != null) {
+sourcepath = compileSourcepath;
+} else {
+sourcepath = src;
+}
+// If the buildfile specifies sourcepath=, then don't
+// output any sourcepath.
+if (sourcepath.size() 0) {
+cmd.createArgument().setValue(-sourcepath);
+cmd.createArgument().setPath(sourcepath);
+}
+
+Path classpath = new Path(project);
if (bootclasspath == null ||
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
bodewig 2005/02/04 07:41:39
Modified:src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
Log:
logging of command line was incomplete
Revision ChangesPath
1.31 +3 -2
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Jikes.java21 Dec 2004 15:44:51 - 1.30
+++ Jikes.java4 Feb 2005 15:41:39 - 1.31
@@ -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.
@@ -195,7 +195,6 @@
addCurrentCompilerArgs(cmd);
int firstFileName = cmd.size();
-logAndAddFilesToCompile(cmd);
Path boot = getBootClassPath();
if (boot.size() 0) {
@@ -203,6 +202,8 @@
cmd.createArgument().setPath(boot);
}
+logAndAddFilesToCompile(cmd);
+
return
executeExternalCompile(cmd.getCommandline(), firstFileName) == 0;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
bodewig 2005/02/04 07:42:03
Modified:src/main/org/apache/tools/ant/taskdefs/compilers Tag:
ANT_16_BRANCH Jikes.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.22.2.8 +2 -1
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.22.2.7
retrieving revision 1.22.2.8
diff -u -r1.22.2.7 -r1.22.2.8
--- Jikes.java11 Jan 2005 13:57:21 - 1.22.2.7
+++ Jikes.java4 Feb 2005 15:42:03 - 1.22.2.8
@@ -195,13 +195,14 @@
addCurrentCompilerArgs(cmd);
int firstFileName = cmd.size();
-logAndAddFilesToCompile(cmd);
if (bootclasspath != null) {
cmd.createArgument().setValue(-bootclasspath);
cmd.createArgument().setPath(bootclasspath);
}
+logAndAddFilesToCompile(cmd);
+
return
executeExternalCompile(cmd.getCommandline(), firstFileName) == 0;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
bodewig 2005/01/11 05:57:22
Modified:.Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs/compilers Tag:
ANT_16_BRANCH Jikes.java
Log:
jikes supports -bootclasspath
Revision ChangesPath
No revision
No revision
1.503.2.156 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.155
retrieving revision 1.503.2.156
diff -u -r1.503.2.155 -r1.503.2.156
--- WHATSNEW 10 Jan 2005 17:12:28 - 1.503.2.155
+++ WHATSNEW 11 Jan 2005 13:57:19 - 1.503.2.156
@@ -40,6 +40,9 @@
* added a new mapper filtermapper
+* The jikes compiler adapter now supports -bootclasspath. Bugzilla
+ Report 32609.
+
Fixed bugs:
---
No revision
No revision
1.22.2.7 +8 -9
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.22.2.6
retrieving revision 1.22.2.7
diff -u -r1.22.2.6 -r1.22.2.7
--- Jikes.java8 Dec 2004 07:58:41 - 1.22.2.6
+++ Jikes.java11 Jan 2005 13:57:21 - 1.22.2.7
@@ -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.
@@ -35,23 +35,17 @@
* Performs a compile using the Jikes compiler from IBM.
* Mostly of this code is identical to doClassicCompile()
* However, it does not support all options like
- * bootclasspath, extdirs, deprecation and so on, because
+ * extdirs, deprecation and so on, because
* there is no option in jikes and I don't understand
* what they should do.
*
- * It has been successfully tested with jikes 1.10
+ * It has been successfully tested with jikes gt;1.10
*/
public boolean execute() throws BuildException {
attributes.log(Using jikes compiler, Project.MSG_VERBOSE);
Path classpath = new Path(project);
-// Jikes doesn't support bootclasspath dir (-bootclasspath)
-// so we'll emulate it for compatibility and convenience.
-if (bootclasspath != null) {
-classpath.append(bootclasspath);
-}
-
// Jikes doesn't support an extension dir (-extdir)
// so we'll emulate it for compatibility and convenience.
classpath.addExtdirs(extdirs);
@@ -202,6 +196,11 @@
int firstFileName = cmd.size();
logAndAddFilesToCompile(cmd);
+
+if (bootclasspath != null) {
+cmd.createArgument().setValue(-bootclasspath);
+cmd.createArgument().setPath(bootclasspath);
+}
return
executeExternalCompile(cmd.getCommandline(), firstFileName) == 0;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Bootclasspath and external compiles (was Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java)
On 10 Dec 2004, [EMAIL PROTECTED] wrote: +// this is a quick hack to make things work in a +// Gump/Kaffe/Jikes combo. I promise I'll explain it later - +// and add a real solution as well This is the first part of the promise. Gump currently places Xerces and various other stuff that can also be found in the JDK onto the bootclasspath to ensure it uses the latest versions. When Ant invokes an external compiler, it may pass the CLASSPATH it have been invoked with (depending on build.sysclasspath and includenantruntime), but it never passes the bootclasspath, so it swallows whatever is there. In the Gump/Jikes combination this means, Xerces is no longer on the classpath when Jikes runs. I think Ant's behavior is wrong and thus propose the following changes (that I'll perform unless you tell me I'm wrong): * If includejavaruntime is true in javac, add the full bootclasspath of the current VM. * If build.sysclasspath has the value only (i.e. ignore all classpath defintions in the build file, use the system), add the full bootclasspath of the current VM. In both cases, if the external compiler supports -bootclasspath, add it there - otherwise add it to -classpath. This would apply to javac but also to rmic. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Bootclasspath and external compiles (was Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java)
Does this need to be done for other forked tasks - junit, java for example? Petet Stefan Bodewig wrote: On 10 Dec 2004, [EMAIL PROTECTED] wrote: +// this is a quick hack to make things work in a +// Gump/Kaffe/Jikes combo. I promise I'll explain it later - +// and add a real solution as well This is the first part of the promise. Gump currently places Xerces and various other stuff that can also be found in the JDK onto the bootclasspath to ensure it uses the latest versions. When Ant invokes an external compiler, it may pass the CLASSPATH it have been invoked with (depending on build.sysclasspath and includenantruntime), but it never passes the bootclasspath, so it swallows whatever is there. In the Gump/Jikes combination this means, Xerces is no longer on the classpath when Jikes runs. I think Ant's behavior is wrong and thus propose the following changes (that I'll perform unless you tell me I'm wrong): * If includejavaruntime is true in javac, add the full bootclasspath of the current VM. * If build.sysclasspath has the value only (i.e. ignore all classpath defintions in the build file, use the system), add the full bootclasspath of the current VM. In both cases, if the external compiler supports -bootclasspath, add it there - otherwise add it to -classpath. This would apply to javac but also to rmic. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
bodewig 2004/12/10 09:29:04
Modified:src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
Log:
Try to help the Gump/Kaffe/Jikes build
Revision ChangesPath
1.29 +9 -0
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Jikes.java8 Dec 2004 07:57:04 - 1.28
+++ Jikes.java10 Dec 2004 17:29:04 - 1.29
@@ -203,6 +203,15 @@
int firstFileName = cmd.size();
logAndAddFilesToCompile(cmd);
+// this is a quick hack to make things work in a
+// Gump/Kaffe/Jikes combo. I promise I'll explain it later -
+// and add a real solution as well ;-) Stefan
+if (true.equals(System.getProperty(build.clonevm))
+ Path.systemBootClasspath.size() 0) {
+cmd.createArgument().setValue(-bootclasspath);
+cmd.createArgument().setPath(Path.systemBootClasspath);
+}
+
return
executeExternalCompile(cmd.getCommandline(), firstFileName) == 0;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
Hi
if (attributes.getSource() != null) {
cmd.createArgument().setValue(-source);
-cmd.createArgument().setValue(attributes.getSource());
+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
+cmd.createArgument().setValue(1.3);
+} else {
+cmd.createArgument().setValue(source);
+}
}
addCurrentCompilerArgs(cmd);
Shouldn't we at least log some kind of warning when we ignore 1.1 or 1.2?
like
attributes.log(Jikes does not support -source + source + . Using
-source 1.3 instead, Project.MSG_WARN);
Kind regards, Martijn
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
On Wed, 08 Dec 2004, Martijn Kruithof [EMAIL PROTECTED] wrote: Shouldn't we at least log some kind of warning when we ignore 1.1 or 1.2? +1 will change it. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
bodewig 2004/12/07 23:57:04
Modified:src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
Log:
warn when Ant upgrades -source for jikes
Revision ChangesPath
1.28 +3 -1
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Jikes.java7 Dec 2004 15:55:31 - 1.27
+++ Jikes.java8 Dec 2004 07:57:04 - 1.28
@@ -39,7 +39,7 @@
* there is no option in jikes and I don't understand
* what they should do.
*
- * It has been successfully tested with jikes 1.10
+ * It has been successfully tested with jikes gt;1.10
*/
public boolean execute() throws BuildException {
attributes.log(Using jikes compiler, Project.MSG_VERBOSE);
@@ -190,6 +190,8 @@
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);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
bodewig 2004/12/07 23:58:41
Modified:src/main/org/apache/tools/ant/taskdefs/compilers Tag:
ANT_16_BRANCH Jikes.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.22.2.6 +2 -0
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.22.2.5
retrieving revision 1.22.2.6
diff -u -r1.22.2.5 -r1.22.2.6
--- Jikes.java7 Dec 2004 15:55:39 - 1.22.2.5
+++ Jikes.java8 Dec 2004 07:58:41 - 1.22.2.6
@@ -190,6 +190,8 @@
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);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
bodewig 2004/12/07 07:55:31
Modified:src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
Log:
Jikes doesn't like -source 1.2 either, found by Gump running on Kaffe+Jikes
Revision ChangesPath
1.27 +8 -1
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Jikes.java9 Mar 2004 16:48:13 - 1.26
+++ Jikes.java7 Dec 2004 15:55:31 - 1.27
@@ -186,7 +186,14 @@
if (attributes.getSource() != null) {
cmd.createArgument().setValue(-source);
-cmd.createArgument().setValue(attributes.getSource());
+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
+cmd.createArgument().setValue(1.3);
+} else {
+cmd.createArgument().setValue(source);
+}
}
addCurrentCompilerArgs(cmd);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
conor 2003/06/09 20:00:46
Modified:src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
Log:
Add support for -target to Jikes compiler adapter
PR: 20580
Revision ChangesPath
1.20 +6 -0
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -u -r1.19 -r1.20
--- Jikes.java15 May 2003 12:44:01 - 1.19
+++ Jikes.java10 Jun 2003 03:00:45 - 1.20
@@ -155,6 +155,12 @@
if (depend) {
cmd.createArgument().setValue(-depend);
}
+
+if (target != null) {
+cmd.createArgument().setValue(-target);
+cmd.createArgument().setValue(target);
+}
+
/**
* XXX
* Perhaps we shouldn't use properties for these
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
bodewig 2003/04/14 04:42:14
Modified:src/main/org/apache/tools/ant/taskdefs Redirector.java
src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
Log:
Fix javadoc typos
Revision ChangesPath
1.4 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java
Index: Redirector.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Redirector.java 10 Feb 2003 14:13:36 - 1.3
+++ Redirector.java 14 Apr 2003 11:42:14 - 1.4
@@ -461,7 +461,7 @@
* This opertaion will close any streams and create any specified
* property values.
*
- * @throws IOException if the outptu properties cannot be read from their
+ * @throws IOException if the output properties cannot be read from their
* output streams.
*/
public void complete() throws IOException {
1.17 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Jikes.java7 Mar 2003 11:23:04 - 1.16
+++ Jikes.java14 Apr 2003 11:42:14 - 1.17
@@ -74,7 +74,7 @@
public class Jikes extends DefaultCompilerAdapter {
/**
- * Performs a compile using the Jikes compiler from IBM..
+ * Performs a compile using the Jikes compiler from IBM.
* Mostly of this code is identical to doClassicCompile()
* However, it does not support all options like
* bootclasspath, extdirs, deprecation and so on, because
