conor 2003/02/18 04:46:28
Modified: src/main/org/apache/tools/ant/taskdefs/optional/javacc
JJTree.java JavaCC.java
src/main/org/apache/tools/ant/taskdefs/optional/metamata
AbstractMetamataTask.java MParse.java
Log:
Find the java executable accordining to standard Ant rules
PR: 17145
Revision Changes Path
1.19 +3 -2 ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
Index: JJTree.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -u -r1.18 -r1.19
--- JJTree.java 10 Feb 2003 14:14:09 -0000 1.18
+++ JJTree.java 18 Feb 2003 12:46:27 -0000 1.19
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,7 @@
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.util.JavaEnvUtils;
/**
* Runs the JJTree compiler compiler.
@@ -200,7 +201,7 @@
}
public JJTree() {
- cmdl.setVm("java");
+ cmdl.setVm(JavaEnvUtils.getJreExecutable("java"));
cmdl.setClassname("COM.sun.labs.jjtree.Main");
}
1.21 +3 -2 ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
Index: JavaCC.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -u -r1.20 -r1.21
--- JavaCC.java 10 Feb 2003 14:14:09 -0000 1.20
+++ JavaCC.java 18 Feb 2003 12:46:27 -0000 1.21
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,6 +64,7 @@
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.util.JavaEnvUtils;
/**
* JavaCC compiler compiler task.
@@ -270,7 +271,7 @@
}
public JavaCC() {
- cmdl.setVm("java");
+ cmdl.setVm(JavaEnvUtils.getJreExecutable("java"));
cmdl.setClassname("COM.sun.labs.javacc.Main");
}
1.12 +3 -2 ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
Index: AbstractMetamataTask.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -u -r1.11 -r1.12
--- AbstractMetamataTask.java 10 Feb 2003 14:14:17 -0000 1.11
+++ AbstractMetamataTask.java 18 Feb 2003 12:46:28 -0000 1.12
@@ -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
@@ -71,6 +71,7 @@
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.JavaEnvUtils;
/**
* Somewhat abstract framework to be used for other metama 2.0 tasks.
@@ -118,7 +119,7 @@
/** initialize the task with the classname of the task to run */
protected AbstractMetamataTask(String className) {
- cmdl.setVm("java");
+ cmdl.setVm(JavaEnvUtils.getJreExecutable("java"));
cmdl.setClassname(className);
}
1.17 +3 -2 ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
Index: MParse.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -u -r1.16 -r1.17
--- MParse.java 10 Feb 2003 14:14:17 -0000 1.16
+++ MParse.java 18 Feb 2003 12:46:28 -0000 1.17
@@ -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
@@ -66,6 +66,7 @@
import org.apache.tools.ant.taskdefs.LogStreamHandler;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.util.JavaEnvUtils;
/**
* Simple Metamata MParse task.
@@ -114,7 +115,7 @@
}
public MParse() {
- cmdl.setVm("java");
+ cmdl.setVm(JavaEnvUtils.getJreExecutable("java"));
cmdl.setClassname("com.metamata.jj.MParse");
}
|