[pkg-java] r19066 - in tags/ecj: . 3.11.0-1~exp1/debian 3.11.0-1~exp1/debian/patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed May 18 19:32:01 UTC 2016
Author: ebourg-guest
Date: 2016-05-18 19:32:01 +0000 (Wed, 18 May 2016)
New Revision: 19066
Added:
tags/ecj/3.11.0-1~exp1/
tags/ecj/3.11.0-1~exp1/debian/changelog
tags/ecj/3.11.0-1~exp1/debian/control
tags/ecj/3.11.0-1~exp1/debian/patches/gcc-changes.diff
tags/ecj/3.11.0-1~exp1/debian/patches/remove-javacore.diff
tags/ecj/3.11.0-1~exp1/debian/patches/remove-overrides.diff
tags/ecj/3.11.0-1~exp1/debian/patches/replace-diamond-operators.diff
tags/ecj/3.11.0-1~exp1/debian/patches/series
tags/ecj/3.11.0-1~exp1/debian/rules
tags/ecj/3.11.0-1~exp1/debian/watch
Removed:
tags/ecj/3.11.0-1~exp1/debian/changelog
tags/ecj/3.11.0-1~exp1/debian/control
tags/ecj/3.11.0-1~exp1/debian/patches/gcc-changes.diff
tags/ecj/3.11.0-1~exp1/debian/patches/remove-overrides.diff
tags/ecj/3.11.0-1~exp1/debian/patches/series
tags/ecj/3.11.0-1~exp1/debian/rules
tags/ecj/3.11.0-1~exp1/debian/watch
Log:
[svn-buildpackage] Tagging ecj 3.11.0-1~exp1
Deleted: tags/ecj/3.11.0-1~exp1/debian/changelog
===================================================================
--- trunk/ecj/debian/changelog 2016-05-17 13:41:09 UTC (rev 19062)
+++ tags/ecj/3.11.0-1~exp1/debian/changelog 2016-05-18 19:32:01 UTC (rev 19066)
@@ -1,613 +0,0 @@
-ecj (3.10.2-1) UNRELEASED; urgency=medium
-
- * Team upload.
- * New upstream release (JDT version 4.4.2)
- - Refreshed the patches
- * Standards-Version updated to 3.9.7 (no changes)
- * Use a secure Vcs-Browser URL
-
- -- Emmanuel Bourg <ebourg at apache.org> Fri, 25 Mar 2016 12:39:06 +0100
-
-ecj (3.10.1-2) unstable; urgency=medium
-
- * Build using GCC 5.
-
- -- Matthias Klose <doko at debian.org> Tue, 01 Sep 2015 01:32:26 +0200
-
-ecj (3.10.1-1) unstable; urgency=medium
-
- * Upstream 3.10.1 release (marketing version 4.4.1).
-
- -- Matthias Klose <doko at debian.org> Tue, 30 Sep 2014 16:38:20 +0200
-
-ecj (3.10.1~rc2-1) unstable; urgency=medium
-
- * Upstream 3.10.1 release candidate 2.
- * Update package descriptions.
-
- -- Matthias Klose <doko at debian.org> Sat, 30 Aug 2014 22:30:08 +0200
-
-ecj (3.10.0+3.10.0-2) experimental; urgency=medium
-
- * Fix Bug 438812 - Missing bridge methods in indirect child classes.
- Closes: #753315.
-
- -- Matthias Klose <doko at debian.org> Thu, 21 Aug 2014 14:57:09 +0200
-
-ecj (3.10.0+3.10.0-1) experimental; urgency=medium
-
- * Upload to experimental, unstable has 3.9.0 again (see #753315).
-
- -- Matthias Klose <doko at debian.org> Sat, 05 Jul 2014 16:12:54 +0200
-
-ecj (3.10.0-1) unstable; urgency=medium
-
- * Team upload.
- * New upstream release (built from the R4_4 tag, identifies itself as 3.10.0)
- - Refreshed gcc-changes.diff
- - Added a patch fixing compilation errors caused by @Override annotations
- - Updated the version of the Maven pom
- - Added the new -1.8 option in the manpages
- * debian/control:
- - Removed the recommended dependency on a JRE for libecj-java
- - Added the Homepage and the Vcs-* fields
- * Switch to debhelper level 9
- * Call 'set -e' in the body of the ecj maintainer scripts
- * Fixed a typo in the ecj manpages
- * Added a watch file
- * debian/rules:
- - Renamed the get-source target to get-orig-source and completed
- the script to build the upstream tarball.
- - Removed the option to build with the old ant1.7 package
- - Reduced the number of warnings during the compilation
- - Replace the bundle_version parameter with the actual version
- in message.properties
- * Use XZ compression for the upstream tarball
-
- -- Emmanuel Bourg <ebourg at apache.org> Thu, 26 Jun 2014 17:45:28 +0200
-
-ecj (3.9.0-2) unstable; urgency=medium
-
- * Build using gcj-4.9.
-
- -- Matthias Klose <doko at debian.org> Sat, 03 May 2014 16:46:31 +0200
-
-ecj (3.9.0-1) unstable; urgency=medium
-
- * Update to 4.3.1 (built from the R4_3_1 tag, identifies itself as 3.9.0).
-
- -- Matthias Klose <doko at debian.org> Tue, 10 Dec 2013 15:50:07 +0100
-
-ecj (3.8.2-4) unstable; urgency=low
-
- * Build using gcj-4.8 on all architectures.
-
- -- Matthias Klose <doko at debian.org> Mon, 01 Jul 2013 01:17:16 +0200
-
-ecj (3.8.2-2) unstable; urgency=low
-
- * Build using gcj-4.6 on mips.
-
- -- Matthias Klose <doko at debian.org> Mon, 08 Apr 2013 18:56:06 +0200
-
-ecj (3.8.2-1) unstable; urgency=low
-
- * Update to 3.8.2 (built from the R3_8_2 tag, identifies itself as 3.8.3).
- Supports Java7. Closes: #693441.
- * Remove copyright information from ICU and jsch. Closes: #622296.
-
- -- Matthias Klose <doko at debian.org> Mon, 08 Apr 2013 00:34:31 +0200
-
-ecj (3.5.1-6) unstable; urgency=low
-
- * Allow package to build with gcj-4.6 on ia64.
-
- -- Matthias Klose <doko at debian.org> Sun, 06 Jan 2013 18:54:59 +0100
-
-ecj (3.5.1-5) unstable; urgency=low
-
- * Fix the libgcj so version.
-
- -- Matthias Klose <doko at debian.org> Sun, 06 Jan 2013 17:36:18 +0100
-
-ecj (3.5.1-4) unstable; urgency=low
-
- * Rebuild using GCC-4.7.
-
- -- Matthias Klose <doko at debian.org> Tue, 10 Apr 2012 14:47:52 +0200
-
-ecj (3.5.1-3) unstable; urgency=low
-
- [ James Page ]
- * Add maven artifact deployment to resolve FTBFS for
- tomcat-maven-plugin (LP: #835769):
- - debian/control: added maven-repo-helper to Build-Depends-Indep
- - debian/rules: install maven artifacts, added get-orig-poms target
- to retrieve original pom files
- - debian/libecj-java.poms: POM file locator.
- - debian/poms/ecj.pom: Upstream POM file from Maven repo1.
- - debian/libecj-java.install: removed - install handled by m-r-h.
-
- [ Matthias Klose ]
- * Remove Jerry Haltom and Michael Koch from uploaders.
-
- -- Matthias Klose <doko at debian.org> Wed, 14 Sep 2011 23:27:58 +0200
-
-ecj (3.5.1-2.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * Enable armhf architecture for ecj1 (Closes: #631070)
-
- -- Hector Oron <zumbi at debian.org> Wed, 13 Jul 2011 22:13:12 +0100
-
-ecj (3.5.1-2) unstable; urgency=medium
-
- [ Steve Langasek ]
- * Move ecj1 binary to the multiarch gcc directory so gcj can find it.
- * Create a link to ecj1 in our build directory so that gcj can find it
- for rebootstrapping ecj1.
-
- [ Matthias Klose]
- * Build with default gcj-jdk.
- * ecj1: Provide a compatibility symlink in /usr/lib/gcc/ecj1.
-
- -- Matthias Klose <doko at debian.org> Wed, 08 Jun 2011 19:25:06 +0200
-
-ecj (3.5.1-1) unstable; urgency=low
-
- * Update to the final 3.5.1 release.
- * Update GCCMain.java from rhug/eclipse-gcj.
-
- -- Matthias Klose <doko at debian.org> Sat, 10 Oct 2009 11:18:07 +0200
-
-ecj (3.5+20090820-1) unstable; urgency=low
-
- * Update to the R3_5_maintenance branch.
- - Fixes eclipse #285466, bootstrap error in OpenJDK.
- * Set sections to java.
-
- -- Matthias Klose <doko at debian.org> Thu, 20 Aug 2009 19:34:12 +0200
-
-ecj (3.5-1) unstable; urgency=low
-
- * New upstream version.
- * Update to the R3_5_maintenance branch 20090728.
- * Update GCCMain.java.
- * Build using gcj-4.4-jdk on all architectures.
-
- -- Matthias Klose <doko at debian.org> Tue, 28 Jul 2009 18:55:13 +0200
-
-ecj (3.4.2-4) unstable; urgency=low
-
- * Build using gcj-4.4-jdk on hppa.
-
- -- Matthias Klose <doko at debian.org> Sun, 15 Feb 2009 22:34:28 +0100
-
-ecj (3.4.2-1) unstable; urgency=low
-
- * New upstream version 3.4.2, built from the v_894_R34x tag,
- R3_4_maintenance branch.
-
- -- Matthias Klose <doko at debian.org> Sun, 15 Feb 2009 22:34:28 +0100
-
-ecj (3.3.0+0728-11) unstable; urgency=low
-
- * Build again for alpha.
-
- -- Matthias Klose <doko at debian.org> Sun, 01 Feb 2009 09:31:00 +0100
-
-ecj (3.3.0+0728-10) unstable; urgency=low
-
- * libecj-java: Recommend default-jre-headless | java2-runtime-headless
- instead of java2-runtime.
-
- -- Matthias Klose <doko at debian.org> Sat, 06 Sep 2008 10:52:13 +0000
-
-ecj (3.3.0+0728-9) unstable; urgency=low
-
- * Don't build on alpha, arm, hppa.
-
- -- Matthias Klose <doko at debian.org> Wed, 09 Apr 2008 04:12:54 +0200
-
-ecj (3.3.0+0728-8) unstable; urgency=low
-
- * Fix build failure on alpha.
-
- -- Matthias Klose <doko at debian.org> Thu, 24 Jan 2008 19:58:40 +0100
-
-ecj (3.3.0+0728-7) unstable; urgency=low
-
- * Build using gcj-4.3 on all archs but alpha.
-
- -- Matthias Klose <doko at debian.org> Thu, 24 Jan 2008 19:11:08 +0100
-
-ecj (3.3.0+0728-6) unstable; urgency=low
-
- * Build-depend on libecj-java on arm.
-
- -- Matthias Klose <doko at debian.org> Mon, 14 Jan 2008 22:07:01 +0100
-
-ecj (3.3.0+0728-5) unstable; urgency=medium
-
- * Make ecj architecture dependent, dependencies depend on the jvm used.
- * ecj: Depend on gij-x.y.
-
- -- Matthias Klose <doko at debian.org> Thu, 06 Sep 2007 19:22:58 +0200
-
-ecj (3.3.0+0728-4) unstable; urgency=low
-
- * Fix name of renamed jar file (Michael Koch).
-
- -- Matthias Klose <doko at debian.org> Wed, 05 Sep 2007 00:08:06 +0200
-
-ecj (3.3.0+0728-3) unstable; urgency=medium
-
- * Use ecj-standalone.jar to build the ecj-gcj and ecj1 binaries.
- * ecj-gcj: Depend on ecj. Closes: #440259.
-
- -- Matthias Klose <doko at debian.org> Thu, 30 Aug 2007 23:33:08 +0200
-
-ecj (3.3.0+0728-2) unstable; urgency=low
-
- * Tighten build-dependency on libgcj-bc.
-
- -- Matthias Klose <doko at debian.org> Sat, 25 Aug 2007 20:12:38 +0200
-
-ecj (3.3.0+0728-1) unstable; urgency=medium
-
- * New upstream version, taken from the R3_3_maintenance tag.
- * Build using gcj-4.2 on all architectures except alpha and m68k.
- * Stop building the ecj-bootstrap and ecj-bootstrap-gcj packages.
- * Build a libecj-java-gcj package.
- * Build an ecj1 package on arm, BC-compile ecj1.
- * Update debian/copyright, eclipse is EPL, not CPL anymore.
-
- -- Matthias Klose <doko at debian.org> Sat, 25 Aug 2007 12:35:30 +0200
-
-ecj (3.3.0-2) unstable; urgency=low
-
- * Apply fix for upstream report #195317.
-
- -- Matthias Klose <doko at debian.org> Fri, 20 Jul 2007 12:05:37 +0200
-
-ecj (3.3.0-1) unstable; urgency=low
-
- * New upstream release.
- * Don't reference the transitional bootstrap package in the README.
- Closes: #426887.
- * Split out the library into libecj-java. Closes: #421621.
-
- -- Matthias Klose <doko at ubuntu.com> Sat, 7 Jul 2007 02:13:27 +0200
-
-ecj (3.3~M7-2) unstable; urgency=low
-
- * debian/control: Make ecj and ecj-gcj conflict and replace their
- eclipse-ecj and eclipse-ecj-gcj counterparts. Closes: #421302.
-
- -- Michael Koch <konqueror at gmx.de> Sun, 20 May 2007 09:57:58 -0100
-
-ecj (3.3~M7-1) unstable; urgency=low
-
- * New upstream release.
- - Fixes issues with classes extending java.io.PrintWriter and implementing
- some random interface. Closes: #424504.
- - Removed debian/patches/ecj-square-bracket-classpath.diff.
- Applied upstream.
-
- -- Michael Koch <konqueror at gmx.de> Fri, 18 May 2007 09:32:35 -0100
-
-ecj (3.2.2-2) unstable; urgency=low
-
- * Loosen dependency on gij-4.1, libgcj7-jar. Closes: #421488.
-
- -- Matthias Klose <doko at debian.org> Sun, 29 Apr 2007 22:19:47 +0200
-
-ecj (3.2.2-1) unstable; urgency=low
-
- * Upload to unstable.
-
- -- Matthias Klose <doko at debian.org> Fri, 27 Apr 2007 01:04:45 +0200
-
-ecj (3.2.2-0) experimental; urgency=low
-
- * New upstream version.
- - Update patches.
- * (Build-)depend on gcj generics backport.
- * Build-Conflicts with ecj-bootstrap-gcj (<< 3.2.2).
- * Merge from Ubuntu:
- - Split out patches.
- - Add ecj-square-bracket-classpath.diff.
- - ecj-bootstrap: Add compatibilty script ecj-bootstrap.
- - Install the jar as eclipse-ecj.jar, provide an ecj.jar symlink.
- - Rename source and binary package to ecj.
- - Pass gcj and gcj-dbtool versions to aot-compile.
-
- -- Matthias Klose <doko at debian.org> Sat, 3 Mar 2007 19:37:46 +0100
-
-ecj-bootstrap (3.2.1-6) unstable; urgency=low
-
- * Fix PR java/30585 (-Werror and -Wall not working). Taken from the rhug
- repository.
-
- -- Matthias Klose <doko at debian.org> Sat, 3 Feb 2007 14:16:47 +0100
-
-ecj-bootstrap (3.2.1-5) unstable; urgency=low
-
- * debian/control: Call it a "standalone" version, not a "bootstrap"
- version. The package is used as the compiler in java-gcj-compat-dev
- as well. See also #396170.
-
- -- Matthias Klose <doko at debian.org> Thu, 11 Jan 2007 20:44:40 +0100
-
-ecj-bootstrap (3.2.1-4) unstable; urgency=medium
-
- * Refactor batch/org/eclipse/jdt/internal/compiler/batch/Main.java,
- add batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java,
- needed to bootstrap GCC-4.3.
-
- -- Matthias Klose <doko at debian.org> Tue, 9 Jan 2007 00:09:22 +0100
-
-ecj-bootstrap (3.2.1-3) unstable; urgency=low
-
- * Add missing build dependency.
-
- -- Matthias Klose <doko at debian.org> Sun, 8 Oct 2006 01:40:00 +0200
-
-ecj-bootstrap (3.2.1-2) unstable; urgency=low
-
- * Add 1.6 compatibility in package description.
- * Use own copy of aot-compile to build with less memory resources
- on arm and m68k.
- * Build the standalone binary without -fjni -findirect-dispatch.
-
- -- Matthias Klose <doko at debian.org> Sat, 7 Oct 2006 23:38:47 +0200
-
-ecj-bootstrap (3.2.1-1) unstable; urgency=medium
-
- * New upstream version.
- * ecj-bootstrap-gcj: Add postrm script.
-
- -- Matthias Klose <doko at debian.org> Tue, 3 Oct 2006 09:35:39 +0200
-
-ecj-bootstrap (3.2-3) unstable; urgency=low
-
- * Install classmap db in /usr/share/gcj/classmap.db, install jar.so
- in /usr/lib/gcj.
- * ecj-bootstrap-gcj.postinst: Use rebuild-gcj-db.
- * Build depend on gcj-4.1 (>= 4.1.1-13).
-
- -- Matthias Klose <doko at debian.org> Sat, 2 Sep 2006 13:55:21 +0000
-
-ecj-bootstrap (3.2-2) experimental; urgency=low
-
- * Build using the gcj backport from experimental.
- * Do not build the binary ecj.
-
- -- Matthias Klose <doko at debian.org> Sun, 13 Aug 2006 13:01:45 +0200
-
-ecj-bootstrap (3.2-1) unstable; urgency=low
-
- * New upstream version.
-
- -- Matthias Klose <doko at debian.org> Mon, 31 Jul 2006 18:16:52 +0000
-
-ecj-bootstrap (3.1.2-6) unstable; urgency=low
-
- * ecj-bootstrap-gcj: Do not register an alternative for ecj.
- * ecj-bootstrap: Use ecj-bootstrap-gcj, if available.
- * The above changes set the bootclasspath to /usr/share/java/libgcj-4.1.jar,
- if no bootclasspath is set. Closes: #361608, #361806.
- * Do not try to rebuild the jar file using the gij on arm and m68k.
-
- -- Matthias Klose <doko at debian.org> Thu, 1 Jun 2006 22:55:00 +0200
-
-ecj-bootstrap (3.1.2-5) unstable; urgency=low
-
- * Updated Standards-Version to 3.7.2. No changes needed.
-
- -- Michael Koch <konqueror at gmx.de> Sat, 6 May 2006 16:25:40 +0000
-
-ecj-bootstrap (3.1.2-4) unstable; urgency=low
-
- * Build using gij-4.1/gcj-4.1.
- * Rebuild using ecj on all architectures.
- * Remove conflict on virtual package ecj.
-
- -- Matthias Klose <doko at debian.org> Sat, 1 Apr 2006 11:29:03 +0000
-
-ecj-bootstrap (3.1.2-3) experimental; urgency=low
-
- * Build using gcj-4.1, upload to experimental.
-
- -- Matthias Klose <doko at debian.org> Sat, 28 Jan 2006 08:35:09 +0000
-
-ecj-bootstrap (3.1.2-2ubuntu3) dapper; urgency=low
-
- * Use gij-4.1 in the package scripts.
-
- -- Matthias Klose <doko at ubuntu.com> Sun, 26 Feb 2006 21:00:44 +0000
-
-ecj-bootstrap (3.1.2-2ubuntu2) dapper; urgency=low
-
- * Build using gcj-4.1.
-
- -- Matthias Klose <doko at ubuntu.com> Sun, 19 Feb 2006 01:07:40 +0000
-
-ecj-bootstrap (3.1.2-2build1) dapper; urgency=low
-
- * Require gcj-4.0.2-9 to build.
-
- -- Matthias Klose <doko at ubuntu.com> Thu, 16 Feb 2006 03:18:22 +0000
-
-ecj-bootstrap (3.1.2-2) unstable; urgency=low
-
- * Set the bootclasspath to /usr/share/java/libgcj-4.0.jar, if not called
- with the -bootclasspath and /usr/lib/jvm/java-gcj/jre/lib/rt.jar does
- not exist (java-gcj-compat not installed). Closes: #350542.
-
- -- Matthias Klose <doko at debian.org> Thu, 9 Feb 2006 16:33:45 +0000
-
-ecj-bootstrap (3.1.2-1) unstable; urgency=low
-
- * New upstream version.
-
- -- Matthias Klose <doko at debian.org> Sat, 28 Jan 2006 08:09:25 +0000
-
-ecj-bootstrap (3.1.1-4) unstable; urgency=low
-
- * Depend on libgcj6-jar instead of libgcj6-common.
-
- -- Matthias Klose <doko at debian.org> Thu, 5 Jan 2006 19:14:49 +0000
-
-ecj-bootstrap (3.1.1-3.1) unstable; urgency=low
-
- [ Arnaud Fontaine ]
- * NMU: added a backslash at the end of the first line of
- 'debian/ecj-bootstrap-gcj.postinst'. Closes: #335031.
-
- -- Christoph Berg <myon at debian.org> Sat, 29 Oct 2005 12:09:06 +0200
-
-ecj-bootstrap (3.1.1-3) unstable; urgency=low
-
- * On arm and hppa, don't rebuild ecj using gij.
-
- -- Matthias Klose <doko at debian.org> Thu, 20 Oct 2005 19:08:20 +0000
-
-ecj-bootstrap (3.1.1-2) unstable; urgency=low
-
- * Add a javac alternative (priority higher than gcj).
- * ecj-bootstrap-gcj: Add slave alternative for the man page.
- Addresses #328743.
-
- -- Matthias Klose <doko at debian.org> Thu, 20 Oct 2005 00:11:27 +0200
-
-ecj-bootstrap (3.1.1-1) unstable; urgency=low
-
- * New upstream version.
- * Remove bootstrap workaround, tighten build dependency to gcj-4.0.2.
- * Fix symlink to manpage (closes: #330080).
-
- -- Matthias Klose <doko at debian.org> Sat, 1 Oct 2005 18:32:05 +0200
-
-ecj-bootstrap (3.0.93-1) unstable; urgency=low
-
- * New upstream version (3.1rc3). Taken from the eclipse-3.1 package,
- file ecj.zip.
-
- -- Matthias Klose <doko at debian.org> Wed, 14 Sep 2005 12:54:56 +0000
-
-ecj-bootstrap (3.0.1-4ubuntu6) breezy; urgency=low
-
- * Only build one java file per gcj call, ignore errors on first
- build. Closes: #327161, Ubuntu 14938.
- * Add more error checking in debian/rules.
- * Install manual page for ecj alternative as well.
-
- -- Matthias Klose <doko at ubuntu.com> Wed, 14 Sep 2005 14:19:57 +0200
-
-ecj-bootstrap (3.0.1-4ubuntu5) breezy; urgency=low
-
- * Reenable ecj-bootstrap-gcj. (Build-)depend on fixed gcj-4.0.
-
- -- Matthias Klose <doko at ubuntu.com> Sat, 2 Jul 2005 08:25:02 +0000
-
-ecj-bootstrap (3.0.1-4ubuntu4) breezy; urgency=low
-
- * Temporarily disable building ecj-bootstrap-gcj. FTBFS on amd64. Unbreak
- ant's dependency on ecj (>= 3.0.1-4ubuntu2).
-
- -- Matthias Klose <doko at ubuntu.com> Thu, 30 Jun 2005 09:59:20 +0000
-
-ecj-bootstrap (3.0.1-4ubuntu3) breezy; urgency=low
-
- * Include manpages for ecj-bootstrap and ecj-bootstrap-gcj (closes: #316641).
-
- -- Jeff Bailey <jbailey at ubuntu.com> Wed, 29 Jun 2005 14:52:57 +0000
-
-ecj-bootstrap (3.0.1-4ubuntu2) breezy; urgency=low
-
- * Merged ecj-adapter.jar into ecj.jar in preparation for Eclipse 3.1
- upgrade. Upstream has laid out ecj in this fashion.
- * Removed java-gcj-compat bits which were unneccassary.
- * Added native versions of the ecj binary and ecj.jar in a new package
- named ecj-bootstrap-gcj. This increases the compilation speed of
- packages built with this copy of ecj.
- * Added new alternatives for /usr/bin/ecj for the native version.
- * First package successfully creating a classmap.db.
-
- -- Jerry Haltom <wasabi at larvalstage.net> Tue, 14 Jun 2005 21:38:29 -0500
-
-ecj-bootstrap (3.0.1-4ubuntu1) breezy; urgency=low
-
- * Add a /usr/bin/ecj binary.
-
- -- Matthias Klose <doko at ubuntu.com> Sat, 11 Jun 2005 16:57:27 +0000
-
-ecj-bootstrap (3.0.1-3) experimental; urgency=low
-
- * Synchronize.
-
- -- Matthias Klose <doko at debian.org> Wed, 1 Jun 2005 23:24:48 +0200
-
-ecj-bootstrap (3.0.1-1ubuntu6) breezy; urgency=low
-
- * Now provides 'ecj' which will also be provided by the future
- eclipse-ecj package built from full Eclipse source.
- * Removed universe/ from Section.
- * Now refering to libgcj-4.0.jar instead of 4.0.0.jar to handle
- changing versions better.
-
- -- Jerry Haltom <wasabi at larvalstage.net> Wed, 1 Jun 2005 14:12:16 -0500
-
-ecj-bootstrap (3.0.1-2) experimental; urgency=low
-
- * Upload to experimental, set maintainer to Debian Java Matainers,
- request by Michael Koch.
-
- -- Matthias Klose <doko at debian.org> Sun, 22 May 2005 15:53:07 +0000
-
-ecj-bootstrap (3.0.1-1ubuntu5) hoary; urgency=low
-
- * Fixed path to ant.jar.
-
- -- Jerry Haltom <wasabi at larvalstage.net> Mon, 28 Mar 2005 20:17:03 -0600
-
-ecj-bootstrap (3.0.1-1ubuntu4) hoary; urgency=low
-
- * Added build of Ant adapter. This introduces a circular dependency
- on ecj-bootstrap and Ant.
-
- -- Jerry Haltom <wasabi at larvalstage.net> Sun, 27 Mar 2005 22:51:13 -0600
-
-ecj-bootstrap (3.0.1-1ubuntu3) hoary; urgency=low
-
- * Added missing dependency on libgcj6-common.
-
- -- Jerry Haltom <wasabi at larvalstage.net> Wed, 23 Feb 2005 22:45:00 -0600
-
-ecj-bootstrap (3.0.1-1ubuntu2) hoary; urgency=low
-
- * Removed argument modification from ecj and moved it to ecj-wrapper in the
- style of gcj-wrapper.
- * Jeff Bailey corrected the Posix-compliant argument expansion in
- ecj-wrapper with the help of David Weinehall.
- * ecj now rebuilds with itself as a sanity test.
-
- -- Jerry Haltom <wasabi at larvalstage.net> Mon, 14 Feb 2005 20:34:25 -0600
-
-ecj-bootstrap (3.0.1-1ubuntu1) hoary; urgency=low
-
- * First upload to Ubuntu.
-
- * Tighten build deps. Use "ecj" instead of "ecj-bootstrap" to
- allow ant to depend on ecj | ecj-bootstrap.
-
- * Posixify wrapper
-
- -- Jeff Bailey <jbailey at ubuntu.com> Fri, 11 Feb 2005 20:37:21 +0000
-
-ecj-bootstrap (3.0.1-0) unstable; urgency=low
-
- * Initial release.
-
- -- Jerry Haltom <wasabi at larvalstage.net> Wed, 09 Feb 2005 19:36:07 -0600
Copied: tags/ecj/3.11.0-1~exp1/debian/changelog (from rev 19065, trunk/ecj/debian/changelog)
===================================================================
--- tags/ecj/3.11.0-1~exp1/debian/changelog (rev 0)
+++ tags/ecj/3.11.0-1~exp1/debian/changelog 2016-05-18 19:32:01 UTC (rev 19066)
@@ -0,0 +1,613 @@
+ecj (3.11.0-1~exp1) experimental; urgency=medium
+
+ * Team upload.
+ * New upstream release (built from the R4_5 tag, identifies itself as 3.11.0)
+ - Refreshed the patches
+ * Standards-Version updated to 3.9.8 (no changes)
+ * Use a secure Vcs-Browser URL
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 18 May 2016 18:12:58 +0200
+
+ecj (3.10.1-2) unstable; urgency=medium
+
+ * Build using GCC 5.
+
+ -- Matthias Klose <doko at debian.org> Tue, 01 Sep 2015 01:32:26 +0200
+
+ecj (3.10.1-1) unstable; urgency=medium
+
+ * Upstream 3.10.1 release (marketing version 4.4.1).
+
+ -- Matthias Klose <doko at debian.org> Tue, 30 Sep 2014 16:38:20 +0200
+
+ecj (3.10.1~rc2-1) unstable; urgency=medium
+
+ * Upstream 3.10.1 release candidate 2.
+ * Update package descriptions.
+
+ -- Matthias Klose <doko at debian.org> Sat, 30 Aug 2014 22:30:08 +0200
+
+ecj (3.10.0+3.10.0-2) experimental; urgency=medium
+
+ * Fix Bug 438812 - Missing bridge methods in indirect child classes.
+ Closes: #753315.
+
+ -- Matthias Klose <doko at debian.org> Thu, 21 Aug 2014 14:57:09 +0200
+
+ecj (3.10.0+3.10.0-1) experimental; urgency=medium
+
+ * Upload to experimental, unstable has 3.9.0 again (see #753315).
+
+ -- Matthias Klose <doko at debian.org> Sat, 05 Jul 2014 16:12:54 +0200
+
+ecj (3.10.0-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release (built from the R4_4 tag, identifies itself as 3.10.0)
+ - Refreshed gcc-changes.diff
+ - Added a patch fixing compilation errors caused by @Override annotations
+ - Updated the version of the Maven pom
+ - Added the new -1.8 option in the manpages
+ * debian/control:
+ - Removed the recommended dependency on a JRE for libecj-java
+ - Added the Homepage and the Vcs-* fields
+ * Switch to debhelper level 9
+ * Call 'set -e' in the body of the ecj maintainer scripts
+ * Fixed a typo in the ecj manpages
+ * Added a watch file
+ * debian/rules:
+ - Renamed the get-source target to get-orig-source and completed
+ the script to build the upstream tarball.
+ - Removed the option to build with the old ant1.7 package
+ - Reduced the number of warnings during the compilation
+ - Replace the bundle_version parameter with the actual version
+ in message.properties
+ * Use XZ compression for the upstream tarball
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 26 Jun 2014 17:45:28 +0200
+
+ecj (3.9.0-2) unstable; urgency=medium
+
+ * Build using gcj-4.9.
+
+ -- Matthias Klose <doko at debian.org> Sat, 03 May 2014 16:46:31 +0200
+
+ecj (3.9.0-1) unstable; urgency=medium
+
+ * Update to 4.3.1 (built from the R4_3_1 tag, identifies itself as 3.9.0).
+
+ -- Matthias Klose <doko at debian.org> Tue, 10 Dec 2013 15:50:07 +0100
+
+ecj (3.8.2-4) unstable; urgency=low
+
+ * Build using gcj-4.8 on all architectures.
+
+ -- Matthias Klose <doko at debian.org> Mon, 01 Jul 2013 01:17:16 +0200
+
+ecj (3.8.2-2) unstable; urgency=low
+
+ * Build using gcj-4.6 on mips.
+
+ -- Matthias Klose <doko at debian.org> Mon, 08 Apr 2013 18:56:06 +0200
+
+ecj (3.8.2-1) unstable; urgency=low
+
+ * Update to 3.8.2 (built from the R3_8_2 tag, identifies itself as 3.8.3).
+ Supports Java7. Closes: #693441.
+ * Remove copyright information from ICU and jsch. Closes: #622296.
+
+ -- Matthias Klose <doko at debian.org> Mon, 08 Apr 2013 00:34:31 +0200
+
+ecj (3.5.1-6) unstable; urgency=low
+
+ * Allow package to build with gcj-4.6 on ia64.
+
+ -- Matthias Klose <doko at debian.org> Sun, 06 Jan 2013 18:54:59 +0100
+
+ecj (3.5.1-5) unstable; urgency=low
+
+ * Fix the libgcj so version.
+
+ -- Matthias Klose <doko at debian.org> Sun, 06 Jan 2013 17:36:18 +0100
+
+ecj (3.5.1-4) unstable; urgency=low
+
+ * Rebuild using GCC-4.7.
+
+ -- Matthias Klose <doko at debian.org> Tue, 10 Apr 2012 14:47:52 +0200
+
+ecj (3.5.1-3) unstable; urgency=low
+
+ [ James Page ]
+ * Add maven artifact deployment to resolve FTBFS for
+ tomcat-maven-plugin (LP: #835769):
+ - debian/control: added maven-repo-helper to Build-Depends-Indep
+ - debian/rules: install maven artifacts, added get-orig-poms target
+ to retrieve original pom files
+ - debian/libecj-java.poms: POM file locator.
+ - debian/poms/ecj.pom: Upstream POM file from Maven repo1.
+ - debian/libecj-java.install: removed - install handled by m-r-h.
+
+ [ Matthias Klose ]
+ * Remove Jerry Haltom and Michael Koch from uploaders.
+
+ -- Matthias Klose <doko at debian.org> Wed, 14 Sep 2011 23:27:58 +0200
+
+ecj (3.5.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Enable armhf architecture for ecj1 (Closes: #631070)
+
+ -- Hector Oron <zumbi at debian.org> Wed, 13 Jul 2011 22:13:12 +0100
+
+ecj (3.5.1-2) unstable; urgency=medium
+
+ [ Steve Langasek ]
+ * Move ecj1 binary to the multiarch gcc directory so gcj can find it.
+ * Create a link to ecj1 in our build directory so that gcj can find it
+ for rebootstrapping ecj1.
+
+ [ Matthias Klose]
+ * Build with default gcj-jdk.
+ * ecj1: Provide a compatibility symlink in /usr/lib/gcc/ecj1.
+
+ -- Matthias Klose <doko at debian.org> Wed, 08 Jun 2011 19:25:06 +0200
+
+ecj (3.5.1-1) unstable; urgency=low
+
+ * Update to the final 3.5.1 release.
+ * Update GCCMain.java from rhug/eclipse-gcj.
+
+ -- Matthias Klose <doko at debian.org> Sat, 10 Oct 2009 11:18:07 +0200
+
+ecj (3.5+20090820-1) unstable; urgency=low
+
+ * Update to the R3_5_maintenance branch.
+ - Fixes eclipse #285466, bootstrap error in OpenJDK.
+ * Set sections to java.
+
+ -- Matthias Klose <doko at debian.org> Thu, 20 Aug 2009 19:34:12 +0200
+
+ecj (3.5-1) unstable; urgency=low
+
+ * New upstream version.
+ * Update to the R3_5_maintenance branch 20090728.
+ * Update GCCMain.java.
+ * Build using gcj-4.4-jdk on all architectures.
+
+ -- Matthias Klose <doko at debian.org> Tue, 28 Jul 2009 18:55:13 +0200
+
+ecj (3.4.2-4) unstable; urgency=low
+
+ * Build using gcj-4.4-jdk on hppa.
+
+ -- Matthias Klose <doko at debian.org> Sun, 15 Feb 2009 22:34:28 +0100
+
+ecj (3.4.2-1) unstable; urgency=low
+
+ * New upstream version 3.4.2, built from the v_894_R34x tag,
+ R3_4_maintenance branch.
+
+ -- Matthias Klose <doko at debian.org> Sun, 15 Feb 2009 22:34:28 +0100
+
+ecj (3.3.0+0728-11) unstable; urgency=low
+
+ * Build again for alpha.
+
+ -- Matthias Klose <doko at debian.org> Sun, 01 Feb 2009 09:31:00 +0100
+
+ecj (3.3.0+0728-10) unstable; urgency=low
+
+ * libecj-java: Recommend default-jre-headless | java2-runtime-headless
+ instead of java2-runtime.
+
+ -- Matthias Klose <doko at debian.org> Sat, 06 Sep 2008 10:52:13 +0000
+
+ecj (3.3.0+0728-9) unstable; urgency=low
+
+ * Don't build on alpha, arm, hppa.
+
+ -- Matthias Klose <doko at debian.org> Wed, 09 Apr 2008 04:12:54 +0200
+
+ecj (3.3.0+0728-8) unstable; urgency=low
+
+ * Fix build failure on alpha.
+
+ -- Matthias Klose <doko at debian.org> Thu, 24 Jan 2008 19:58:40 +0100
+
+ecj (3.3.0+0728-7) unstable; urgency=low
+
+ * Build using gcj-4.3 on all archs but alpha.
+
+ -- Matthias Klose <doko at debian.org> Thu, 24 Jan 2008 19:11:08 +0100
+
+ecj (3.3.0+0728-6) unstable; urgency=low
+
+ * Build-depend on libecj-java on arm.
+
+ -- Matthias Klose <doko at debian.org> Mon, 14 Jan 2008 22:07:01 +0100
+
+ecj (3.3.0+0728-5) unstable; urgency=medium
+
+ * Make ecj architecture dependent, dependencies depend on the jvm used.
+ * ecj: Depend on gij-x.y.
+
+ -- Matthias Klose <doko at debian.org> Thu, 06 Sep 2007 19:22:58 +0200
+
+ecj (3.3.0+0728-4) unstable; urgency=low
+
+ * Fix name of renamed jar file (Michael Koch).
+
+ -- Matthias Klose <doko at debian.org> Wed, 05 Sep 2007 00:08:06 +0200
+
+ecj (3.3.0+0728-3) unstable; urgency=medium
+
+ * Use ecj-standalone.jar to build the ecj-gcj and ecj1 binaries.
+ * ecj-gcj: Depend on ecj. Closes: #440259.
+
+ -- Matthias Klose <doko at debian.org> Thu, 30 Aug 2007 23:33:08 +0200
+
+ecj (3.3.0+0728-2) unstable; urgency=low
+
+ * Tighten build-dependency on libgcj-bc.
+
+ -- Matthias Klose <doko at debian.org> Sat, 25 Aug 2007 20:12:38 +0200
+
+ecj (3.3.0+0728-1) unstable; urgency=medium
+
+ * New upstream version, taken from the R3_3_maintenance tag.
+ * Build using gcj-4.2 on all architectures except alpha and m68k.
+ * Stop building the ecj-bootstrap and ecj-bootstrap-gcj packages.
+ * Build a libecj-java-gcj package.
+ * Build an ecj1 package on arm, BC-compile ecj1.
+ * Update debian/copyright, eclipse is EPL, not CPL anymore.
+
+ -- Matthias Klose <doko at debian.org> Sat, 25 Aug 2007 12:35:30 +0200
+
+ecj (3.3.0-2) unstable; urgency=low
+
+ * Apply fix for upstream report #195317.
+
+ -- Matthias Klose <doko at debian.org> Fri, 20 Jul 2007 12:05:37 +0200
+
+ecj (3.3.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Don't reference the transitional bootstrap package in the README.
+ Closes: #426887.
+ * Split out the library into libecj-java. Closes: #421621.
+
+ -- Matthias Klose <doko at ubuntu.com> Sat, 7 Jul 2007 02:13:27 +0200
+
+ecj (3.3~M7-2) unstable; urgency=low
+
+ * debian/control: Make ecj and ecj-gcj conflict and replace their
+ eclipse-ecj and eclipse-ecj-gcj counterparts. Closes: #421302.
+
+ -- Michael Koch <konqueror at gmx.de> Sun, 20 May 2007 09:57:58 -0100
+
+ecj (3.3~M7-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fixes issues with classes extending java.io.PrintWriter and implementing
+ some random interface. Closes: #424504.
+ - Removed debian/patches/ecj-square-bracket-classpath.diff.
+ Applied upstream.
+
+ -- Michael Koch <konqueror at gmx.de> Fri, 18 May 2007 09:32:35 -0100
+
+ecj (3.2.2-2) unstable; urgency=low
+
+ * Loosen dependency on gij-4.1, libgcj7-jar. Closes: #421488.
+
+ -- Matthias Klose <doko at debian.org> Sun, 29 Apr 2007 22:19:47 +0200
+
+ecj (3.2.2-1) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Matthias Klose <doko at debian.org> Fri, 27 Apr 2007 01:04:45 +0200
+
+ecj (3.2.2-0) experimental; urgency=low
+
+ * New upstream version.
+ - Update patches.
+ * (Build-)depend on gcj generics backport.
+ * Build-Conflicts with ecj-bootstrap-gcj (<< 3.2.2).
+ * Merge from Ubuntu:
+ - Split out patches.
+ - Add ecj-square-bracket-classpath.diff.
+ - ecj-bootstrap: Add compatibilty script ecj-bootstrap.
+ - Install the jar as eclipse-ecj.jar, provide an ecj.jar symlink.
+ - Rename source and binary package to ecj.
+ - Pass gcj and gcj-dbtool versions to aot-compile.
+
+ -- Matthias Klose <doko at debian.org> Sat, 3 Mar 2007 19:37:46 +0100
+
+ecj-bootstrap (3.2.1-6) unstable; urgency=low
+
+ * Fix PR java/30585 (-Werror and -Wall not working). Taken from the rhug
+ repository.
+
+ -- Matthias Klose <doko at debian.org> Sat, 3 Feb 2007 14:16:47 +0100
+
+ecj-bootstrap (3.2.1-5) unstable; urgency=low
+
+ * debian/control: Call it a "standalone" version, not a "bootstrap"
+ version. The package is used as the compiler in java-gcj-compat-dev
+ as well. See also #396170.
+
+ -- Matthias Klose <doko at debian.org> Thu, 11 Jan 2007 20:44:40 +0100
+
+ecj-bootstrap (3.2.1-4) unstable; urgency=medium
+
+ * Refactor batch/org/eclipse/jdt/internal/compiler/batch/Main.java,
+ add batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java,
+ needed to bootstrap GCC-4.3.
+
+ -- Matthias Klose <doko at debian.org> Tue, 9 Jan 2007 00:09:22 +0100
+
+ecj-bootstrap (3.2.1-3) unstable; urgency=low
+
+ * Add missing build dependency.
+
+ -- Matthias Klose <doko at debian.org> Sun, 8 Oct 2006 01:40:00 +0200
+
+ecj-bootstrap (3.2.1-2) unstable; urgency=low
+
+ * Add 1.6 compatibility in package description.
+ * Use own copy of aot-compile to build with less memory resources
+ on arm and m68k.
+ * Build the standalone binary without -fjni -findirect-dispatch.
+
+ -- Matthias Klose <doko at debian.org> Sat, 7 Oct 2006 23:38:47 +0200
+
+ecj-bootstrap (3.2.1-1) unstable; urgency=medium
+
+ * New upstream version.
+ * ecj-bootstrap-gcj: Add postrm script.
+
+ -- Matthias Klose <doko at debian.org> Tue, 3 Oct 2006 09:35:39 +0200
+
+ecj-bootstrap (3.2-3) unstable; urgency=low
+
+ * Install classmap db in /usr/share/gcj/classmap.db, install jar.so
+ in /usr/lib/gcj.
+ * ecj-bootstrap-gcj.postinst: Use rebuild-gcj-db.
+ * Build depend on gcj-4.1 (>= 4.1.1-13).
+
+ -- Matthias Klose <doko at debian.org> Sat, 2 Sep 2006 13:55:21 +0000
+
+ecj-bootstrap (3.2-2) experimental; urgency=low
+
+ * Build using the gcj backport from experimental.
+ * Do not build the binary ecj.
+
+ -- Matthias Klose <doko at debian.org> Sun, 13 Aug 2006 13:01:45 +0200
+
+ecj-bootstrap (3.2-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Mon, 31 Jul 2006 18:16:52 +0000
+
+ecj-bootstrap (3.1.2-6) unstable; urgency=low
+
+ * ecj-bootstrap-gcj: Do not register an alternative for ecj.
+ * ecj-bootstrap: Use ecj-bootstrap-gcj, if available.
+ * The above changes set the bootclasspath to /usr/share/java/libgcj-4.1.jar,
+ if no bootclasspath is set. Closes: #361608, #361806.
+ * Do not try to rebuild the jar file using the gij on arm and m68k.
+
+ -- Matthias Klose <doko at debian.org> Thu, 1 Jun 2006 22:55:00 +0200
+
+ecj-bootstrap (3.1.2-5) unstable; urgency=low
+
+ * Updated Standards-Version to 3.7.2. No changes needed.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 6 May 2006 16:25:40 +0000
+
+ecj-bootstrap (3.1.2-4) unstable; urgency=low
+
+ * Build using gij-4.1/gcj-4.1.
+ * Rebuild using ecj on all architectures.
+ * Remove conflict on virtual package ecj.
+
+ -- Matthias Klose <doko at debian.org> Sat, 1 Apr 2006 11:29:03 +0000
+
+ecj-bootstrap (3.1.2-3) experimental; urgency=low
+
+ * Build using gcj-4.1, upload to experimental.
+
+ -- Matthias Klose <doko at debian.org> Sat, 28 Jan 2006 08:35:09 +0000
+
+ecj-bootstrap (3.1.2-2ubuntu3) dapper; urgency=low
+
+ * Use gij-4.1 in the package scripts.
+
+ -- Matthias Klose <doko at ubuntu.com> Sun, 26 Feb 2006 21:00:44 +0000
+
+ecj-bootstrap (3.1.2-2ubuntu2) dapper; urgency=low
+
+ * Build using gcj-4.1.
+
+ -- Matthias Klose <doko at ubuntu.com> Sun, 19 Feb 2006 01:07:40 +0000
+
+ecj-bootstrap (3.1.2-2build1) dapper; urgency=low
+
+ * Require gcj-4.0.2-9 to build.
+
+ -- Matthias Klose <doko at ubuntu.com> Thu, 16 Feb 2006 03:18:22 +0000
+
+ecj-bootstrap (3.1.2-2) unstable; urgency=low
+
+ * Set the bootclasspath to /usr/share/java/libgcj-4.0.jar, if not called
+ with the -bootclasspath and /usr/lib/jvm/java-gcj/jre/lib/rt.jar does
+ not exist (java-gcj-compat not installed). Closes: #350542.
+
+ -- Matthias Klose <doko at debian.org> Thu, 9 Feb 2006 16:33:45 +0000
+
+ecj-bootstrap (3.1.2-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Sat, 28 Jan 2006 08:09:25 +0000
+
+ecj-bootstrap (3.1.1-4) unstable; urgency=low
+
+ * Depend on libgcj6-jar instead of libgcj6-common.
+
+ -- Matthias Klose <doko at debian.org> Thu, 5 Jan 2006 19:14:49 +0000
+
+ecj-bootstrap (3.1.1-3.1) unstable; urgency=low
+
+ [ Arnaud Fontaine ]
+ * NMU: added a backslash at the end of the first line of
+ 'debian/ecj-bootstrap-gcj.postinst'. Closes: #335031.
+
+ -- Christoph Berg <myon at debian.org> Sat, 29 Oct 2005 12:09:06 +0200
+
+ecj-bootstrap (3.1.1-3) unstable; urgency=low
+
+ * On arm and hppa, don't rebuild ecj using gij.
+
+ -- Matthias Klose <doko at debian.org> Thu, 20 Oct 2005 19:08:20 +0000
+
+ecj-bootstrap (3.1.1-2) unstable; urgency=low
+
+ * Add a javac alternative (priority higher than gcj).
+ * ecj-bootstrap-gcj: Add slave alternative for the man page.
+ Addresses #328743.
+
+ -- Matthias Klose <doko at debian.org> Thu, 20 Oct 2005 00:11:27 +0200
+
+ecj-bootstrap (3.1.1-1) unstable; urgency=low
+
+ * New upstream version.
+ * Remove bootstrap workaround, tighten build dependency to gcj-4.0.2.
+ * Fix symlink to manpage (closes: #330080).
+
+ -- Matthias Klose <doko at debian.org> Sat, 1 Oct 2005 18:32:05 +0200
+
+ecj-bootstrap (3.0.93-1) unstable; urgency=low
+
+ * New upstream version (3.1rc3). Taken from the eclipse-3.1 package,
+ file ecj.zip.
+
+ -- Matthias Klose <doko at debian.org> Wed, 14 Sep 2005 12:54:56 +0000
+
+ecj-bootstrap (3.0.1-4ubuntu6) breezy; urgency=low
+
+ * Only build one java file per gcj call, ignore errors on first
+ build. Closes: #327161, Ubuntu 14938.
+ * Add more error checking in debian/rules.
+ * Install manual page for ecj alternative as well.
+
+ -- Matthias Klose <doko at ubuntu.com> Wed, 14 Sep 2005 14:19:57 +0200
+
+ecj-bootstrap (3.0.1-4ubuntu5) breezy; urgency=low
+
+ * Reenable ecj-bootstrap-gcj. (Build-)depend on fixed gcj-4.0.
+
+ -- Matthias Klose <doko at ubuntu.com> Sat, 2 Jul 2005 08:25:02 +0000
+
+ecj-bootstrap (3.0.1-4ubuntu4) breezy; urgency=low
+
+ * Temporarily disable building ecj-bootstrap-gcj. FTBFS on amd64. Unbreak
+ ant's dependency on ecj (>= 3.0.1-4ubuntu2).
+
+ -- Matthias Klose <doko at ubuntu.com> Thu, 30 Jun 2005 09:59:20 +0000
+
+ecj-bootstrap (3.0.1-4ubuntu3) breezy; urgency=low
+
+ * Include manpages for ecj-bootstrap and ecj-bootstrap-gcj (closes: #316641).
+
+ -- Jeff Bailey <jbailey at ubuntu.com> Wed, 29 Jun 2005 14:52:57 +0000
+
+ecj-bootstrap (3.0.1-4ubuntu2) breezy; urgency=low
+
+ * Merged ecj-adapter.jar into ecj.jar in preparation for Eclipse 3.1
+ upgrade. Upstream has laid out ecj in this fashion.
+ * Removed java-gcj-compat bits which were unneccassary.
+ * Added native versions of the ecj binary and ecj.jar in a new package
+ named ecj-bootstrap-gcj. This increases the compilation speed of
+ packages built with this copy of ecj.
+ * Added new alternatives for /usr/bin/ecj for the native version.
+ * First package successfully creating a classmap.db.
+
+ -- Jerry Haltom <wasabi at larvalstage.net> Tue, 14 Jun 2005 21:38:29 -0500
+
+ecj-bootstrap (3.0.1-4ubuntu1) breezy; urgency=low
+
+ * Add a /usr/bin/ecj binary.
+
+ -- Matthias Klose <doko at ubuntu.com> Sat, 11 Jun 2005 16:57:27 +0000
+
+ecj-bootstrap (3.0.1-3) experimental; urgency=low
+
+ * Synchronize.
+
+ -- Matthias Klose <doko at debian.org> Wed, 1 Jun 2005 23:24:48 +0200
+
+ecj-bootstrap (3.0.1-1ubuntu6) breezy; urgency=low
+
+ * Now provides 'ecj' which will also be provided by the future
+ eclipse-ecj package built from full Eclipse source.
+ * Removed universe/ from Section.
+ * Now refering to libgcj-4.0.jar instead of 4.0.0.jar to handle
+ changing versions better.
+
+ -- Jerry Haltom <wasabi at larvalstage.net> Wed, 1 Jun 2005 14:12:16 -0500
+
+ecj-bootstrap (3.0.1-2) experimental; urgency=low
+
+ * Upload to experimental, set maintainer to Debian Java Matainers,
+ request by Michael Koch.
+
+ -- Matthias Klose <doko at debian.org> Sun, 22 May 2005 15:53:07 +0000
+
+ecj-bootstrap (3.0.1-1ubuntu5) hoary; urgency=low
+
+ * Fixed path to ant.jar.
+
+ -- Jerry Haltom <wasabi at larvalstage.net> Mon, 28 Mar 2005 20:17:03 -0600
+
+ecj-bootstrap (3.0.1-1ubuntu4) hoary; urgency=low
+
+ * Added build of Ant adapter. This introduces a circular dependency
+ on ecj-bootstrap and Ant.
+
+ -- Jerry Haltom <wasabi at larvalstage.net> Sun, 27 Mar 2005 22:51:13 -0600
+
+ecj-bootstrap (3.0.1-1ubuntu3) hoary; urgency=low
+
+ * Added missing dependency on libgcj6-common.
+
+ -- Jerry Haltom <wasabi at larvalstage.net> Wed, 23 Feb 2005 22:45:00 -0600
+
+ecj-bootstrap (3.0.1-1ubuntu2) hoary; urgency=low
+
+ * Removed argument modification from ecj and moved it to ecj-wrapper in the
+ style of gcj-wrapper.
+ * Jeff Bailey corrected the Posix-compliant argument expansion in
+ ecj-wrapper with the help of David Weinehall.
+ * ecj now rebuilds with itself as a sanity test.
+
+ -- Jerry Haltom <wasabi at larvalstage.net> Mon, 14 Feb 2005 20:34:25 -0600
+
+ecj-bootstrap (3.0.1-1ubuntu1) hoary; urgency=low
+
+ * First upload to Ubuntu.
+
+ * Tighten build deps. Use "ecj" instead of "ecj-bootstrap" to
+ allow ant to depend on ecj | ecj-bootstrap.
+
+ * Posixify wrapper
+
+ -- Jeff Bailey <jbailey at ubuntu.com> Fri, 11 Feb 2005 20:37:21 +0000
+
+ecj-bootstrap (3.0.1-0) unstable; urgency=low
+
+ * Initial release.
+
+ -- Jerry Haltom <wasabi at larvalstage.net> Wed, 09 Feb 2005 19:36:07 -0600
Deleted: tags/ecj/3.11.0-1~exp1/debian/control
===================================================================
--- trunk/ecj/debian/control 2016-05-17 13:41:09 UTC (rev 19062)
+++ tags/ecj/3.11.0-1~exp1/debian/control 2016-05-18 19:32:01 UTC (rev 19066)
@@ -1,70 +0,0 @@
-Source: ecj
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Matthias Klose <doko at debian.org>
-Build-Depends: cdbs (>= 0.4.90ubuntu9), debhelper (>= 9),
- gcj-5-jdk,
- libgcj-bc,
- fastjar, ant, zip, dpkg (>= 1.13.19), python, time
-Build-Depends-Indep: maven-repo-helper
-Build-Conflicts: ecj-bootstrap-gcj (<< 3.8.2)
-Standards-Version: 3.9.7
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/ecj
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/ecj/
-Homepage: http://www.eclipse.org/jdt/core/index.php
-
-Package: ecj
-Architecture: any
-Depends: libecj-java (>= ${source:Version}), ${pkg:gij}, ${pkg:libgcjjar}, java-common (>= 0.23), ${misc:Depends}
-Recommends: ecj-gcj
-Conflicts: ecj-bootstrap (<< 3.2.2), eclipse-ecj
-Replaces: ecj-bootstrap (<< 3.2.2), eclipse-ecj
-Suggests: ant
-Description: standalone version of the Eclipse Java compiler
- This package provides a standalone version of the Eclipse JDT compiler which
- is distributed as part of Eclipse. It passes the JCK (Java Compatibility Kit)
- and is compatible with Java 1.3, 1.4, 1.5, 1.6, 1.7 and 1.8.
-
-Package: libecj-java
-Architecture: all
-Depends: java-common (>= 0.23), ${misc:Depends}
-Conflicts: ecj-bootstrap (<< 3.2.2), eclipse-ecj
-Replaces: ecj-bootstrap (<< 3.2.2), eclipse-ecj, ecj (<< 3.3.0-1)
-Suggests: ecj, ant, libecj-java-gcj
-Description: Eclipse Java compiler (library)
- This package provides a standalone version of the Eclipse JDT compiler library
- which is distributed as part of Eclipse. It passes the JCK (Java Compatibility
- Kit) and is compatible with Java 1.3, 1.4, 1.5, 1.6, 1.7 and 1.8.
-
-Package: libecj-java-gcj
-Architecture: any
-Depends: java-common (>= 0.23), libecj-java (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: ecj-bootstrap-gcj (<< 3.2.2), eclipse-ecj-gcj, ecj-gcj (<< 3.3.0+0728)
-Description: Eclipse Java compiler (native library)
- This package provides a standalone version of the Eclipse JDT compiler library
- which is distributed as part of Eclipse. It passes the JCK (Java Compatibility
- Kit) and is compatible with Java 1.3, 1.4, 1.5, 1.6, 1.7 and 1.8.
- .
- This package contains a native version of libecj-java built using gcj.
-
-Package: ecj1
-Architecture: alpha armel armhf
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: java byte code compiler used by gcj
- This package provides a standalone version of the java byte code compiler
- used by gcj.
-
-Package: ecj-gcj
-Architecture: any
-Depends: ecj (>= ${source:Version}), libecj-java-gcj (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: java-gcj-compat (>= 1.0.69)
-Replaces: ecj-bootstrap-gcj (<< 3.2.2), eclipse-ecj-gcj
-Conflicts: eclipse-ecj-gcj
-Provides: libecj-java-gcj
-Description: standalone version of the Eclipse Java compiler (native version)
- This package provides a standalone version of the Eclipse JDT compiler which
- is distributed as part of Eclipse. It passes the JCK (Java Compatibility Kit)
- and is compatible with Java 1.3, 1.4, 1.5, 1.6, 1.7 and 1.8.
- .
- This package contains a native version of ecj built using gcj.
Copied: tags/ecj/3.11.0-1~exp1/debian/control (from rev 19064, trunk/ecj/debian/control)
===================================================================
--- tags/ecj/3.11.0-1~exp1/debian/control (rev 0)
+++ tags/ecj/3.11.0-1~exp1/debian/control 2016-05-18 19:32:01 UTC (rev 19066)
@@ -0,0 +1,70 @@
+Source: ecj
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Matthias Klose <doko at debian.org>
+Build-Depends: cdbs (>= 0.4.90ubuntu9), debhelper (>= 9),
+ gcj-5-jdk,
+ libgcj-bc,
+ fastjar, ant, zip, dpkg (>= 1.13.19), python, time
+Build-Depends-Indep: maven-repo-helper
+Build-Conflicts: ecj-bootstrap-gcj (<< 3.8.2)
+Standards-Version: 3.9.8
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/ecj
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/ecj/
+Homepage: http://www.eclipse.org/jdt/core/index.php
+
+Package: ecj
+Architecture: any
+Depends: libecj-java (>= ${source:Version}), ${pkg:gij}, ${pkg:libgcjjar}, java-common (>= 0.23), ${misc:Depends}
+Recommends: ecj-gcj
+Conflicts: ecj-bootstrap (<< 3.2.2), eclipse-ecj
+Replaces: ecj-bootstrap (<< 3.2.2), eclipse-ecj
+Suggests: ant
+Description: standalone version of the Eclipse Java compiler
+ This package provides a standalone version of the Eclipse JDT compiler which
+ is distributed as part of Eclipse. It passes the JCK (Java Compatibility Kit)
+ and is compatible with Java 1.3, 1.4, 1.5, 1.6, 1.7 and 1.8.
+
+Package: libecj-java
+Architecture: all
+Depends: java-common (>= 0.23), ${misc:Depends}
+Conflicts: ecj-bootstrap (<< 3.2.2), eclipse-ecj
+Replaces: ecj-bootstrap (<< 3.2.2), eclipse-ecj, ecj (<< 3.3.0-1)
+Suggests: ecj, ant, libecj-java-gcj
+Description: Eclipse Java compiler (library)
+ This package provides a standalone version of the Eclipse JDT compiler library
+ which is distributed as part of Eclipse. It passes the JCK (Java Compatibility
+ Kit) and is compatible with Java 1.3, 1.4, 1.5, 1.6, 1.7 and 1.8.
+
+Package: libecj-java-gcj
+Architecture: any
+Depends: java-common (>= 0.23), libecj-java (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: ecj-bootstrap-gcj (<< 3.2.2), eclipse-ecj-gcj, ecj-gcj (<< 3.3.0+0728)
+Description: Eclipse Java compiler (native library)
+ This package provides a standalone version of the Eclipse JDT compiler library
+ which is distributed as part of Eclipse. It passes the JCK (Java Compatibility
+ Kit) and is compatible with Java 1.3, 1.4, 1.5, 1.6, 1.7 and 1.8.
+ .
+ This package contains a native version of libecj-java built using gcj.
+
+Package: ecj1
+Architecture: alpha armel armhf
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: java byte code compiler used by gcj
+ This package provides a standalone version of the java byte code compiler
+ used by gcj.
+
+Package: ecj-gcj
+Architecture: any
+Depends: ecj (>= ${source:Version}), libecj-java-gcj (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Recommends: java-gcj-compat (>= 1.0.69)
+Replaces: ecj-bootstrap-gcj (<< 3.2.2), eclipse-ecj-gcj
+Conflicts: eclipse-ecj-gcj
+Provides: libecj-java-gcj
+Description: standalone version of the Eclipse Java compiler (native version)
+ This package provides a standalone version of the Eclipse JDT compiler which
+ is distributed as part of Eclipse. It passes the JCK (Java Compatibility Kit)
+ and is compatible with Java 1.3, 1.4, 1.5, 1.6, 1.7 and 1.8.
+ .
+ This package contains a native version of ecj built using gcj.
Deleted: tags/ecj/3.11.0-1~exp1/debian/patches/gcc-changes.diff
===================================================================
--- trunk/ecj/debian/patches/gcc-changes.diff 2016-05-17 13:41:09 UTC (rev 19062)
+++ tags/ecj/3.11.0-1~exp1/debian/patches/gcc-changes.diff 2016-05-18 19:32:01 UTC (rev 19066)
@@ -1,543 +0,0 @@
---- /dev/null
-+++ b/gcc.properties
-@@ -0,0 +1,5 @@
-+
-+# GCCMain messages.
-+gcc.zipArg=-fzip-target requires argument
-+gcc.zipDepArg=-fzip-dependency requires argument
-+gcc.noClasspath=no classpath specified
---- a/src/org.eclipse.jdt.core/build.xml
-+++ b/src/org.eclipse.jdt.core/build.xml
-@@ -38,9 +38,10 @@
- <include name="**/readableNames.props"/>
- <include name="META-INF/**"/>
- <include name="**/*.properties"/>
-+ <include name="**/*.props"/>
- <exclude name="META-INF/eclipse.inf"/>
- </fileset>
- </zip>
- <delete dir="${output}" />
- </target>
--</project>
-\ No newline at end of file
-+</project>
---- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
-+++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
-@@ -1219,9 +1219,9 @@
-
- // by default only lines and source attributes are generated.
- this.produceDebugAttributes = ClassFileConstants.ATTR_SOURCE | ClassFileConstants.ATTR_LINES;
-- this.complianceLevel = this.originalComplianceLevel = ClassFileConstants.JDK1_4; // by default be compliant with 1.4
-- this.sourceLevel = this.originalSourceLevel = ClassFileConstants.JDK1_3; //1.3 source behavior by default
-- this.targetJDK = ClassFileConstants.JDK1_2; // default generates for JVM1.2
-+ this.complianceLevel = this.originalComplianceLevel = ClassFileConstants.JDK1_5;
-+ this.sourceLevel = this.originalSourceLevel = ClassFileConstants.JDK1_5;
-+ this.targetJDK = ClassFileConstants.JDK1_5;
-
- this.defaultEncoding = null; // will use the platform default encoding
-
---- /dev/null
-+++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
-@@ -0,0 +1,502 @@
-+/**
-+ *
-+ */
-+package org.eclipse.jdt.internal.compiler.batch;
-+
-+import java.io.BufferedOutputStream;
-+import java.io.BufferedReader;
-+import java.io.ByteArrayInputStream;
-+import java.io.File;
-+import java.io.FileOutputStream;
-+import java.io.FileReader;
-+import java.io.IOException;
-+import java.io.InputStreamReader;
-+import java.io.OutputStream;
-+import java.io.PrintWriter;
-+import java.io.UnsupportedEncodingException;
-+import java.util.ArrayList;
-+import java.util.HashSet;
-+import java.util.Iterator;
-+import java.util.Map;
-+import java.util.StringTokenizer;
-+import java.util.zip.CRC32;
-+import java.util.zip.ZipEntry;
-+import java.util.zip.ZipOutputStream;
-+
-+import org.eclipse.jdt.internal.compiler.ClassFile;
-+import org.eclipse.jdt.internal.compiler.CompilationResult;
-+import org.eclipse.jdt.internal.compiler.env.AccessRestriction;
-+import org.eclipse.jdt.internal.compiler.env.AccessRule;
-+import org.eclipse.jdt.internal.compiler.env.AccessRuleSet;
-+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
-+import org.eclipse.jdt.internal.compiler.problem.ProblemSeverities;
-+import org.eclipse.jdt.internal.compiler.util.Messages;
-+import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
-+
-+/**
-+ * This is an alternate entry point for the command-line compiler which
-+ * is simpler to integrate into GCC. In particular the option processing
-+ * is more GNU-like and the recognized options are similar to those supported
-+ * by other GCC front ends.
-+ */
-+public class GCCMain extends Main {
-+
-+ // All the compilation units specified on the command line.
-+ private HashSet commandLineCompilationUnits = new HashSet();
-+ // True if we are only checking syntax.
-+ private boolean syntaxOnly;
-+ // If not null, the name of the output zip file.
-+ // If null, we are generating class files in the file system,
-+ // not a zip file.
-+ private String zipDestination;
-+ // The zip stream to which we're writing, or null if it hasn't been opened.
-+ private ZipOutputStream zipStream;
-+
-+ // If not null, the name of the zip file to which dependency class files
-+ // should be written.
-+ private String zipDependencyDestination;
-+ // The zip stream to which dependency files should be written.
-+ private ZipOutputStream zipDependencyStream;
-+
-+ public GCCMain(PrintWriter outWriter, PrintWriter errWriter,
-+ boolean systemExitWhenFinished) {
-+ super(outWriter, errWriter, systemExitWhenFinished);
-+ this.logger.setEmacs();
-+ }
-+
-+ public GCCMain(PrintWriter outWriter, PrintWriter errWriter,
-+ boolean systemExitWhenFinished, Map customDefaultOptions) {
-+ super(outWriter, errWriter, systemExitWhenFinished,
-+ customDefaultOptions);
-+ this.logger.setEmacs();
-+ }
-+
-+ private void fail(Exception t) {
-+ t.printStackTrace();
-+ this.logger.logException(t);
-+ System.exit(1);
-+ }
-+
-+ public CompilationUnit[] getCompilationUnits() {
-+ CompilationUnit[] units = super.getCompilationUnits();
-+ for (int i = 0; i < units.length; ++i)
-+ this.commandLineCompilationUnits.add(units[i]);
-+ return units;
-+ }
-+
-+ private String combine(char[] one, char[] two) {
-+ StringBuffer b = new StringBuffer();
-+ b.append(one);
-+ b.append(two);
-+ return b.toString();
-+ }
-+
-+ private ZipOutputStream getZipOutput() throws IOException {
-+ if (this.zipDestination != null && this.zipStream == null) {
-+ OutputStream os;
-+ if ("-".equals(this.zipDestination)) { //$NON-NLS-1$
-+ os = System.out;
-+ } else {
-+ os = new FileOutputStream(this.zipDestination);
-+ }
-+ zipStream = new ZipOutputStream(new BufferedOutputStream(os));
-+ zipStream.setMethod(ZipOutputStream.STORED);
-+ // Sun/OpenJDK require at least one entry in the zip file.
-+ ZipEntry entry = new ZipEntry(".dummy");
-+ byte[] contents = new byte[0];
-+ CRC32 crc = new CRC32();
-+ crc.update(contents);
-+ entry.setSize(contents.length);
-+ entry.setCrc(crc.getValue());
-+ zipStream.putNextEntry(entry);
-+ zipStream.write(contents);
-+ zipStream.closeEntry();
-+ }
-+ return zipStream;
-+ }
-+
-+ private ZipOutputStream getDependencyOutput() throws IOException {
-+ if (this.zipDependencyDestination != null && this.zipDependencyStream == null) {
-+ OutputStream os = new FileOutputStream(zipDependencyDestination);
-+ zipDependencyStream = new ZipOutputStream(new BufferedOutputStream(os));
-+ zipDependencyStream.setMethod(ZipOutputStream.STORED);
-+ // Sun/OpenJDK require at least one entry in the zip file.
-+ ZipEntry entry = new ZipEntry(".dummy");
-+ byte[] contents = new byte[0];
-+ CRC32 crc = new CRC32();
-+ crc.update(contents);
-+ entry.setSize(contents.length);
-+ entry.setCrc(crc.getValue());
-+ zipDependencyStream.putNextEntry(entry);
-+ zipDependencyStream.write(contents);
-+ zipDependencyStream.closeEntry();
-+ }
-+ return zipDependencyStream;
-+ }
-+
-+ public void outputClassFiles(CompilationResult unitResult) {
-+ if (this.syntaxOnly) {
-+ return;
-+ }
-+ if (this.zipDestination == null) {
-+ // Nothing special to do here.
-+ super.outputClassFiles(unitResult);
-+ return;
-+ }
-+ if (unitResult == null || unitResult.hasErrors()) {
-+ return;
-+ }
-+
-+ // If we are compiling with indirect dispatch, we don't need
-+ // any dependent classes. If we are using the C++ ABI, then we
-+ // do need the dependencies in order to do proper layout.
-+ boolean gcjCompile = this.commandLineCompilationUnits.contains(unitResult.getCompilationUnit());
-+ if (this.zipDependencyDestination == null && !gcjCompile) {
-+ return;
-+ }
-+
-+ try {
-+ ZipOutputStream dest = gcjCompile ? getZipOutput() : getDependencyOutput();
-+ ClassFile[] classFiles = unitResult.getClassFiles();
-+ for (int i = 0; i < classFiles.length; ++i) {
-+ ClassFile classFile = classFiles[i];
-+ String filename = combine(classFile.fileName(), SuffixConstants.SUFFIX_class);
-+ if (this.verbose)
-+ this.out.println(
-+ Messages.bind(
-+ Messages.compilation_write,
-+ new String[] {
-+ String.valueOf(this.exportedClassFilesCounter+1),
-+ filename
-+ }));
-+ ZipEntry entry = new ZipEntry(filename);
-+ byte[] contents = classFile.getBytes();
-+ CRC32 crc = new CRC32();
-+ crc.update(contents);
-+ entry.setSize(contents.length);
-+ entry.setCrc(crc.getValue());
-+ dest.putNextEntry(entry);
-+ dest.write(contents);
-+ dest.closeEntry();
-+ }
-+ } catch (IOException err) {
-+ fail(err);
-+ }
-+ }
-+
-+ private String getArgument(String option) {
-+ int index = option.indexOf('=');
-+ return option.substring(index + 1);
-+ }
-+
-+ private void addPath(ArrayList result, String currentClasspathName) {
-+ String customEncoding = null;
-+ AccessRule[] accessRules = new AccessRule[0];
-+ AccessRuleSet accessRuleSet = new AccessRuleSet(accessRules, AccessRestriction.COMMAND_LINE, currentClasspathName);
-+ FileSystem.Classpath currentClasspath = FileSystem
-+ .getClasspath(currentClasspathName,
-+ customEncoding, accessRuleSet);
-+ if (currentClasspath != null) {
-+ result.add(currentClasspath);
-+ }
-+ }
-+
-+ private void parsePath(ArrayList result, String path) {
-+ StringTokenizer iter = new StringTokenizer(path, File.pathSeparator);
-+ while (iter.hasMoreTokens()) {
-+ addPath(result, iter.nextToken());
-+ }
-+ }
-+
-+ protected void handleWarningToken(String token, boolean isEnabling) {
-+ // Recognize this for compatibility with older versions of gcj.
-+ if ("deprecated".equals(token)) //$NON-NLS-1$
-+ token = "deprecation"; //$NON-NLS-1$
-+ else if ("static-access".equals(token) //$NON-NLS-1$
-+ || "dep-ann".equals(token) //$NON-NLS-1$
-+ || "over-ann".equals(token)) { //$NON-NLS-1$
-+ // Some exceptions to the warning naming rule.
-+ } else if ("extraneous-semicolon".equals(token)) { //$NON-NLS-1$
-+ // Compatibility with earlier versions of gcj.
-+ token = "semicolon"; //$NON-NLS-1$
-+ } else {
-+ // Turn "foo-bar-baz" into eclipse-style "fooBarBaz".
-+ StringBuffer newToken = new StringBuffer(token.length());
-+ StringTokenizer t = new StringTokenizer(token, "-"); //$NON-NLS-1$
-+ boolean first = true;
-+ while (t.hasMoreTokens()) {
-+ String next = t.nextToken();
-+ if (first) {
-+ newToken.append(next);
-+ first = false;
-+ } else {
-+ newToken.append(Character.toUpperCase(next.charAt(0)));
-+ newToken.append(next.substring(1));
-+ }
-+ }
-+ token = newToken.toString();
-+ }
-+ super.handleWarningToken(token, isEnabling);
-+ }
-+
-+ private void turnWarningsToErrors() {
-+ Object[] entries = this.options.entrySet().toArray();
-+ for (int i = 0, max = entries.length; i < max; i++) {
-+ Map.Entry entry = (Map.Entry) entries[i];
-+ if (!(entry.getKey() instanceof String))
-+ continue;
-+ if (!(entry.getValue() instanceof String))
-+ continue;
-+ if (((String) entry.getValue()).equals(CompilerOptions.WARNING)) {
-+ this.options.put(entry.getKey(), CompilerOptions.ERROR);
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Set the debug level to the indicated value. The level should be
-+ * between 0 and 2, inclusive, but this is not checked.
-+ * @param level the debug level
-+ */
-+ private void setDebugLevel(int level) {
-+ this.options.put(
-+ CompilerOptions.OPTION_LocalVariableAttribute,
-+ level > 1 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE);
-+ this.options.put(
-+ CompilerOptions.OPTION_LineNumberAttribute,
-+ level > 0 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE);
-+ this.options.put(
-+ CompilerOptions.OPTION_SourceFileAttribute,
-+ CompilerOptions.GENERATE);
-+ }
-+
-+ private void readFileList(String file, ArrayList result) {
-+ try {
-+ BufferedReader b = new BufferedReader(new FileReader(file));
-+ String line;
-+ while ((line = b.readLine()) != null) {
-+ if (line.endsWith(SUFFIX_STRING_java))
-+ result.add(line);
-+ }
-+ b.close();
-+ } catch (IOException err) {
-+ fail(err);
-+ }
-+ }
-+
-+ private void readAllFileListFiles(ArrayList fileList, ArrayList result) {
-+ Iterator it = fileList.iterator();
-+ while (it.hasNext()) {
-+ readFileList((String) it.next(), result);
-+ }
-+ }
-+
-+ private void handleWall(boolean enable) {
-+ // A somewhat arbitrary list. We use the GCC names
-+ // here, and the local handleWarningToken translates
-+ // for us.
-+ handleWarningToken("constructor-name", enable);
-+ handleWarningToken("pkg-default-method", enable);
-+ handleWarningToken("masked-catch-block", enable);
-+ handleWarningToken("all-deprecation", enable);
-+ handleWarningToken("unused-local", enable);
-+ handleWarningToken("unused-label", enable);
-+ handleWarningToken("static-receiver", enable);
-+ handleWarningToken("indirect-static", enable);
-+ handleWarningToken("no-effect-assign", enable);
-+ handleWarningToken("char-concat", enable);
-+ handleWarningToken("useless-type-check", enable);
-+ handleWarningToken("final-bound", enable);
-+ handleWarningToken("assert-identifier", enable);
-+ handleWarningToken("enum-identifier", enable);
-+ handleWarningToken("finally", enable);
-+ handleWarningToken("varargs-cast", enable);
-+ handleWarningToken("unused", enable);
-+ handleWarningToken("forbidden", enable);
-+ }
-+
-+ public void configure(String[] argv) {
-+ if ((argv == null) || (argv.length == 0)) {
-+ // This is a "can't happen".
-+ System.exit(1);
-+ }
-+
-+ ArrayList files = new ArrayList();
-+ ArrayList otherFiles = new ArrayList();
-+ String classpath = null;
-+ boolean haveFileList = false;
-+ boolean inhibitAllWarnings = false;
-+ boolean treatWarningsAsErrors = false;
-+
-+ for (int i = 0; i < argv.length; ++i) {
-+ String currentArg = argv[i];
-+
-+ if (currentArg.startsWith("-fencoding=")) { //$NON-NLS-1$
-+ // Simply accept the last one.
-+ String encoding = getArgument(currentArg);
-+ try { // ensure encoding is supported
-+ new InputStreamReader(new ByteArrayInputStream(new byte[0]), encoding);
-+ } catch (UnsupportedEncodingException e) {
-+ throw new IllegalArgumentException(
-+ this.bind("configure.unsupportedEncoding", encoding)); //$NON-NLS-1$
-+ }
-+ this.options.put(CompilerOptions.OPTION_Encoding, encoding);
-+ } else if (currentArg.startsWith("-foutput-class-dir=")) { //$NON-NLS-1$
-+ String arg = getArgument(currentArg);
-+ if (this.destinationPath != null) {
-+ StringBuffer errorMessage = new StringBuffer();
-+ errorMessage.append("-d"); //$NON-NLS-1$
-+ errorMessage.append(' ');
-+ errorMessage.append(arg);
-+ throw new IllegalArgumentException(
-+ this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
-+ }
-+ this.setDestinationPath(arg);
-+ } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
-+ classpath = getArgument(currentArg);
-+ } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$
-+ ++i;
-+ if (i >= argv.length)
-+ throw new IllegalArgumentException(this.bind("gcc.zipArg")); //$NON-NLS-1$
-+ this.zipDestination = argv[i];
-+ } else if (currentArg.equals("-fzip-dependency")) { //$NON-NLS-1$
-+ ++i;
-+ if (i >= argv.length)
-+ throw new IllegalArgumentException(this.bind("gcc.zipDepArg")); //$NON-NLS-1$
-+ this.zipDependencyDestination = argv[i];
-+ } else if (currentArg.startsWith("-g")) { //$NON-NLS-1$
-+ if (currentArg.equals("-g0")) { //$NON-NLS-1$
-+ setDebugLevel(0);
-+ } else if (currentArg.equals("-g2") || currentArg.equals("-g3") //$NON-NLS-1$ //$NON-NLS-2$
-+ || currentArg.equals("-g")) { //$NON-NLS-1$
-+ setDebugLevel(2);
-+ } else {
-+ // Handle -g1 but also things like -gstabs.
-+ setDebugLevel(1);
-+ }
-+ } else if (currentArg.equals("-Werror")) { //$NON-NLS-1$
-+ treatWarningsAsErrors = true;
-+ } else if (currentArg.equals("-Wno-error")) { //$NON-NLS-1$
-+ treatWarningsAsErrors = false;
-+ } else if (currentArg.equals("-Wall")) { //$NON-NLS-1$
-+ handleWall(true);
-+ } else if (currentArg.equals("-Wno-all")) { //$NON-NLS-1$
-+ handleWall(false);
-+ } else if (currentArg.startsWith("-Wno-")) { //$NON-NLS-1$
-+ handleWarningToken(currentArg.substring(5), false);
-+ } else if (currentArg.startsWith("-W")) { //$NON-NLS-1$
-+ handleWarningToken(currentArg.substring(2), true);
-+ } else if (currentArg.equals("-w")) { //$NON-NLS-1$
-+ inhibitAllWarnings = true;
-+ } else if (currentArg.startsWith("-O")) { //$NON-NLS-1$
-+ // Ignore.
-+ } else if (currentArg.equals("-v")) { //$NON-NLS-1$
-+ this.verbose = true;
-+ } else if (currentArg.equals("-fsyntax-only")) { //$NON-NLS-1$
-+ this.syntaxOnly = true;
-+ } else if (currentArg.startsWith("-fsource=")) { //$NON-NLS-1$
-+ currentArg = getArgument(currentArg);
-+ if (currentArg.equals("1.3")) { //$NON-NLS-1$
-+ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_3);
-+ } else if (currentArg.equals("1.4")) { //$NON-NLS-1$
-+ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4);
-+ } else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-+ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
-+ } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-+ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
-+ } else {
-+ throw new IllegalArgumentException(this.bind("configure.source", currentArg)); //$NON-NLS-1$
-+ }
-+ } else if (currentArg.startsWith("-ftarget=")) { //$NON-NLS-1$
-+ currentArg = getArgument(currentArg);
-+ if (currentArg.equals("1.1")) { //$NON-NLS-1$
-+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_1);
-+ } else if (currentArg.equals("1.2")) { //$NON-NLS-1$
-+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_2);
-+ } else if (currentArg.equals("1.3")) { //$NON-NLS-1$
-+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_3);
-+ } else if (currentArg.equals("1.4")) { //$NON-NLS-1$
-+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_4);
-+ } else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
-+ } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
-+ } else if (currentArg.equals("jsr14")) { //$NON-NLS-1$
-+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_JSR14);
-+ } else {
-+ throw new IllegalArgumentException(this.bind("configure.targetJDK", currentArg)); //$NON-NLS-1$
-+ }
-+ } else if (currentArg.equals("-ffilelist-file")) { //$NON-NLS-1$
-+ haveFileList = true;
-+ } else if (currentArg.endsWith(SuffixConstants.SUFFIX_STRING_java)) {
-+ files.add(currentArg);
-+ } else if (currentArg.charAt(0) == '-'){
-+ // FIXME: error if not a file?
-+ } else {
-+ otherFiles.add(currentArg);
-+ }
-+ }
-+
-+ // Read the file list file. We read them all, but really there
-+ // will only be one.
-+ if (haveFileList)
-+ readAllFileListFiles(otherFiles, files);
-+
-+ this.filenames = (String[]) files.toArray(new String[0]);
-+ this.encodings = new String[this.filenames.length];
-+ this.destinationPaths = new String[this.filenames.length];
-+ for (int i = 0; i < this.filenames.length; ++i)
-+ this.destinationPaths[i] = this.destinationPath;
-+
-+ // Classpath processing.
-+ ArrayList result = new ArrayList();
-+ if (classpath == null)
-+ throw new IllegalArgumentException(this.bind("gcc.noClasspath")); //$NON-NLS-1$
-+ parsePath(result, classpath);
-+
-+ // We must always create both output files, even if one is not used.
-+ // That way we will always pass valid zip file on to jc1.
-+ try {
-+ getZipOutput();
-+ getDependencyOutput();
-+ } catch (IOException err) {
-+ fail(err);
-+ }
-+
-+ if (inhibitAllWarnings)
-+ disableAll(ProblemSeverities.Warning);
-+ if (treatWarningsAsErrors)
-+ turnWarningsToErrors();
-+
-+ this.checkedClasspaths = new FileSystem.Classpath[result.size()];
-+ result.toArray(this.checkedClasspaths);
-+
-+ this.logger.logCommandLineArguments(argv);
-+ this.logger.logOptions(this.options);
-+ this.logger.logClasspath(this.checkedClasspaths);
-+
-+ this.maxRepetition = 1;
-+ }
-+
-+ public boolean compile(String[] argv) {
-+ boolean result = super.compile(argv);
-+ try {
-+ if (zipStream != null) {
-+ zipStream.finish();
-+ zipStream.close();
-+ }
-+ if (zipDependencyStream != null) {
-+ zipDependencyStream.finish();
-+ zipDependencyStream.close();
-+ }
-+ } catch (IOException err) {
-+ fail(err);
-+ }
-+ return result;
-+ }
-+
-+ public static void main(String[] argv) {
-+ boolean result = new GCCMain(new PrintWriter(System.out), new PrintWriter(System.err), false).compile(argv);
-+ System.exit(result ? 0 : 1);
-+ }
-+}
Copied: tags/ecj/3.11.0-1~exp1/debian/patches/gcc-changes.diff (from rev 19063, trunk/ecj/debian/patches/gcc-changes.diff)
===================================================================
--- tags/ecj/3.11.0-1~exp1/debian/patches/gcc-changes.diff (rev 0)
+++ tags/ecj/3.11.0-1~exp1/debian/patches/gcc-changes.diff 2016-05-18 19:32:01 UTC (rev 19066)
@@ -0,0 +1,543 @@
+--- /dev/null
++++ b/gcc.properties
+@@ -0,0 +1,5 @@
++
++# GCCMain messages.
++gcc.zipArg=-fzip-target requires argument
++gcc.zipDepArg=-fzip-dependency requires argument
++gcc.noClasspath=no classpath specified
+--- a/src/org.eclipse.jdt.core/build.xml
++++ b/src/org.eclipse.jdt.core/build.xml
+@@ -38,9 +38,10 @@
+ <include name="**/readableNames.props"/>
+ <include name="META-INF/**"/>
+ <include name="**/*.properties"/>
++ <include name="**/*.props"/>
+ <exclude name="META-INF/eclipse.inf"/>
+ </fileset>
+ </zip>
+ <delete dir="${output}" />
+ </target>
+-</project>
+\ No newline at end of file
++</project>
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
+@@ -1233,9 +1233,9 @@
+
+ // by default only lines and source attributes are generated.
+ this.produceDebugAttributes = ClassFileConstants.ATTR_SOURCE | ClassFileConstants.ATTR_LINES;
+- this.complianceLevel = this.originalComplianceLevel = ClassFileConstants.JDK1_4; // by default be compliant with 1.4
+- this.sourceLevel = this.originalSourceLevel = ClassFileConstants.JDK1_3; //1.3 source behavior by default
+- this.targetJDK = ClassFileConstants.JDK1_2; // default generates for JVM1.2
++ this.complianceLevel = this.originalComplianceLevel = ClassFileConstants.JDK1_5;
++ this.sourceLevel = this.originalSourceLevel = ClassFileConstants.JDK1_5;
++ this.targetJDK = ClassFileConstants.JDK1_5;
+
+ this.defaultEncoding = null; // will use the platform default encoding
+
+--- /dev/null
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
+@@ -0,0 +1,502 @@
++/**
++ *
++ */
++package org.eclipse.jdt.internal.compiler.batch;
++
++import java.io.BufferedOutputStream;
++import java.io.BufferedReader;
++import java.io.ByteArrayInputStream;
++import java.io.File;
++import java.io.FileOutputStream;
++import java.io.FileReader;
++import java.io.IOException;
++import java.io.InputStreamReader;
++import java.io.OutputStream;
++import java.io.PrintWriter;
++import java.io.UnsupportedEncodingException;
++import java.util.ArrayList;
++import java.util.HashSet;
++import java.util.Iterator;
++import java.util.Map;
++import java.util.StringTokenizer;
++import java.util.zip.CRC32;
++import java.util.zip.ZipEntry;
++import java.util.zip.ZipOutputStream;
++
++import org.eclipse.jdt.internal.compiler.ClassFile;
++import org.eclipse.jdt.internal.compiler.CompilationResult;
++import org.eclipse.jdt.internal.compiler.env.AccessRestriction;
++import org.eclipse.jdt.internal.compiler.env.AccessRule;
++import org.eclipse.jdt.internal.compiler.env.AccessRuleSet;
++import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
++import org.eclipse.jdt.internal.compiler.problem.ProblemSeverities;
++import org.eclipse.jdt.internal.compiler.util.Messages;
++import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
++
++/**
++ * This is an alternate entry point for the command-line compiler which
++ * is simpler to integrate into GCC. In particular the option processing
++ * is more GNU-like and the recognized options are similar to those supported
++ * by other GCC front ends.
++ */
++public class GCCMain extends Main {
++
++ // All the compilation units specified on the command line.
++ private HashSet commandLineCompilationUnits = new HashSet();
++ // True if we are only checking syntax.
++ private boolean syntaxOnly;
++ // If not null, the name of the output zip file.
++ // If null, we are generating class files in the file system,
++ // not a zip file.
++ private String zipDestination;
++ // The zip stream to which we're writing, or null if it hasn't been opened.
++ private ZipOutputStream zipStream;
++
++ // If not null, the name of the zip file to which dependency class files
++ // should be written.
++ private String zipDependencyDestination;
++ // The zip stream to which dependency files should be written.
++ private ZipOutputStream zipDependencyStream;
++
++ public GCCMain(PrintWriter outWriter, PrintWriter errWriter,
++ boolean systemExitWhenFinished) {
++ super(outWriter, errWriter, systemExitWhenFinished);
++ this.logger.setEmacs();
++ }
++
++ public GCCMain(PrintWriter outWriter, PrintWriter errWriter,
++ boolean systemExitWhenFinished, Map customDefaultOptions) {
++ super(outWriter, errWriter, systemExitWhenFinished,
++ customDefaultOptions);
++ this.logger.setEmacs();
++ }
++
++ private void fail(Exception t) {
++ t.printStackTrace();
++ this.logger.logException(t);
++ System.exit(1);
++ }
++
++ public CompilationUnit[] getCompilationUnits() {
++ CompilationUnit[] units = super.getCompilationUnits();
++ for (int i = 0; i < units.length; ++i)
++ this.commandLineCompilationUnits.add(units[i]);
++ return units;
++ }
++
++ private String combine(char[] one, char[] two) {
++ StringBuffer b = new StringBuffer();
++ b.append(one);
++ b.append(two);
++ return b.toString();
++ }
++
++ private ZipOutputStream getZipOutput() throws IOException {
++ if (this.zipDestination != null && this.zipStream == null) {
++ OutputStream os;
++ if ("-".equals(this.zipDestination)) { //$NON-NLS-1$
++ os = System.out;
++ } else {
++ os = new FileOutputStream(this.zipDestination);
++ }
++ zipStream = new ZipOutputStream(new BufferedOutputStream(os));
++ zipStream.setMethod(ZipOutputStream.STORED);
++ // Sun/OpenJDK require at least one entry in the zip file.
++ ZipEntry entry = new ZipEntry(".dummy");
++ byte[] contents = new byte[0];
++ CRC32 crc = new CRC32();
++ crc.update(contents);
++ entry.setSize(contents.length);
++ entry.setCrc(crc.getValue());
++ zipStream.putNextEntry(entry);
++ zipStream.write(contents);
++ zipStream.closeEntry();
++ }
++ return zipStream;
++ }
++
++ private ZipOutputStream getDependencyOutput() throws IOException {
++ if (this.zipDependencyDestination != null && this.zipDependencyStream == null) {
++ OutputStream os = new FileOutputStream(zipDependencyDestination);
++ zipDependencyStream = new ZipOutputStream(new BufferedOutputStream(os));
++ zipDependencyStream.setMethod(ZipOutputStream.STORED);
++ // Sun/OpenJDK require at least one entry in the zip file.
++ ZipEntry entry = new ZipEntry(".dummy");
++ byte[] contents = new byte[0];
++ CRC32 crc = new CRC32();
++ crc.update(contents);
++ entry.setSize(contents.length);
++ entry.setCrc(crc.getValue());
++ zipDependencyStream.putNextEntry(entry);
++ zipDependencyStream.write(contents);
++ zipDependencyStream.closeEntry();
++ }
++ return zipDependencyStream;
++ }
++
++ public void outputClassFiles(CompilationResult unitResult) {
++ if (this.syntaxOnly) {
++ return;
++ }
++ if (this.zipDestination == null) {
++ // Nothing special to do here.
++ super.outputClassFiles(unitResult);
++ return;
++ }
++ if (unitResult == null || unitResult.hasErrors()) {
++ return;
++ }
++
++ // If we are compiling with indirect dispatch, we don't need
++ // any dependent classes. If we are using the C++ ABI, then we
++ // do need the dependencies in order to do proper layout.
++ boolean gcjCompile = this.commandLineCompilationUnits.contains(unitResult.getCompilationUnit());
++ if (this.zipDependencyDestination == null && !gcjCompile) {
++ return;
++ }
++
++ try {
++ ZipOutputStream dest = gcjCompile ? getZipOutput() : getDependencyOutput();
++ ClassFile[] classFiles = unitResult.getClassFiles();
++ for (int i = 0; i < classFiles.length; ++i) {
++ ClassFile classFile = classFiles[i];
++ String filename = combine(classFile.fileName(), SuffixConstants.SUFFIX_class);
++ if (this.verbose)
++ this.out.println(
++ Messages.bind(
++ Messages.compilation_write,
++ new String[] {
++ String.valueOf(this.exportedClassFilesCounter+1),
++ filename
++ }));
++ ZipEntry entry = new ZipEntry(filename);
++ byte[] contents = classFile.getBytes();
++ CRC32 crc = new CRC32();
++ crc.update(contents);
++ entry.setSize(contents.length);
++ entry.setCrc(crc.getValue());
++ dest.putNextEntry(entry);
++ dest.write(contents);
++ dest.closeEntry();
++ }
++ } catch (IOException err) {
++ fail(err);
++ }
++ }
++
++ private String getArgument(String option) {
++ int index = option.indexOf('=');
++ return option.substring(index + 1);
++ }
++
++ private void addPath(ArrayList result, String currentClasspathName) {
++ String customEncoding = null;
++ AccessRule[] accessRules = new AccessRule[0];
++ AccessRuleSet accessRuleSet = new AccessRuleSet(accessRules, AccessRestriction.COMMAND_LINE, currentClasspathName);
++ FileSystem.Classpath currentClasspath = FileSystem
++ .getClasspath(currentClasspathName,
++ customEncoding, accessRuleSet);
++ if (currentClasspath != null) {
++ result.add(currentClasspath);
++ }
++ }
++
++ private void parsePath(ArrayList result, String path) {
++ StringTokenizer iter = new StringTokenizer(path, File.pathSeparator);
++ while (iter.hasMoreTokens()) {
++ addPath(result, iter.nextToken());
++ }
++ }
++
++ protected void handleWarningToken(String token, boolean isEnabling) {
++ // Recognize this for compatibility with older versions of gcj.
++ if ("deprecated".equals(token)) //$NON-NLS-1$
++ token = "deprecation"; //$NON-NLS-1$
++ else if ("static-access".equals(token) //$NON-NLS-1$
++ || "dep-ann".equals(token) //$NON-NLS-1$
++ || "over-ann".equals(token)) { //$NON-NLS-1$
++ // Some exceptions to the warning naming rule.
++ } else if ("extraneous-semicolon".equals(token)) { //$NON-NLS-1$
++ // Compatibility with earlier versions of gcj.
++ token = "semicolon"; //$NON-NLS-1$
++ } else {
++ // Turn "foo-bar-baz" into eclipse-style "fooBarBaz".
++ StringBuffer newToken = new StringBuffer(token.length());
++ StringTokenizer t = new StringTokenizer(token, "-"); //$NON-NLS-1$
++ boolean first = true;
++ while (t.hasMoreTokens()) {
++ String next = t.nextToken();
++ if (first) {
++ newToken.append(next);
++ first = false;
++ } else {
++ newToken.append(Character.toUpperCase(next.charAt(0)));
++ newToken.append(next.substring(1));
++ }
++ }
++ token = newToken.toString();
++ }
++ super.handleWarningToken(token, isEnabling);
++ }
++
++ private void turnWarningsToErrors() {
++ Object[] entries = this.options.entrySet().toArray();
++ for (int i = 0, max = entries.length; i < max; i++) {
++ Map.Entry entry = (Map.Entry) entries[i];
++ if (!(entry.getKey() instanceof String))
++ continue;
++ if (!(entry.getValue() instanceof String))
++ continue;
++ if (((String) entry.getValue()).equals(CompilerOptions.WARNING)) {
++ this.options.put(entry.getKey(), CompilerOptions.ERROR);
++ }
++ }
++ }
++
++ /**
++ * Set the debug level to the indicated value. The level should be
++ * between 0 and 2, inclusive, but this is not checked.
++ * @param level the debug level
++ */
++ private void setDebugLevel(int level) {
++ this.options.put(
++ CompilerOptions.OPTION_LocalVariableAttribute,
++ level > 1 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE);
++ this.options.put(
++ CompilerOptions.OPTION_LineNumberAttribute,
++ level > 0 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE);
++ this.options.put(
++ CompilerOptions.OPTION_SourceFileAttribute,
++ CompilerOptions.GENERATE);
++ }
++
++ private void readFileList(String file, ArrayList result) {
++ try {
++ BufferedReader b = new BufferedReader(new FileReader(file));
++ String line;
++ while ((line = b.readLine()) != null) {
++ if (line.endsWith(SUFFIX_STRING_java))
++ result.add(line);
++ }
++ b.close();
++ } catch (IOException err) {
++ fail(err);
++ }
++ }
++
++ private void readAllFileListFiles(ArrayList fileList, ArrayList result) {
++ Iterator it = fileList.iterator();
++ while (it.hasNext()) {
++ readFileList((String) it.next(), result);
++ }
++ }
++
++ private void handleWall(boolean enable) {
++ // A somewhat arbitrary list. We use the GCC names
++ // here, and the local handleWarningToken translates
++ // for us.
++ handleWarningToken("constructor-name", enable);
++ handleWarningToken("pkg-default-method", enable);
++ handleWarningToken("masked-catch-block", enable);
++ handleWarningToken("all-deprecation", enable);
++ handleWarningToken("unused-local", enable);
++ handleWarningToken("unused-label", enable);
++ handleWarningToken("static-receiver", enable);
++ handleWarningToken("indirect-static", enable);
++ handleWarningToken("no-effect-assign", enable);
++ handleWarningToken("char-concat", enable);
++ handleWarningToken("useless-type-check", enable);
++ handleWarningToken("final-bound", enable);
++ handleWarningToken("assert-identifier", enable);
++ handleWarningToken("enum-identifier", enable);
++ handleWarningToken("finally", enable);
++ handleWarningToken("varargs-cast", enable);
++ handleWarningToken("unused", enable);
++ handleWarningToken("forbidden", enable);
++ }
++
++ public void configure(String[] argv) {
++ if ((argv == null) || (argv.length == 0)) {
++ // This is a "can't happen".
++ System.exit(1);
++ }
++
++ ArrayList files = new ArrayList();
++ ArrayList otherFiles = new ArrayList();
++ String classpath = null;
++ boolean haveFileList = false;
++ boolean inhibitAllWarnings = false;
++ boolean treatWarningsAsErrors = false;
++
++ for (int i = 0; i < argv.length; ++i) {
++ String currentArg = argv[i];
++
++ if (currentArg.startsWith("-fencoding=")) { //$NON-NLS-1$
++ // Simply accept the last one.
++ String encoding = getArgument(currentArg);
++ try { // ensure encoding is supported
++ new InputStreamReader(new ByteArrayInputStream(new byte[0]), encoding);
++ } catch (UnsupportedEncodingException e) {
++ throw new IllegalArgumentException(
++ this.bind("configure.unsupportedEncoding", encoding)); //$NON-NLS-1$
++ }
++ this.options.put(CompilerOptions.OPTION_Encoding, encoding);
++ } else if (currentArg.startsWith("-foutput-class-dir=")) { //$NON-NLS-1$
++ String arg = getArgument(currentArg);
++ if (this.destinationPath != null) {
++ StringBuffer errorMessage = new StringBuffer();
++ errorMessage.append("-d"); //$NON-NLS-1$
++ errorMessage.append(' ');
++ errorMessage.append(arg);
++ throw new IllegalArgumentException(
++ this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
++ }
++ this.setDestinationPath(arg);
++ } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
++ classpath = getArgument(currentArg);
++ } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$
++ ++i;
++ if (i >= argv.length)
++ throw new IllegalArgumentException(this.bind("gcc.zipArg")); //$NON-NLS-1$
++ this.zipDestination = argv[i];
++ } else if (currentArg.equals("-fzip-dependency")) { //$NON-NLS-1$
++ ++i;
++ if (i >= argv.length)
++ throw new IllegalArgumentException(this.bind("gcc.zipDepArg")); //$NON-NLS-1$
++ this.zipDependencyDestination = argv[i];
++ } else if (currentArg.startsWith("-g")) { //$NON-NLS-1$
++ if (currentArg.equals("-g0")) { //$NON-NLS-1$
++ setDebugLevel(0);
++ } else if (currentArg.equals("-g2") || currentArg.equals("-g3") //$NON-NLS-1$ //$NON-NLS-2$
++ || currentArg.equals("-g")) { //$NON-NLS-1$
++ setDebugLevel(2);
++ } else {
++ // Handle -g1 but also things like -gstabs.
++ setDebugLevel(1);
++ }
++ } else if (currentArg.equals("-Werror")) { //$NON-NLS-1$
++ treatWarningsAsErrors = true;
++ } else if (currentArg.equals("-Wno-error")) { //$NON-NLS-1$
++ treatWarningsAsErrors = false;
++ } else if (currentArg.equals("-Wall")) { //$NON-NLS-1$
++ handleWall(true);
++ } else if (currentArg.equals("-Wno-all")) { //$NON-NLS-1$
++ handleWall(false);
++ } else if (currentArg.startsWith("-Wno-")) { //$NON-NLS-1$
++ handleWarningToken(currentArg.substring(5), false);
++ } else if (currentArg.startsWith("-W")) { //$NON-NLS-1$
++ handleWarningToken(currentArg.substring(2), true);
++ } else if (currentArg.equals("-w")) { //$NON-NLS-1$
++ inhibitAllWarnings = true;
++ } else if (currentArg.startsWith("-O")) { //$NON-NLS-1$
++ // Ignore.
++ } else if (currentArg.equals("-v")) { //$NON-NLS-1$
++ this.verbose = true;
++ } else if (currentArg.equals("-fsyntax-only")) { //$NON-NLS-1$
++ this.syntaxOnly = true;
++ } else if (currentArg.startsWith("-fsource=")) { //$NON-NLS-1$
++ currentArg = getArgument(currentArg);
++ if (currentArg.equals("1.3")) { //$NON-NLS-1$
++ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_3);
++ } else if (currentArg.equals("1.4")) { //$NON-NLS-1$
++ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4);
++ } else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
++ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
++ } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
++ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
++ } else {
++ throw new IllegalArgumentException(this.bind("configure.source", currentArg)); //$NON-NLS-1$
++ }
++ } else if (currentArg.startsWith("-ftarget=")) { //$NON-NLS-1$
++ currentArg = getArgument(currentArg);
++ if (currentArg.equals("1.1")) { //$NON-NLS-1$
++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_1);
++ } else if (currentArg.equals("1.2")) { //$NON-NLS-1$
++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_2);
++ } else if (currentArg.equals("1.3")) { //$NON-NLS-1$
++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_3);
++ } else if (currentArg.equals("1.4")) { //$NON-NLS-1$
++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_4);
++ } else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
++ } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
++ } else if (currentArg.equals("jsr14")) { //$NON-NLS-1$
++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_JSR14);
++ } else {
++ throw new IllegalArgumentException(this.bind("configure.targetJDK", currentArg)); //$NON-NLS-1$
++ }
++ } else if (currentArg.equals("-ffilelist-file")) { //$NON-NLS-1$
++ haveFileList = true;
++ } else if (currentArg.endsWith(SuffixConstants.SUFFIX_STRING_java)) {
++ files.add(currentArg);
++ } else if (currentArg.charAt(0) == '-'){
++ // FIXME: error if not a file?
++ } else {
++ otherFiles.add(currentArg);
++ }
++ }
++
++ // Read the file list file. We read them all, but really there
++ // will only be one.
++ if (haveFileList)
++ readAllFileListFiles(otherFiles, files);
++
++ this.filenames = (String[]) files.toArray(new String[0]);
++ this.encodings = new String[this.filenames.length];
++ this.destinationPaths = new String[this.filenames.length];
++ for (int i = 0; i < this.filenames.length; ++i)
++ this.destinationPaths[i] = this.destinationPath;
++
++ // Classpath processing.
++ ArrayList result = new ArrayList();
++ if (classpath == null)
++ throw new IllegalArgumentException(this.bind("gcc.noClasspath")); //$NON-NLS-1$
++ parsePath(result, classpath);
++
++ // We must always create both output files, even if one is not used.
++ // That way we will always pass valid zip file on to jc1.
++ try {
++ getZipOutput();
++ getDependencyOutput();
++ } catch (IOException err) {
++ fail(err);
++ }
++
++ if (inhibitAllWarnings)
++ disableAll(ProblemSeverities.Warning);
++ if (treatWarningsAsErrors)
++ turnWarningsToErrors();
++
++ this.checkedClasspaths = new FileSystem.Classpath[result.size()];
++ result.toArray(this.checkedClasspaths);
++
++ this.logger.logCommandLineArguments(argv);
++ this.logger.logOptions(this.options);
++ this.logger.logClasspath(this.checkedClasspaths);
++
++ this.maxRepetition = 1;
++ }
++
++ public boolean compile(String[] argv) {
++ boolean result = super.compile(argv);
++ try {
++ if (zipStream != null) {
++ zipStream.finish();
++ zipStream.close();
++ }
++ if (zipDependencyStream != null) {
++ zipDependencyStream.finish();
++ zipDependencyStream.close();
++ }
++ } catch (IOException err) {
++ fail(err);
++ }
++ return result;
++ }
++
++ public static void main(String[] argv) {
++ boolean result = new GCCMain(new PrintWriter(System.out), new PrintWriter(System.err), false).compile(argv);
++ System.exit(result ? 0 : 1);
++ }
++}
Copied: tags/ecj/3.11.0-1~exp1/debian/patches/remove-javacore.diff (from rev 19063, trunk/ecj/debian/patches/remove-javacore.diff)
===================================================================
--- tags/ecj/3.11.0-1~exp1/debian/patches/remove-javacore.diff (rev 0)
+++ tags/ecj/3.11.0-1~exp1/debian/patches/remove-javacore.diff 2016-05-18 19:32:01 UTC (rev 19066)
@@ -0,0 +1,19 @@
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+@@ -18,7 +18,6 @@
+ import java.util.Hashtable;
+ import java.util.List;
+
+-import org.eclipse.jdt.core.JavaCore;
+ import org.eclipse.jdt.core.compiler.CharOperation;
+ import org.eclipse.jdt.internal.compiler.CompilationResult;
+ import org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;
+@@ -188,7 +187,7 @@
+ ProblemReporter problemReporter =
+ new ProblemReporter(
+ DefaultErrorHandlingPolicies.proceedWithAllProblems(),
+- new CompilerOptions(JavaCore.getOptions()),
++ new CompilerOptions(),
+ new DefaultProblemFactory());
+ Parser parser = new Parser(problemReporter, false);
+
Deleted: tags/ecj/3.11.0-1~exp1/debian/patches/remove-overrides.diff
===================================================================
--- trunk/ecj/debian/patches/remove-overrides.diff 2016-05-17 13:41:09 UTC (rev 19062)
+++ tags/ecj/3.11.0-1~exp1/debian/patches/remove-overrides.diff 2016-05-18 19:32:01 UTC (rev 19066)
@@ -1,55 +0,0 @@
-Description: Fixes compilation errors caused by @Override annotations (bug?)
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/lookup/CaptureBinding18.java
-+++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/lookup/CaptureBinding18.java
-@@ -196,15 +196,12 @@
- final CaptureBinding18 newCapture = (CaptureBinding18) clone(enclosingType());
- newCapture.tagBits = this.tagBits;
- Substitution substitution = new Substitution() {
-- @Override
- public TypeBinding substitute(TypeVariableBinding typeVariable) {
- return (typeVariable == CaptureBinding18.this) ? newCapture : typeVariable; //$IDENTITY-COMPARISON$
- }
-- @Override
- public boolean isRawSubstitution() {
- return false;
- }
-- @Override
- public LookupEnvironment environment() {
- return CaptureBinding18.this.environment;
- }
---- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/NonNullDefaultAwareTypeAnnotationWalker.java
-+++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/NonNullDefaultAwareTypeAnnotationWalker.java
-@@ -75,11 +75,9 @@
- 'L', CharOperation.concatWith(environment.getNonNullAnnotationName(), '/'), ';');
- // create the synthetic annotation:
- return new IBinaryAnnotation() {
-- @Override
- public char[] getTypeName() {
- return nonNullAnnotationName;
- }
-- @Override
- public IBinaryElementValuePair[] getElementValuePairs() {
- return null;
- }
---- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/util/Sorting.java
-+++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/util/Sorting.java
-@@ -112,7 +112,6 @@
- /** Sort inference variables by rank. */
- public static void sortInferenceVariables(InferenceVariable[] variables) {
- Arrays.sort(variables, new Comparator<InferenceVariable>() {
-- @Override
- public int compare(InferenceVariable iv1, InferenceVariable iv2) {
- return iv1.rank - iv2.rank;
- }
---- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/MemberValuePair.java
-+++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/MemberValuePair.java
-@@ -106,7 +106,6 @@
- // the next check may need deferring:
- final boolean[] shouldExit = new boolean[1];
- Runnable check = new Runnable() {
-- @Override
- public void run() {
- if (!(MemberValuePair.this.value.isConstantValueOfTypeAssignableToType(valueType, requiredType)
- || valueType.isCompatibleWith(requiredType))) {
Copied: tags/ecj/3.11.0-1~exp1/debian/patches/remove-overrides.diff (from rev 19063, trunk/ecj/debian/patches/remove-overrides.diff)
===================================================================
--- tags/ecj/3.11.0-1~exp1/debian/patches/remove-overrides.diff (rev 0)
+++ tags/ecj/3.11.0-1~exp1/debian/patches/remove-overrides.diff 2016-05-18 19:32:01 UTC (rev 19066)
@@ -0,0 +1,508 @@
+Description: Fixes compilation errors caused by @Override annotations (bug?)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/lookup/CaptureBinding18.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/lookup/CaptureBinding18.java
+@@ -241,15 +241,12 @@
+ final CaptureBinding18 newCapture = (CaptureBinding18) clone(enclosingType());
+ newCapture.tagBits = this.tagBits;
+ Substitution substitution = new Substitution() {
+- @Override
+ public TypeBinding substitute(TypeVariableBinding typeVariable) {
+ return (typeVariable == CaptureBinding18.this) ? newCapture : typeVariable; //$IDENTITY-COMPARISON$
+ }
+- @Override
+ public boolean isRawSubstitution() {
+ return false;
+ }
+- @Override
+ public LookupEnvironment environment() {
+ return CaptureBinding18.this.environment;
+ }
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/NonNullDefaultAwareTypeAnnotationWalker.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/NonNullDefaultAwareTypeAnnotationWalker.java
+@@ -76,11 +76,9 @@
+ 'L', CharOperation.concatWith(environment.getNonNullAnnotationName(), '/'), ';');
+ // create the synthetic annotation:
+ return new IBinaryAnnotation() {
+- @Override
+ public char[] getTypeName() {
+ return nonNullAnnotationName;
+ }
+- @Override
+ public IBinaryElementValuePair[] getElementValuePairs() {
+ return null;
+ }
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/util/Sorting.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/util/Sorting.java
+@@ -112,7 +112,6 @@
+ /** Sort inference variables by rank. */
+ public static void sortInferenceVariables(InferenceVariable[] variables) {
+ Arrays.sort(variables, new Comparator<InferenceVariable>() {
+- @Override
+ public int compare(InferenceVariable iv1, InferenceVariable iv2) {
+ return iv1.rank - iv2.rank;
+ }
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/MemberValuePair.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/MemberValuePair.java
+@@ -106,7 +106,6 @@
+ // the next check may need deferring:
+ final boolean[] shouldExit = new boolean[1];
+ Runnable check = new Runnable() {
+- @Override
+ public void run() {
+ if (!(MemberValuePair.this.value.isConstantValueOfTypeAssignableToType(valueType, requiredType)
+ || valueType.isCompatibleWith(requiredType))) {
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/TypeAnnotationWalker.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/TypeAnnotationWalker.java
+@@ -44,17 +44,14 @@
+
+ // ==== filter by top-level targetType: ====
+
+- @Override
+ public ITypeAnnotationWalker toField() {
+ return toTarget(AnnotationTargetTypeConstants.FIELD);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodReturn() {
+ return toTarget(AnnotationTargetTypeConstants.METHOD_RETURN);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toReceiver() {
+ return toTarget(AnnotationTargetTypeConstants.METHOD_RECEIVER);
+ }
+@@ -75,7 +72,6 @@
+ return restrict(newMatches, 0);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameter(boolean isClassTypeParameter, int rank) {
+ long newMatches = this.matches;
+ if (newMatches == 0)
+@@ -92,7 +88,6 @@
+ return restrict(newMatches, 0);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameterBounds(boolean isClassTypeParameter, int parameterRank) {
+ long newMatches = this.matches;
+ if (newMatches == 0)
+@@ -110,7 +105,6 @@
+ return restrict(newMatches, 0);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeBound(short boundIndex) {
+ long newMatches = this.matches;
+ if (newMatches == 0)
+@@ -131,7 +125,6 @@
+ * {@inheritDoc}
+ * <p>(superTypesSignature is ignored in this implementation).</p>
+ */
+- @Override
+ public ITypeAnnotationWalker toSupertype(short index, char[] superTypeSignature) {
+ long newMatches = this.matches;
+ if (newMatches == 0)
+@@ -147,7 +140,6 @@
+ return restrict(newMatches, 0);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodParameter(short index) {
+ long newMatches = this.matches;
+ if (newMatches == 0)
+@@ -163,7 +155,6 @@
+ return restrict(newMatches, 0);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toThrows(int index) {
+ long newMatches = this.matches;
+ if (newMatches == 0)
+@@ -181,7 +172,6 @@
+
+ // ==== descending into details: ====
+
+- @Override
+ public ITypeAnnotationWalker toTypeArgument(int rank) {
+ // like toNextDetail() but also checking byte 2 against rank
+ long newMatches = this.matches;
+@@ -201,7 +191,6 @@
+ return restrict(newMatches, this.pathPtr+2);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toWildcardBound() {
+ long newMatches = this.matches;
+ if (newMatches == 0)
+@@ -219,12 +208,10 @@
+ return restrict(newMatches, this.pathPtr+2);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toNextArrayDimension() {
+ return toNextDetail(AnnotationTargetTypeConstants.NEXT_ARRAY_DIMENSION);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toNextNestedType() {
+ return toNextDetail(AnnotationTargetTypeConstants.NEXT_NESTED_TYPE);
+ }
+@@ -250,7 +237,6 @@
+
+ // ==== leaves: the actual annotations: ====
+
+- @Override
+ public IBinaryAnnotation[] getAnnotationsAtCursor(int currentTypeId) {
+ int length = this.typeAnnotations.length;
+ IBinaryAnnotation[] filtered = new IBinaryAnnotation[length];
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/ExternalAnnotationProvider.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/ExternalAnnotationProvider.java
+@@ -210,7 +210,6 @@
+ }
+
+ abstract class SingleMarkerAnnotation implements IBinaryAnnotation {
+- @Override
+ public IBinaryElementValuePair[] getElementValuePairs() {
+ return ElementValuePairInfo.NoMembers;
+ }
+@@ -224,12 +223,12 @@
+ void initAnnotations(final LookupEnvironment environment) {
+ if (this.NULLABLE_ANNOTATION == null) {
+ this.NULLABLE_ANNOTATION = new SingleMarkerAnnotation() {
+- @Override public char[] getTypeName() { return getBinaryTypeName(environment.getNullableAnnotationName()); }
++ public char[] getTypeName() { return getBinaryTypeName(environment.getNullableAnnotationName()); }
+ };
+ }
+ if (this.NONNULL_ANNOTATION == null) {
+ this.NONNULL_ANNOTATION = new SingleMarkerAnnotation() {
+- @Override public char[] getTypeName() { return getBinaryTypeName(environment.getNonNullAnnotationName()); }
++ public char[] getTypeName() { return getBinaryTypeName(environment.getNonNullAnnotationName()); }
+ };
+ }
+ }
+@@ -306,32 +305,26 @@
+ return this.wrapper;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toReceiver() {
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameter(boolean isClassTypeParameter, int rank) {
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameterBounds(boolean isClassTypeParameter, int parameterRank) {
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeBound(short boundIndex) {
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toSupertype(short index, char[] superTypeSignature) {
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeArgument(int rank) {
+ if (rank == 0) {
+ int start = CharOperation.indexOf('<', this.source, this.pos) + 1;
+@@ -354,7 +347,6 @@
+ return new MethodAnnotationWalker(this.source, next, this.environment);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toWildcardBound() {
+ switch (this.source[this.pos]) {
+ case '-':
+@@ -365,7 +357,6 @@
+ }
+ }
+
+- @Override
+ public ITypeAnnotationWalker toNextArrayDimension() {
+ if (this.source[this.pos] == '[') {
+ int newPos = this.pos+1;
+@@ -377,12 +368,10 @@
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toNextNestedType() {
+ return this; // FIXME(stephan)
+ }
+
+- @Override
+ public IBinaryAnnotation[] getAnnotationsAtCursor(int currentTypeId) {
+ if (this.pos != -1 && this.pos < this.source.length-2) {
+ switch (this.source[this.pos]) {
+@@ -451,7 +440,6 @@
+ }
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameter(boolean isClassTypeParameter, int rank) {
+ if (rank == this.currentRank)
+ return this;
+@@ -460,12 +448,10 @@
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameterBounds(boolean isClassTypeParameter, int parameterRank) {
+ return new TypeParametersAnnotationWalker(this.source, this.rankStarts[parameterRank], parameterRank, this.rankStarts, this.environment);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeBound(short boundIndex) {
+ // assume we are positioned either at the start of the bounded type parameter
+ // or at the start of a previous type bound
+@@ -485,27 +471,22 @@
+ return this;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toField() {
+ throw new UnsupportedOperationException("Cannot navigate to fields"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodReturn() {
+ throw new UnsupportedOperationException("Cannot navigate to method return"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodParameter(short index) {
+ throw new UnsupportedOperationException("Cannot navigate to method parameter"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toThrows(int index) {
+ throw new UnsupportedOperationException("Cannot navigate to throws"); //$NON-NLS-1$
+ }
+
+- @Override
+ public IBinaryAnnotation[] getAnnotationsAtCursor(int currentTypeId) {
+ if (this.pos != -1 && this.pos < this.source.length-1) {
+ switch (this.source[this.pos]) {
+@@ -528,22 +509,18 @@
+
+ // actual implementation is inherited, main entries: toTypeArgument & getAnnotationsAtCursor
+
+- @Override
+ public ITypeAnnotationWalker toField() {
+ throw new UnsupportedOperationException("Supertype has no field annotations"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodReturn() {
+ throw new UnsupportedOperationException("Supertype has no method return"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodParameter(short index) {
+ throw new UnsupportedOperationException("Supertype has no method parameter"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toThrows(int index) {
+ throw new UnsupportedOperationException("Supertype has no throws"); //$NON-NLS-1$
+ }
+@@ -572,7 +549,6 @@
+ return end;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameter(boolean isClassTypeParameter, int rank) {
+ if (this.source[0] == '<') {
+ if (this.typeParametersWalker == null)
+@@ -582,14 +558,12 @@
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameterBounds(boolean isClassTypeParameter, int parameterRank) {
+ if (this.typeParametersWalker != null)
+ return this.typeParametersWalker.toTypeParameterBounds(isClassTypeParameter, parameterRank);
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodReturn() {
+ int close = CharOperation.indexOf(')', this.source);
+ if (close != -1) {
+@@ -600,7 +574,6 @@
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodParameter(short index) {
+ if (index == 0) {
+ int start = CharOperation.indexOf('(', this.source) + 1;
+@@ -618,17 +591,14 @@
+ return this;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toThrows(int index) {
+ return this;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toField() {
+ throw new UnsupportedOperationException("Methods have no fields"); //$NON-NLS-1$
+ }
+
+- @Override
+ public int getParameterCount() {
+ int count = 0;
+ int start = CharOperation.indexOf('(', this.source) + 1;
+@@ -645,22 +615,18 @@
+ super(source, pos, environment);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toField() {
+ return this;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodReturn() {
+ throw new UnsupportedOperationException("Field has no method return"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodParameter(short index) {
+ throw new UnsupportedOperationException("Field has no method parameter"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toThrows(int index) {
+ throw new UnsupportedOperationException("Field has no throws"); //$NON-NLS-1$
+ }
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java
+@@ -125,7 +125,6 @@
+ }
+ return null;
+ }
+- at Override
+ public boolean hasAnnotationFileFor(String qualifiedTypeName) {
+ return this.zipFile.getEntry(qualifiedTypeName+'.'+ExternalAnnotationProvider.ANNOTION_FILE_EXTENSION) != null;
+ }
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+@@ -153,7 +153,6 @@
+ return sourceExists ? null : findSourceSecondaryType(typeName, qualifiedPackageName, qualifiedBinaryFileName); /* only secondary types */
+ }
+
+- at Override
+ public boolean hasAnnotationFileFor(String qualifiedTypeName) {
+ int pos = qualifiedTypeName.lastIndexOf('/');
+ if (pos != -1 && (pos + 1 < qualifiedTypeName.length())) {
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/FakedTrackingVariable.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/FakedTrackingVariable.java
+@@ -781,7 +781,6 @@
+ this.atExit = atExit;
+ setUpForStage(Stage.OuterLess);
+ }
+- @Override
+ public boolean hasNext() {
+ FakedTrackingVariable trackingVar;
+ switch (this.stage) {
+@@ -834,11 +833,9 @@
+ this.iterator = this.varSet.iterator();
+ this.stage = nextStage;
+ }
+- @Override
+ public FakedTrackingVariable next() {
+ return this.next;
+ }
+- @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java
+@@ -456,7 +456,6 @@
+ * If 'member' is given it must be either of IBinaryField or IBinaryMethod, in which case we're seeking annotations for that member.
+ * Otherwise we're seeking annotations for top-level elements of a type (type parameters & super types).
+ */
+- at Override
+ public ITypeAnnotationWalker enrichWithExternalAnnotationsFor(ITypeAnnotationWalker walker, Object member, LookupEnvironment environment) {
+ if (walker == ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER && this.annotationProvider != null) {
+ if (member == null) {
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/BatchCompilerRequestor.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/BatchCompilerRequestor.java
+@@ -22,7 +22,6 @@
+ this.compiler = compiler;
+ }
+
+- @Override
+ public void acceptResult(CompilationResult compilationResult) {
+ if (compilationResult.lineSeparatorPositions != null) {
+ int unitLineCount = compilationResult.lineSeparatorPositions.length;
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java
+@@ -499,7 +499,6 @@
+ // Nothing to do.
+ }
+
+- @Override
+ public void registerResult(TypeBinding targetType, MethodBinding method) {
+ // Nothing to do.
+ }
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
+@@ -716,7 +716,6 @@
+ this.inferenceContexts.put(method, infCtx18);
+ }
+
+- at Override
+ public void registerResult(TypeBinding targetType, MethodBinding method) {
+ if (method != null && method.isConstructor()) { // ignore the factory.
+ if (this.solutionsPerTargetType == null)
+@@ -737,4 +736,4 @@
+ public InferenceContext18 freshInferenceContext(Scope scope) {
+ return new InferenceContext18(scope, this.arguments, this, this.outerInferenceContext);
+ }
+-}
+\ No newline at end of file
++}
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/lookup/InvocationSite.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/lookup/InvocationSite.java
+@@ -57,7 +57,6 @@
+ public boolean receiverIsImplicitThis() { return false; }
+ public InferenceContext18 freshInferenceContext(Scope scope) { return null; }
+ public ExpressionContext getExpressionContext() { return ExpressionContext.VANILLA_CONTEXT; }
+- @Override
+ public boolean isQualifiedSuper() { return false; }
+ public boolean checkingPotentialCompatibility() { return false; }
+ public void acceptPotentiallyCompatibleMethods(MethodBinding[] methods) { /* ignore */ }
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
+@@ -1053,7 +1053,6 @@
+ this.inferenceContexts.put(method, infCtx18);
+ }
+
+- at Override
+ public void registerResult(TypeBinding targetType, MethodBinding method) {
+ if (this.solutionsPerTargetType == null)
+ this.solutionsPerTargetType = new HashMap<TypeBinding, MethodBinding>();
+@@ -1075,7 +1074,6 @@
+ public InferenceContext18 freshInferenceContext(Scope scope) {
+ return new InferenceContext18(scope, this.arguments, this, this.outerInferenceContext);
+ }
+- at Override
+ public boolean isQualifiedSuper() {
+ return this.receiver.isQualifiedSuper();
+ }
Copied: tags/ecj/3.11.0-1~exp1/debian/patches/replace-diamond-operators.diff (from rev 19063, trunk/ecj/debian/patches/replace-diamond-operators.diff)
===================================================================
--- tags/ecj/3.11.0-1~exp1/debian/patches/replace-diamond-operators.diff (rev 0)
+++ tags/ecj/3.11.0-1~exp1/debian/patches/replace-diamond-operators.diff 2016-05-18 19:32:01 UTC (rev 19066)
@@ -0,0 +1,40 @@
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/Compiler.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/Compiler.java
+@@ -489,7 +489,7 @@
+ for (CategorizedProblem problem : errors) {
+ if (problem.getCategoryID() == CategorizedProblem.CAT_UNSPECIFIED) {
+ if (this.aptProblems == null) {
+- this.aptProblems = new HashMap<>();
++ this.aptProblems = new HashMap<String, APTProblem[]>();
+ }
+ APTProblem[] problems = this.aptProblems.get(new String(unitDecl.getFileName()));
+ if (problems == null) {
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/FakedTrackingVariable.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/FakedTrackingVariable.java
+@@ -776,7 +776,7 @@
+ }
+
+ public IteratorForReporting(List<FakedTrackingVariable> variables, Scope scope, boolean atExit) {
+- this.varSet = new HashSet<>(variables);
++ this.varSet = new HashSet<FakedTrackingVariable>(variables);
+ this.scope = scope;
+ this.atExit = atExit;
+ setUpForStage(Stage.OuterLess);
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/util/Util.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/util/Util.java
+@@ -1125,7 +1125,7 @@
+ bootclasspathProperty = System.getProperty("org.apache.harmony.boot.class.path"); //$NON-NLS-1$
+ }
+ }
+- List<String> filePaths = new ArrayList<>();
++ List<String> filePaths = new ArrayList<String>();
+ if ((bootclasspathProperty != null) && (bootclasspathProperty.length() != 0)) {
+ StringTokenizer tokenizer = new StringTokenizer(bootclasspathProperty, File.pathSeparator);
+ while (tokenizer.hasMoreTokens()) {
+@@ -1630,4 +1630,4 @@
+ }
+ }
+
+-}
+\ No newline at end of file
++}
Deleted: tags/ecj/3.11.0-1~exp1/debian/patches/series
===================================================================
--- trunk/ecj/debian/patches/series 2016-05-17 13:41:09 UTC (rev 19062)
+++ tags/ecj/3.11.0-1~exp1/debian/patches/series 2016-05-18 19:32:01 UTC (rev 19066)
@@ -1,2 +0,0 @@
-gcc-changes.diff
-remove-overrides.diff
Copied: tags/ecj/3.11.0-1~exp1/debian/patches/series (from rev 19063, trunk/ecj/debian/patches/series)
===================================================================
--- tags/ecj/3.11.0-1~exp1/debian/patches/series (rev 0)
+++ tags/ecj/3.11.0-1~exp1/debian/patches/series 2016-05-18 19:32:01 UTC (rev 19066)
@@ -0,0 +1,4 @@
+gcc-changes.diff
+remove-overrides.diff
+replace-diamond-operators.diff
+remove-javacore.diff
Deleted: tags/ecj/3.11.0-1~exp1/debian/rules
===================================================================
--- trunk/ecj/debian/rules 2016-05-17 13:41:09 UTC (rev 19062)
+++ tags/ecj/3.11.0-1~exp1/debian/rules 2016-05-18 19:32:01 UTC (rev 19066)
@@ -1,280 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-VERSION := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*//')
-UVERSION := $(shell echo $(VERSION) | sed 's/~.*//')
-
-GCC_VERSION := $(shell ls -l /usr/bin/gcj | sed 's/.*-> gcj-\(.*\)/\1/')
-GCC_VERSION := 5
-
-LIBGCJ_EXT := $(shell ls -l /usr/lib/$(DEB_HOST_MULTIARCH)/libgcj_bc.so.1 | sed 's/.*\.//')
-LIBGCJ_SOVER = $(LIBGCJ_EXT)
-LIBGCJ_SOVER = 16
-REQ_VERSION = 4.4.6
-
-GCJ = gcj-$(GCC_VERSION)
-GIJ = gij-$(GCC_VERSION)
-GCJDBTOOL = gcj-dbtool-$(GCC_VERSION)
-GCJSUBDIR = /usr/lib/$(DEB_HOST_MULTIARCH)/gcj-$(GCC_VERSION)-$(LIBGCJ_SOVER)
-
-# work around ecj1 having fallen out of the gcc search path
-PATH := $(CURDIR):$(PATH)
-export PATH
-
-with_native := yes
-with_rebuild := yes
-with_sourcebuild := yes
-
-ifneq (,$(filter $(DEB_HOST_ARCH), arm armel))
- with_rebuild := no
-endif
-
-ifneq (,$(filter $(DEB_HOST_ARCH), arm))
- with_sourcebuild := no
-endif
-
-DEB_DH_GENCONTROL_ARGS = -- \
- '-Vpkg:gij=gcj-$(GCC_VERSION)-jre-headless (>= $(REQ_VERSION))' \
- '-Vpkg:libgcjjar=gcj-$(GCC_VERSION)-jre-lib (>= $(REQ_VERSION))'
-
-JAR = eclipse-ecj.jar
-
-default: build
-
-eclipse_root = $(CURDIR)/../eclipse
-
-build/ecj:: build/stamp-bytecode build/stamp-nativecode
-
-build/stamp-bytecode:
-ifneq (,$(findstring $(DEB_HOST_ARCH),arm))
- @echo 'Sorry ecj is no longer built on $(DEB_HOST_ARCH) due to a lack of porters'
- @echo 'supporting gij/gcj on this architecture. Please consider helping if you can.'
- false
-endif
- rm -rf build/bin
- mkdir -p build/bin
-
-ifeq ($(with_sourcebuild),yes)
- cp -r src/org.eclipse.jdt.core/org build/bin/
- cat gcc.properties \
- >> build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties
- rm -rf build/bin/org/eclipse/jdt/internal/compiler/apt
- rm -rf build/bin/org/eclipse/jdt/internal/compiler/tool
-
- # Replace the bundle_version parameter with the actual version
- sed -i 's/bundle_qualifier, bundle_version/$(UVERSION)/' \
- build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties
-
- find build/bin -name '*.java' > build/sourcefiles
- split -l 25 build/sourcefiles ecj-sources.
- ls -l
- mv ecj-sources.* build/bin
- ls -l . build/bin
-
- ln -sf /usr/lib/gcc/ecj1 $(CURDIR)/ecj1
- set -e; \
- for list in $$(find build/bin -name 'ecj-sources.*'); do \
- echo "building files in $$list ..."; \
- echo $(GCJ) -d build/bin -C -g \
- -I/usr/share/ant/lib/ant.jar \
- -Ibuild/bin \
- $$(cat $$list); \
- $(GCJ) -v -d build/bin -C -g \
- -I/usr/share/ant/lib/ant.jar \
- -Ibuild/bin \
- -Wno-all -Wno-unchecked -Wno-raw -Wno-resource \
- $$(cat $$list); \
- done
-
- find build/bin -name 'sources.list' -exec rm -f {} \;
- find build/bin -name '*.java' -exec rm -f {} \;
- find build/bin -name '*.html' -exec rm -f {} \;
-
- mkdir -p build/bootstrap
- fastjar -c -C build/bin . -f build/bootstrap/$(JAR)
-
- ifeq ($(with_rebuild),yes)
- : # rebuild the compiler
- rm -rf build/bin
- mkdir -p build/bin
- cp -r src/org.eclipse.jdt.core/org build/bin/
- cat gcc.properties \
- >> build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties
- rm -rf build/bin/org/eclipse/jdt/internal/compiler/apt
- rm -rf build/bin/org/eclipse/jdt/internal/compiler/tool
-
- # Replace the bundle_version parameter with the actual version
- sed -i 's/bundle_qualifier, bundle_version/$(UVERSION)/' \
- build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties
-
- time $(GIJ) \
- -classpath build/bootstrap/$(JAR):/usr/share/ant/lib/ant.jar \
- org.eclipse.jdt.internal.compiler.batch.Main \
- -bootclasspath /usr/share/java/libgcj-$(GCC_VERSION).jar \
- build/bin
-
- find build/bin -name '*.java' -exec rm -f {} \;
- find build/bin -name '*.html' -exec rm -f {} \;
-
- mkdir -p build/dist
- fastjar -c -C build/bin . -f build/dist/$(JAR)
- else
- mkdir -p build/dist
- cp -p build/bootstrap/$(JAR) build/dist/$(JAR)
- endif
-else
- mkdir -p build/bin
- unzip -d build/bin -q /usr/share/java/eclipse-ecj.jar
- mkdir -p build/dist
- cp -p /usr/share/java/eclipse-ecj.jar build/dist/$(JAR)
-endif
- mkdir -p build/exe
- cp build/dist/$(JAR) build/exe/ecj-standalone.jar
- zip -d build/exe/ecj-standalone.jar \
- 'org/eclipse/jdt/core/JDTCompilerAdapter*'
-
- touch build/stamp-bytecode
-
-build/stamp-nativecode: build/stamp-bytecode
- find build/dist -name '*.jar.*.jar' | xargs -r rm -f
-ifeq ($(with_native),yes)
- : # $(JAR).so
-
- cd build/bin && find -name '*.rsc' -o -name '*.properties' -o -name '*.props' \
- | fastjar -c -@ - -f $(CURDIR)/build/resources.jar
- $(GCJ) \
- -c -O2 -g -fPIC -fjni -findirect-dispatch \
- -o build/dist/resources.o build/resources.jar
- cp -p build/dist/resources.o build/exe/
-
- PYTHONPATH=$(CURDIR)/debian \
- RPATH=-Wl,-rpath,$(GCJSUBDIR) \
- time python debian/aot-compile \
- --gcj=$(GCJ) --dbtool=$(GCJDBTOOL) \
- -L /usr/lib/gcj build/dist build/dist
-
- PYTHONPATH=$(CURDIR)/debian \
- RPATH=-Wl,-rpath,$(GCJSUBDIR) \
- time python debian/aot-compile \
- --gcj=$(GCJ) --dbtool=$(GCJDBTOOL) \
- -L /usr/lib/gcj build/exe build/exe
-
- ifeq (0,1)
- : # ecj-gcj
- time $(GCJ) \
- -O1 -g -Wl,-O1 -Wl,-rpath,$(GCJSUBDIR) -Wl,-z,relro \
- --main=org.eclipse.jdt.internal.compiler.batch.Main \
- -o build/dist/ecj-gcj build/exe/ecj-standalone.jar
- : # ecj1
- time $(GCJ) \
- -O1 -g -Wl,-O1 -Wl,-rpath,$(GCJSUBDIR) -Wl,-z,relro \
- --main=org.eclipse.jdt.internal.compiler.batch.GCCMain \
- -o build/dist/ecj1 build/exe/ecj-standalone.jar
- endif
-endif
- touch build/stamp-nativecode
-
-
-install/libecj-java::
- mh_installpoms -plibecj-java
- mh_installjar -plibecj-java -l debian/poms/ecj.pom build/dist/$(JAR) \
- --usj-name=eclipse-ecj
-
-install/ecj::
- mkdir -p debian/tmp/usr/bin
- sed 's/@ver@/$(GCC_VERSION)/g' debian/ecj.in \
- > debian/tmp/usr/bin/ecj
- chmod 755 debian/tmp/usr/bin/ecj
-
-install/libecj-java-gcj::
-ifeq ($(with_native),yes)
- mkdir -p debian/tmp/usr/lib/gcj
- install -m 644 build/dist/$(JAR).so debian/tmp/usr/lib/gcj
-
- mkdir -p debian/tmp/usr/share/gcj/classmap.d
- install -m 644 build/dist/*.db \
- debian/tmp/usr/share/gcj/classmap.d/
-endif
-
-install/ecj1::
-ifeq ($(with_native),yes)
- mkdir -p debian/ecj1/usr/lib/$(DEB_HOST_MULTIARCH)/gcc
- install -m 755 build/exe/ecj1 debian/ecj1/usr/lib/$(DEB_HOST_MULTIARCH)/gcc/
- dh_link -p ecj1 \
- /usr/lib/$(DEB_HOST_MULTIARCH)/gcc/ecj1 /usr/lib/gcc/ecj1
-endif
-
-install/ecj-gcj::
-ifeq ($(with_native),yes)
- mkdir -p debian/tmp/usr/bin
- install -m 755 build/exe/ecj-gcj debian/tmp/usr/bin/
-endif
- mkdir -p debian/ecj-gcj/usr/bin
-
- mkdir -p debian/ecj-gcj/usr/share/man/man1
- ln -sf ecj.1.gz \
- debian/ecj-gcj/usr/share/man/man1/ecj-gcj.1.gz
-
- mkdir -p debian/ecj-gcj/usr/share/lintian/overrides
- cp -p debian/ecj-gcj.overrides \
- debian/ecj-gcj/usr/share/lintian/overrides/ecj-gcj
-
-binary-predeb/ecj1::
-# sed -i 's/libgcj[1-9][^,]*//;s/,,/,/' debian/ecj1.substvars
-
-binary-predeb/ecj-gcj::
-# sed -i 's/libgcj[1-9][^,]*//;s/,,/,/' debian/ecj-gcj.substvars
-
-clean::
- rm -rf build
- rm -f debian/*.pyc ecj1
- rm -rf debian/.mh
-
-TAG = R4_4_2
-DIR = ecj-$(DEB_UPSTREAM_VERSION)
-
-MAVEN_REPO := http://repo1.maven.org/maven2
-PACKAGE := ecj
-
-get-orig-pom:
- mkdir -p debian/poms
- wget -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
- $(MAVEN_REPO)/org/eclipse/jdt/core/compiler/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
-
-get-orig-source:
- rm -rf $(DIR) $(TAG).tar.gz $(TAG)
- wget http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/$(TAG).tar.gz
- tar xf $(TAG).tar.gz
- mkdir -p $(DIR)/src/org.eclipse.jdt.core
- cp -p $(TAG)/org.eclipse.jdt.core/scripts/about.html \
- $(DIR)/src/org.eclipse.jdt.core/
- cp -p $(TAG)/org.eclipse.jdt.core/scripts/build.xml \
- $(DIR)/src/org.eclipse.jdt.core/
-
- tar -c -f - -C $(TAG)/org.eclipse.jdt.core/compiler org \
- | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
-
- tar -c -f - -C $(TAG)/org.eclipse.jdt.core/antadapter org META-INF \
- | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
-
- find $(DIR) -name CheckDebugAttributes.java | xargs -r rm -f
- find $(DIR) -name BuildJarIndex.java | xargs -r rm -f
-
- tar -c -f - -C $(TAG)/org.eclipse.jdt.core/batch org \
- | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
-
- mkdir -p $(DIR)/src/org.eclipse.jdt.core/META-INF/services
-# cp -p $(TAG)/org.eclipse.jdt.core/scripts/META-INF/MANIFEST.MF \
-# $(DIR)/src/org.eclipse.jdt.core/META-INF/
- printf 'org.eclipse.jdt.internal.compiler.tool.EclipseCompiler #Eclipse compiler' \
- > $(DIR)/src/org.eclipse.jdt.core/META-INF/services/javax.tools.JavaCompiler
-
- # Create the upstream tarball
- tar -c -J -f ../ecj_$(VERSION).orig.tar.xz $(DIR)
-
- # Remove the temporary files
- rm -rf $(DIR) $(TAG).tar.gz $(TAG)
Copied: tags/ecj/3.11.0-1~exp1/debian/rules (from rev 19063, trunk/ecj/debian/rules)
===================================================================
--- tags/ecj/3.11.0-1~exp1/debian/rules (rev 0)
+++ tags/ecj/3.11.0-1~exp1/debian/rules 2016-05-18 19:32:01 UTC (rev 19066)
@@ -0,0 +1,280 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+VERSION := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*//')
+UVERSION := $(shell echo $(VERSION) | sed 's/~.*//')
+
+GCC_VERSION := $(shell ls -l /usr/bin/gcj | sed 's/.*-> gcj-\(.*\)/\1/')
+GCC_VERSION := 5
+
+LIBGCJ_EXT := $(shell ls -l /usr/lib/$(DEB_HOST_MULTIARCH)/libgcj_bc.so.1 | sed 's/.*\.//')
+LIBGCJ_SOVER = $(LIBGCJ_EXT)
+LIBGCJ_SOVER = 16
+REQ_VERSION = 4.4.6
+
+GCJ = gcj-$(GCC_VERSION)
+GIJ = gij-$(GCC_VERSION)
+GCJDBTOOL = gcj-dbtool-$(GCC_VERSION)
+GCJSUBDIR = /usr/lib/$(DEB_HOST_MULTIARCH)/gcj-$(GCC_VERSION)-$(LIBGCJ_SOVER)
+
+# work around ecj1 having fallen out of the gcc search path
+PATH := $(CURDIR):$(PATH)
+export PATH
+
+with_native := yes
+with_rebuild := yes
+with_sourcebuild := yes
+
+ifneq (,$(filter $(DEB_HOST_ARCH), arm armel))
+ with_rebuild := no
+endif
+
+ifneq (,$(filter $(DEB_HOST_ARCH), arm))
+ with_sourcebuild := no
+endif
+
+DEB_DH_GENCONTROL_ARGS = -- \
+ '-Vpkg:gij=gcj-$(GCC_VERSION)-jre-headless (>= $(REQ_VERSION))' \
+ '-Vpkg:libgcjjar=gcj-$(GCC_VERSION)-jre-lib (>= $(REQ_VERSION))'
+
+JAR = eclipse-ecj.jar
+
+default: build
+
+eclipse_root = $(CURDIR)/../eclipse
+
+build/ecj:: build/stamp-bytecode build/stamp-nativecode
+
+build/stamp-bytecode:
+ifneq (,$(findstring $(DEB_HOST_ARCH),arm))
+ @echo 'Sorry ecj is no longer built on $(DEB_HOST_ARCH) due to a lack of porters'
+ @echo 'supporting gij/gcj on this architecture. Please consider helping if you can.'
+ false
+endif
+ rm -rf build/bin
+ mkdir -p build/bin
+
+ifeq ($(with_sourcebuild),yes)
+ cp -r src/org.eclipse.jdt.core/org build/bin/
+ cat gcc.properties \
+ >> build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties
+ rm -rf build/bin/org/eclipse/jdt/internal/compiler/apt
+ rm -rf build/bin/org/eclipse/jdt/internal/compiler/tool
+
+ # Replace the bundle_version parameter with the actual version
+ sed -i 's/bundle_qualifier, bundle_version/$(UVERSION)/' \
+ build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties
+
+ find build/bin -name '*.java' > build/sourcefiles
+ split -l 25 build/sourcefiles ecj-sources.
+ ls -l
+ mv ecj-sources.* build/bin
+ ls -l . build/bin
+
+ ln -sf /usr/lib/gcc/ecj1 $(CURDIR)/ecj1
+ set -e; \
+ for list in $$(find build/bin -name 'ecj-sources.*'); do \
+ echo "building files in $$list ..."; \
+ echo $(GCJ) -d build/bin -C -g \
+ -I/usr/share/ant/lib/ant.jar \
+ -Ibuild/bin \
+ $$(cat $$list); \
+ $(GCJ) -v -d build/bin -C -g \
+ -I/usr/share/ant/lib/ant.jar \
+ -Ibuild/bin \
+ -Wno-all -Wno-unchecked -Wno-raw -Wno-resource \
+ $$(cat $$list); \
+ done
+
+ find build/bin -name 'sources.list' -exec rm -f {} \;
+ find build/bin -name '*.java' -exec rm -f {} \;
+ find build/bin -name '*.html' -exec rm -f {} \;
+
+ mkdir -p build/bootstrap
+ fastjar -c -C build/bin . -f build/bootstrap/$(JAR)
+
+ ifeq ($(with_rebuild),yes)
+ : # rebuild the compiler
+ rm -rf build/bin
+ mkdir -p build/bin
+ cp -r src/org.eclipse.jdt.core/org build/bin/
+ cat gcc.properties \
+ >> build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties
+ rm -rf build/bin/org/eclipse/jdt/internal/compiler/apt
+ rm -rf build/bin/org/eclipse/jdt/internal/compiler/tool
+
+ # Replace the bundle_version parameter with the actual version
+ sed -i 's/bundle_qualifier, bundle_version/$(UVERSION)/' \
+ build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties
+
+ time $(GIJ) \
+ -classpath build/bootstrap/$(JAR):/usr/share/ant/lib/ant.jar \
+ org.eclipse.jdt.internal.compiler.batch.Main \
+ -bootclasspath /usr/share/java/libgcj-$(GCC_VERSION).jar \
+ build/bin
+
+ find build/bin -name '*.java' -exec rm -f {} \;
+ find build/bin -name '*.html' -exec rm -f {} \;
+
+ mkdir -p build/dist
+ fastjar -c -C build/bin . -f build/dist/$(JAR)
+ else
+ mkdir -p build/dist
+ cp -p build/bootstrap/$(JAR) build/dist/$(JAR)
+ endif
+else
+ mkdir -p build/bin
+ unzip -d build/bin -q /usr/share/java/eclipse-ecj.jar
+ mkdir -p build/dist
+ cp -p /usr/share/java/eclipse-ecj.jar build/dist/$(JAR)
+endif
+ mkdir -p build/exe
+ cp build/dist/$(JAR) build/exe/ecj-standalone.jar
+ zip -d build/exe/ecj-standalone.jar \
+ 'org/eclipse/jdt/core/JDTCompilerAdapter*'
+
+ touch build/stamp-bytecode
+
+build/stamp-nativecode: build/stamp-bytecode
+ find build/dist -name '*.jar.*.jar' | xargs -r rm -f
+ifeq ($(with_native),yes)
+ : # $(JAR).so
+
+ cd build/bin && find -name '*.rsc' -o -name '*.properties' -o -name '*.props' \
+ | fastjar -c -@ - -f $(CURDIR)/build/resources.jar
+ $(GCJ) \
+ -c -O2 -g -fPIC -fjni -findirect-dispatch \
+ -o build/dist/resources.o build/resources.jar
+ cp -p build/dist/resources.o build/exe/
+
+ PYTHONPATH=$(CURDIR)/debian \
+ RPATH=-Wl,-rpath,$(GCJSUBDIR) \
+ time python debian/aot-compile \
+ --gcj=$(GCJ) --dbtool=$(GCJDBTOOL) \
+ -L /usr/lib/gcj build/dist build/dist
+
+ PYTHONPATH=$(CURDIR)/debian \
+ RPATH=-Wl,-rpath,$(GCJSUBDIR) \
+ time python debian/aot-compile \
+ --gcj=$(GCJ) --dbtool=$(GCJDBTOOL) \
+ -L /usr/lib/gcj build/exe build/exe
+
+ ifeq (0,1)
+ : # ecj-gcj
+ time $(GCJ) \
+ -O1 -g -Wl,-O1 -Wl,-rpath,$(GCJSUBDIR) -Wl,-z,relro \
+ --main=org.eclipse.jdt.internal.compiler.batch.Main \
+ -o build/dist/ecj-gcj build/exe/ecj-standalone.jar
+ : # ecj1
+ time $(GCJ) \
+ -O1 -g -Wl,-O1 -Wl,-rpath,$(GCJSUBDIR) -Wl,-z,relro \
+ --main=org.eclipse.jdt.internal.compiler.batch.GCCMain \
+ -o build/dist/ecj1 build/exe/ecj-standalone.jar
+ endif
+endif
+ touch build/stamp-nativecode
+
+
+install/libecj-java::
+ mh_installpoms -plibecj-java
+ mh_installjar -plibecj-java -l debian/poms/ecj.pom build/dist/$(JAR) \
+ --usj-name=eclipse-ecj
+
+install/ecj::
+ mkdir -p debian/tmp/usr/bin
+ sed 's/@ver@/$(GCC_VERSION)/g' debian/ecj.in \
+ > debian/tmp/usr/bin/ecj
+ chmod 755 debian/tmp/usr/bin/ecj
+
+install/libecj-java-gcj::
+ifeq ($(with_native),yes)
+ mkdir -p debian/tmp/usr/lib/gcj
+ install -m 644 build/dist/$(JAR).so debian/tmp/usr/lib/gcj
+
+ mkdir -p debian/tmp/usr/share/gcj/classmap.d
+ install -m 644 build/dist/*.db \
+ debian/tmp/usr/share/gcj/classmap.d/
+endif
+
+install/ecj1::
+ifeq ($(with_native),yes)
+ mkdir -p debian/ecj1/usr/lib/$(DEB_HOST_MULTIARCH)/gcc
+ install -m 755 build/exe/ecj1 debian/ecj1/usr/lib/$(DEB_HOST_MULTIARCH)/gcc/
+ dh_link -p ecj1 \
+ /usr/lib/$(DEB_HOST_MULTIARCH)/gcc/ecj1 /usr/lib/gcc/ecj1
+endif
+
+install/ecj-gcj::
+ifeq ($(with_native),yes)
+ mkdir -p debian/tmp/usr/bin
+ install -m 755 build/exe/ecj-gcj debian/tmp/usr/bin/
+endif
+ mkdir -p debian/ecj-gcj/usr/bin
+
+ mkdir -p debian/ecj-gcj/usr/share/man/man1
+ ln -sf ecj.1.gz \
+ debian/ecj-gcj/usr/share/man/man1/ecj-gcj.1.gz
+
+ mkdir -p debian/ecj-gcj/usr/share/lintian/overrides
+ cp -p debian/ecj-gcj.overrides \
+ debian/ecj-gcj/usr/share/lintian/overrides/ecj-gcj
+
+binary-predeb/ecj1::
+# sed -i 's/libgcj[1-9][^,]*//;s/,,/,/' debian/ecj1.substvars
+
+binary-predeb/ecj-gcj::
+# sed -i 's/libgcj[1-9][^,]*//;s/,,/,/' debian/ecj-gcj.substvars
+
+clean::
+ rm -rf build
+ rm -f debian/*.pyc ecj1
+ rm -rf debian/.mh
+
+TAG = R4_5
+DIR = ecj-$(DEB_UPSTREAM_VERSION)
+
+MAVEN_REPO := http://repo1.maven.org/maven2
+PACKAGE := ecj
+
+get-orig-pom:
+ mkdir -p debian/poms
+ wget -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
+ $(MAVEN_REPO)/org/eclipse/jdt/core/compiler/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
+
+get-orig-source:
+ rm -rf $(DIR) $(TAG).tar.gz $(TAG)
+ wget http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/$(TAG).tar.gz
+ tar xf $(TAG).tar.gz
+ mkdir -p $(DIR)/src/org.eclipse.jdt.core
+ cp -p $(TAG)/org.eclipse.jdt.core/scripts/about.html \
+ $(DIR)/src/org.eclipse.jdt.core/
+ cp -p $(TAG)/org.eclipse.jdt.core/scripts/build.xml \
+ $(DIR)/src/org.eclipse.jdt.core/
+
+ tar -c -f - -C $(TAG)/org.eclipse.jdt.core/compiler org \
+ | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
+
+ tar -c -f - -C $(TAG)/org.eclipse.jdt.core/antadapter org META-INF \
+ | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
+
+ find $(DIR) -name CheckDebugAttributes.java | xargs -r rm -f
+ find $(DIR) -name BuildJarIndex.java | xargs -r rm -f
+
+ tar -c -f - -C $(TAG)/org.eclipse.jdt.core/batch org \
+ | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
+
+ mkdir -p $(DIR)/src/org.eclipse.jdt.core/META-INF/services
+# cp -p $(TAG)/org.eclipse.jdt.core/scripts/META-INF/MANIFEST.MF \
+# $(DIR)/src/org.eclipse.jdt.core/META-INF/
+ printf 'org.eclipse.jdt.internal.compiler.tool.EclipseCompiler #Eclipse compiler' \
+ > $(DIR)/src/org.eclipse.jdt.core/META-INF/services/javax.tools.JavaCompiler
+
+ # Create the upstream tarball
+ tar -c -J -f ../ecj_$(VERSION).orig.tar.xz $(DIR)
+
+ # Remove the temporary files
+ rm -rf $(DIR) $(TAG).tar.gz $(TAG)
Deleted: tags/ecj/3.11.0-1~exp1/debian/watch
===================================================================
--- trunk/ecj/debian/watch 2016-05-17 13:41:09 UTC (rev 19062)
+++ tags/ecj/3.11.0-1~exp1/debian/watch 2016-05-18 19:32:01 UTC (rev 19066)
@@ -1,9 +0,0 @@
-version=3
-#
-# There is a mismatch between the version of the Eclipse Platform which is used
-# to tag the upstream source repository and the version of the Eclipse Compiler.
-# The package caries the version of the compiler and the version of the platform
-# has to be hardcoded here to detect the new releases.
-#
-opts="uversionmangle=s/_/./g,dversionmangle=s/.*/4.4.2/" \
-http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/refs/tags .*/R([\d_]+).tar.gz
Copied: tags/ecj/3.11.0-1~exp1/debian/watch (from rev 19063, trunk/ecj/debian/watch)
===================================================================
--- tags/ecj/3.11.0-1~exp1/debian/watch (rev 0)
+++ tags/ecj/3.11.0-1~exp1/debian/watch 2016-05-18 19:32:01 UTC (rev 19066)
@@ -0,0 +1,9 @@
+version=3
+#
+# There is a mismatch between the version of the Eclipse Platform which is used
+# to tag the upstream source repository and the version of the Eclipse Compiler.
+# The package caries the version of the compiler and the version of the platform
+# has to be hardcoded here to detect the new releases.
+#
+opts="uversionmangle=s/_/./g,dversionmangle=s/.*/4.5/" \
+http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/refs/tags .*/R([\d_]+).tar.gz
More information about the pkg-java-commits
mailing list