Blame apache-ant-1.6.5-javah.patch
|
vadimn |
32cc13 |
--- apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java.original 2005-10-31 15:05:55.000000000 -0500
|
|
vadimn |
32cc13 |
+++ apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2005-10-31 15:11:31.000000000 -0500
|
|
vadimn |
32cc13 |
@@ -104,7 +104,7 @@
|
|
vadimn |
32cc13 |
}
|
|
vadimn |
32cc13 |
kaffeDetected = false;
|
|
vadimn |
32cc13 |
try {
|
|
vadimn |
32cc13 |
- Class.forName("kaffe.util.NotImplemented");
|
|
vadimn |
32cc13 |
+ Class.forName("gnu.classpath.Configuration");
|
|
vadimn |
32cc13 |
kaffeDetected = true;
|
|
vadimn |
32cc13 |
} catch (Throwable t) {
|
|
vadimn |
32cc13 |
// swallow as this simply doesn't seem to be Kaffe
|
|
vadimn |
32cc13 |
--- apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.original 2005-10-31 15:06:34.000000000 -0500
|
|
vadimn |
32cc13 |
+++ apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java 2005-10-31 15:08:13.000000000 -0500
|
|
vadimn |
32cc13 |
@@ -52,7 +52,7 @@
|
|
vadimn |
32cc13 |
|
|
vadimn |
32cc13 |
private Commandline setupKaffehCommand(Javah javah) {
|
|
vadimn |
32cc13 |
Commandline cmd = new Commandline();
|
|
vadimn |
32cc13 |
- cmd.setExecutable(JavaEnvUtils.getJdkExecutable("kaffeh"));
|
|
vadimn |
32cc13 |
+ cmd.setExecutable(JavaEnvUtils.getJdkExecutable("javah"));
|
|
vadimn |
32cc13 |
|
|
vadimn |
32cc13 |
if (javah.getDestdir() != null) {
|
|
vadimn |
32cc13 |
cmd.createArgument().setValue("-d");
|