[patch] let gjdoc accept -source 1.[567]

[patch] let gjdoc accept -source 1.[567]

[Matthias Klose]

[-- Attachment #1: Type: text/plain, Size: 370 bytes --]

this patch is now in classpath trunk. the compiler does accept the newer -source
versions, so gjdoc should do as well (with a warning).

ok for the trunk?
ok for the 4.7 branch as well? it looks safe, as it only tries to accept the
option, and maybe bails out later. at least it helps with unmodified sources
which are now built with a newer -source option.

  Matthias

[-- Attachment #2: libjava-gjdoc.diff --]
[-- Type: text/x-diff, Size: 1215 bytes --]

# DP: Let gjdoc accept -source 1.5|1.6|1.7. Addresses: #678945.

--- a/src/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java
+++ b/src/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java
@@ -1337,12 +1337,17 @@
           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.");
             }
           }
         });

Re: [patch] let gjdoc accept -source 1.[567]

[Andrew Haley]

On 01/14/2013 07:58 PM, Matthias Klose wrote:
> ok for the trunk?
> ok for the 4.7 branch as well?

Yes.  Yes.  Not sure it really needs approval.

Andrew.