You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/07/30 16:53:01 UTC
[5/5] ant git commit: use forking javah by default
use forking javah by default
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/5d6adaef
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/5d6adaef
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/5d6adaef
Branch: refs/heads/master
Commit: 5d6adaef8038982c6b86491aa9b11cac64521fe6
Parents: 83bb121
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Jul 30 18:51:48 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Jul 30 18:51:48 2016 +0200
----------------------------------------------------------------------
WHATSNEW | 3 +++
.../tools/ant/taskdefs/optional/javah/ForkingJavah.java | 1 +
.../taskdefs/optional/javah/JavahAdapterFactory.java | 12 +++---------
3 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/5d6adaef/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index 15c3759..e60ac6c 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -25,6 +25,9 @@ Changes that could break older environments:
be used when running on Java 9 since this option has been removed.
Bugzilla Report 59906
+ * <javah> will default to the "forking" implementation on Java8
+ as well.
+
Fixed bugs:
-----------
http://git-wip-us.apache.org/repos/asf/ant/blob/5d6adaef/src/main/org/apache/tools/ant/taskdefs/optional/javah/ForkingJavah.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javah/ForkingJavah.java b/src/main/org/apache/tools/ant/taskdefs/optional/javah/ForkingJavah.java
index c12f594..a537669 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javah/ForkingJavah.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javah/ForkingJavah.java
@@ -45,6 +45,7 @@ public class ForkingJavah implements JavahAdapter {
* @return true if the compilation was successful.
* @throws BuildException if there is an error.
*/
+ @Override
public boolean compile(Javah javah) throws BuildException {
Commandline cmd = SunJavah.setupJavahCommand(javah);
Project project = javah.getProject();
http://git-wip-us.apache.org/repos/asf/ant/blob/5d6adaef/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
index cc4419c..481a97d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
@@ -44,10 +44,8 @@ public class JavahAdapterFactory {
return Kaffeh.IMPLEMENTATION_NAME;
} else if (JavaEnvUtils.isGij()) {
return Gcjh.IMPLEMENTATION_NAME;
- } else if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
- return ForkingJavah.IMPLEMENTATION_NAME;
}
- return SunJavah.IMPLEMENTATION_NAME;
+ return ForkingJavah.IMPLEMENTATION_NAME;
}
/**
@@ -89,9 +87,7 @@ public class JavahAdapterFactory {
} else if ((JavaEnvUtils.isGij() && choice == null)
|| Gcjh.IMPLEMENTATION_NAME.equals(choice)) {
return new Gcjh();
- } else if ((JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)
- && choice == null)
- || ForkingJavah.IMPLEMENTATION_NAME.equals(choice)) {
+ } else if (ForkingJavah.IMPLEMENTATION_NAME.equals(choice)) {
return new ForkingJavah();
} else if (SunJavah.IMPLEMENTATION_NAME.equals(choice)) {
return new SunJavah();
@@ -102,9 +98,7 @@ public class JavahAdapterFactory {
.createClassLoader(classpath));
}
- // This default has been good enough until Ant 1.6.3, so stick
- // with it
- return new SunJavah();
+ return new ForkingJavah();
}
/**