diff options
author | Bruno Haible <bruno@clisp.org> | 2018-03-24 12:54:42 +0100 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2018-03-24 13:05:42 +0100 |
commit | 2d3dd35cb263f6566b2924a2adae99385c440f46 (patch) | |
tree | 9a0002017f5e5dfe30ca63cefc83a1bd051325a4 /lib/javaversion.h | |
parent | 70a913d7d4d0683c1fdf1988049b2add1095c276 (diff) | |
download | gnulib-2d3dd35cb263f6566b2924a2adae99385c440f46.tar.gz |
javacomp-script, javacomp: Fix support for Java 7, 8, 9.
* lib/javaversion.h: Update comments.
* lib/javacomp.h: Likewise.
* lib/javacomp.c (default_target_version, source_version_index,
get_goodcode_snippet, get_failcode_snippet): Recognize "9" instead of
"1.9".
(TARGET_VERSION_BOUND): Bump to 9.
(target_version_index, corresponding_classfile_version): Recognize "9"
instead of "1.9".
(get_source_version_for_javac): New function.
(is_envjavac_nongcj_usable, is_javac_usable): Add
source_version_for_javac argument.
(compile_java_class): Determine and pass source_version_for_javac.
* m4/javacomp.m4: Recognize version '9' instead of '1.9'. When invoking
$JAVAC or javac, pass '-source 1.6' instead of '-source 1.5' when
appropriate.
Diffstat (limited to 'lib/javaversion.h')
-rw-r--r-- | lib/javaversion.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/javaversion.h b/lib/javaversion.h index e4646e2f5e..86cbd1a33e 100644 --- a/lib/javaversion.h +++ b/lib/javaversion.h @@ -26,8 +26,8 @@ extern "C" { /* Return information about the Java version used by execute_java_class(). This is the value of System.getProperty("java.specification.version"). - Some possible values are: 1.1, 1.2, 1.3, 1.4, 1.5, 1.6. Return NULL if - the Java version cannot be determined. */ + Some possible values are: 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 9. + Return NULL if the Java version cannot be determined. */ extern char * javaexec_version (void); |