summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2013-01-10 10:16:23 +0100
committerMark Wielaard <mjw@redhat.com>2013-01-10 10:16:23 +0100
commitf1ea0230edd3df0e98c737afb6820bf106519bc2 (patch)
treeafbc6fed0e0bd39eec58b0c41633f26f5119dd3a
parentd5388b6909c719588f5ff84f26d7f5a271b9ffa3 (diff)
downloadclasspath-f1ea0230edd3df0e98c737afb6820bf106519bc2.tar.gz
* tools/gnu/classpath/tools/gjdoc/Main.java: Accept -source 1.5, 1.6, 1.7.
-rw-r--r--ChangeLog5
-rw-r--r--tools/gnu/classpath/tools/gjdoc/Main.java11
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9fa7294a5..9a33f00b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-10 Matthias Klose <doko@ubuntu.com>
+
+ * tools/gnu/classpath/tools/gjdoc/Main.java: Accept -source 1.5,
+ 1.6, 1.7.
+
2012-12-17 Andrew Haley <aph@redhat.com>
PR libgcj/55716
diff --git a/tools/gnu/classpath/tools/gjdoc/Main.java b/tools/gnu/classpath/tools/gjdoc/Main.java
index feb30863d..5d9638697 100644
--- a/tools/gnu/classpath/tools/gjdoc/Main.java
+++ b/tools/gnu/classpath/tools/gjdoc/Main.java
@@ -1308,12 +1308,17 @@ public final class Main
void process(String[] args)
{
option_source = args[0];
- if (!"1.2".equals(option_source)
+ if ("1.5".equals(option_source)
+ || "1.6".equals(option_source)
+ || "1.7".equals(option_source)) {
+ System.err.println("WARNING: support for option -source " + option_source + " is experimental");
+ }
+ else if (!"1.2".equals(option_source)
&& !"1.3".equals(option_source)
&& !"1.4".equals(option_source)) {
- throw new RuntimeException("Only he following values are currently"
- + " supported for option -source: 1.2, 1.3, 1.4.");
+ throw new RuntimeException("Only the following values are currently"
+ + " supported for option -source: 1.2, 1.3, 1.4; experimental: 1.5, 1.6, 1.7.");
}
}
});