From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19838 invoked by alias); 14 Jan 2013 19:58:31 -0000 Received: (qmail 19830 invoked by uid 22791); 14 Jan 2013 19:58:30 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_LOW,TW_GJ X-Spam-Check-By: sourceware.org Received: from youngberry.canonical.com (HELO youngberry.canonical.com) (91.189.89.112) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 14 Jan 2013 19:58:25 +0000 Received: from dslb-088-073-072-133.pools.arcor-ip.net ([88.73.72.133] helo=[192.168.42.216]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1TuqAq-00022x-1v for java-patches@gcc.gnu.org; Mon, 14 Jan 2013 19:58:24 +0000 Message-ID: <50F46357.1040400@ubuntu.com> Date: Mon, 14 Jan 2013 19:58:00 -0000 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: GCJ-patches Subject: [patch] let gjdoc accept -source 1.[567] Content-Type: multipart/mixed; boundary="------------090301030109040805030603" X-IsSubscribed: yes Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org X-SW-Source: 2013-q1/txt/msg00009.txt.bz2 This is a multi-part message in MIME format. --------------090301030109040805030603 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Content-length: 370 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 --------------090301030109040805030603 Content-Type: text/x-diff; name="libjava-gjdoc.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="libjava-gjdoc.diff" Content-length: 1215 # 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."); } } }); --------------090301030109040805030603--