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 2015/02/12 21:16:15 UTC
[1/3] ant git commit: make assumeJava19 actually look for 1.9 instead
of 1.8
Repository: ant
Updated Branches:
refs/heads/master 1388e372a -> db2254973
make assumeJava19 actually look for 1.9 instead of 1.8
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/207ce00b
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/207ce00b
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/207ce00b
Branch: refs/heads/master
Commit: 207ce00bb895cc404c2b9a36602a1c529f9d1b80
Parents: 1388e37
Author: Stefan Bodewig <bo...@apache.org>
Authored: Thu Feb 12 21:15:10 2015 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Feb 12 21:15:10 2015 +0100
----------------------------------------------------------------------
.../tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/207ce00b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
index 9f746c9..7a3ab69 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
@@ -613,7 +613,7 @@ public abstract class DefaultCompilerAdapter
* @since Ant 1.9.4
*/
protected boolean assumeJava19() {
- return assumeJavaXY("javac1.9", JavaEnvUtils.JAVA_1_8);
+ return assumeJavaXY("javac1.9", JavaEnvUtils.JAVA_1_9);
}
/**
@@ -691,6 +691,9 @@ public abstract class DefaultCompilerAdapter
if (assumeJava18()) {
return "1.8 in JDK 1.8";
}
+ if (assumeJava19()) {
+ return "1.9 in JDK 1.9";
+ }
return "";
}
[2/3] ant git commit: whitespace
Posted by bo...@apache.org.
whitespace
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/e09e4bba
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e09e4bba
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e09e4bba
Branch: refs/heads/master
Commit: e09e4bbac6daab60e48cd57d15e1e4ccef1504b2
Parents: 207ce00
Author: Stefan Bodewig <bo...@apache.org>
Authored: Thu Feb 12 21:15:38 2015 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Feb 12 21:15:38 2015 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/util/JavaEnvUtils.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/e09e4bba/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
index 9ed62c3..c91bf76 100644
--- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
+++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
@@ -219,10 +219,10 @@ public final class JavaEnvUtils {
private static void checkForJava9() throws Exception {
Class<?> clazz = Class.forName("javax.lang.model.SourceVersion");
clazz.getDeclaredField("RELEASE_9");
- }
+ }
- /**
+ /**
* Returns the version of Java this class is running under.
* This number can be used for comparisons; it will always be
* @return the version of Java as a number 10x the major/minor,
@@ -425,7 +425,7 @@ public final class JavaEnvUtils {
private static void buildJrePackages() {
jrePackages = new Vector<String>();
switch(javaVersionNumber) {
- case VERSION_1_9:
+ case VERSION_1_9:
case VERSION_1_8:
case VERSION_1_7:
case VERSION_1_6:
[3/3] ant git commit: update some comments
Posted by bo...@apache.org.
update some comments
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/db225497
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/db225497
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/db225497
Branch: refs/heads/master
Commit: db2254973cd2e77b5e8d5a938adb09927f531472
Parents: e09e4bb
Author: Stefan Bodewig <bo...@apache.org>
Authored: Thu Feb 12 21:15:52 2015 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Feb 12 21:15:52 2015 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/taskdefs/Javac.java | 6 +++---
src/main/org/apache/tools/ant/util/JavaEnvUtils.java | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/db225497/src/main/org/apache/tools/ant/taskdefs/Javac.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java
index 75a35cf..3d77f7c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -202,8 +202,8 @@ public class Javac extends MatchingTask {
* must make sure that your version of jikes supports the -source
* switch.</p>
*
- * <p>Legal values are 1.3, 1.4, 1.5, and 5 - by default, no
- * -source argument will be used at all.</p>
+ * <p>Legal values are 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, and 5, 6, 7, 8 and 9
+ * - by default, no -source argument will be used at all.</p>
*
* @param v Value to assign to source.
*/
@@ -606,7 +606,7 @@ public class Javac extends MatchingTask {
/**
* Sets the target VM that the classes will be compiled for. Valid
* values depend on the compiler, for jdk 1.4 the valid values are
- * "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "5", "6", "7" and "8".
+ * "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "5", "6", "7", "8", "9".
* @param target the target VM
*/
public void setTarget(final String target) {
http://git-wip-us.apache.org/repos/asf/ant/blob/db225497/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
index c91bf76..2f27cfe 100644
--- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
+++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
@@ -385,6 +385,8 @@ public final class JavaEnvUtils {
// fall back to JRE bin directory, also catches JDK 1.0 and 1.1
// where java.home points to the root of the JDK and Mac OS X where
// the whole directory layout is different from Sun's
+ // and also catches JDK 1.9 (and probably later) which
+ // merged JDK and JRE dirs
return getJreExecutable(command);
}
}