From 682ddfaf7c933915470a64fca5668ddc4110a3c6 Mon Sep 17 00:00:00 2001 From: doko Date: Tue, 15 Jan 2013 13:58:43 +0000 Subject: 2013-01-10 Matthias Klose * tools/gnu/classpath/tools/gjdoc/Main.java: Accept -source 1.5, 1.6, 1.7. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195197 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/ChangeLog | 5 +++++ .../classes/gnu/classpath/tools/gjdoc/Main$10.class | Bin 1221 -> 1691 bytes .../classes/gnu/classpath/tools/gjdoc/Main$11.class | Bin 1728 -> 1728 bytes .../classes/gnu/classpath/tools/gjdoc/Main$12.class | Bin 1799 -> 1799 bytes .../classes/gnu/classpath/tools/gjdoc/Main$13.class | Bin 1799 -> 1799 bytes .../classes/gnu/classpath/tools/gjdoc/Main$14.class | Bin 929 -> 929 bytes .../classes/gnu/classpath/tools/gjdoc/Main$15.class | Bin 923 -> 923 bytes .../classes/gnu/classpath/tools/gjdoc/Main$16.class | Bin 1715 -> 1715 bytes .../classes/gnu/classpath/tools/gjdoc/Main$17.class | Bin 828 -> 828 bytes .../classes/gnu/classpath/tools/gjdoc/Main$18.class | Bin 809 -> 809 bytes .../classes/gnu/classpath/tools/gjdoc/Main$19.class | Bin 809 -> 809 bytes .../classes/gnu/classpath/tools/gjdoc/Main$20.class | Bin 1382 -> 1382 bytes .../classes/gnu/classpath/tools/gjdoc/Main$21.class | Bin 1400 -> 1400 bytes .../classes/gnu/classpath/tools/gjdoc/Main$22.class | Bin 809 -> 809 bytes .../classes/gnu/classpath/tools/gjdoc/Main$23.class | Bin 809 -> 809 bytes .../classes/gnu/classpath/tools/gjdoc/Main$24.class | Bin 809 -> 809 bytes .../classes/gnu/classpath/tools/gjdoc/Main$25.class | Bin 809 -> 809 bytes .../classes/gnu/classpath/tools/gjdoc/Main.class | Bin 28819 -> 28819 bytes .../tools/gnu/classpath/tools/gjdoc/Main.java | 11 ++++++++--- 19 files changed, 13 insertions(+), 3 deletions(-) (limited to 'libjava') diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 37d11a3c942..0fd875286ca 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,8 @@ +2013-01-10 Matthias Klose + + * tools/gnu/classpath/tools/gjdoc/Main.java: Accept -source 1.5, + 1.6, 1.7. + 2012-12-17 Andrew Haley PR gcc/55716 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class index b89326a1af7..d9aa037e68d 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class index 4c2f6db71e8..83f5cf394e4 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class index 0869d61f601..286f38be883 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class index 021d8852511..2754c8e4cb6 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class index e4806c7148a..97a338b7699 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class index ed5da320b81..acad8f219a2 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class index e0066d314d8..3a934b8c909 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class index 0c49dc9f9e8..73076d604a0 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class index 04172f0e42b..c439b2f8c0a 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class index c27b42a9a33..865a1959233 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class index 7b0d498bdb2..d075ea4b910 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class index 9a0f9ee2d5d..1b510d37928 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class index bea6401401f..65887318895 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class index e2571d3b48c..bded03e1e8e 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class index 6b6b275563d..923b3290719 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class index e02f015bd25..c9a98f62b7b 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class index a50c91d36d2..141d3c293f8 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class differ diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java index f2315a920aa..df9c8d9fa2d 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java +++ b/libjava/classpath/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."); } } }); -- cgit v1.2.3