[ecj] 86/145: Import Debian changes 3.10.1~rc2-1
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Mar 27 23:11:32 BST 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ecj.
commit bd037bfd079fd20e4b71862e3b9c296d27818cc7
Merge: 779c516 cf2f359
Author: Matthias Klose <doko at debian.org>
Date: Sat Aug 30 22:30:08 2014 +0200
Import Debian changes 3.10.1~rc2-1
ecj (3.10.1~rc2-1) unstable; urgency=medium
* Upstream 3.10.1 release candidate 2.
* Update package descriptions.
debian/changelog | 7 +
debian/control | 17 +-
debian/patches/issue438812.diff | 26 -
debian/patches/series | 1 -
debian/rules | 7 +-
src/org.eclipse.jdt.core/META-INF/MANIFEST.MF | 13 +
src/org.eclipse.jdt.core/ecj.1 | 479 ++++++++
.../eclipse/jdt/internal/compiler/ClassFile.java | 6 +-
.../apt/dispatch/AnnotationDiscoveryVisitor.java | 244 +++++
.../internal/compiler/apt/dispatch/AptProblem.java | 60 +
.../dispatch/BaseAnnotationProcessorManager.java | 162 +++
.../compiler/apt/dispatch/BaseMessagerImpl.java | 213 ++++
.../apt/dispatch/BaseProcessingEnvImpl.java | 173 +++
.../dispatch/BatchAnnotationProcessorManager.java | 236 ++++
.../compiler/apt/dispatch/BatchFilerImpl.java | 169 +++
.../compiler/apt/dispatch/BatchMessagerImpl.java | 77 ++
.../apt/dispatch/BatchProcessingEnvImpl.java | 144 +++
.../apt/dispatch/HookedJavaFileObject.java | 264 +++++
.../compiler/apt/dispatch/IProcessorProvider.java | 47 +
.../compiler/apt/dispatch/ProcessorInfo.java | 174 +++
.../compiler/apt/dispatch/RoundDispatcher.java | 173 +++
.../compiler/apt/dispatch/RoundEnvImpl.java | 239 ++++
.../compiler/apt/model/AnnotationMemberValue.java | 51 +
.../compiler/apt/model/AnnotationMirrorImpl.java | 531 +++++++++
.../compiler/apt/model/AnnotationValueImpl.java | 265 +++++
.../internal/compiler/apt/model/ArrayTypeImpl.java | 71 ++
.../compiler/apt/model/DeclaredTypeImpl.java | 121 +++
.../internal/compiler/apt/model/ElementImpl.java | 154 +++
.../internal/compiler/apt/model/ElementsImpl.java | 713 ++++++++++++
.../compiler/apt/model/ErrorTypeElement.java | 160 +++
.../internal/compiler/apt/model/ErrorTypeImpl.java | 116 ++
.../compiler/apt/model/ExecutableElementImpl.java | 328 ++++++
.../compiler/apt/model/ExecutableTypeImpl.java | 129 +++
.../jdt/internal/compiler/apt/model/Factory.java | 878 +++++++++++++++
.../internal/compiler/apt/model/IElementInfo.java | 30 +
.../jdt/internal/compiler/apt/model/NameImpl.java | 95 ++
.../internal/compiler/apt/model/NoTypeImpl.java | 88 ++
.../compiler/apt/model/PackageElementImpl.java | 125 +++
.../compiler/apt/model/PrimitiveTypeImpl.java | 90 ++
.../compiler/apt/model/TypeElementImpl.java | 275 +++++
.../compiler/apt/model/TypeMirrorImpl.java | 144 +++
.../apt/model/TypeParameterElementImpl.java | 220 ++++
.../compiler/apt/model/TypeVariableImpl.java | 83 ++
.../jdt/internal/compiler/apt/model/TypesImpl.java | 479 ++++++++
.../compiler/apt/model/VariableElementImpl.java | 181 +++
.../compiler/apt/model/WildcardTypeImpl.java | 68 ++
.../jdt/internal/compiler/apt/util/Archive.java | 102 ++
.../compiler/apt/util/ArchiveFileObject.java | 222 ++++
.../compiler/apt/util/EclipseFileManager.java | 1147 +++++++++++++++++++
.../compiler/apt/util/EclipseFileObject.java | 205 ++++
.../jdt/internal/compiler/apt/util/ManyToMany.java | 364 +++++++
.../jdt/internal/compiler/apt/util/Options.java | 235 ++++
.../jdt/internal/compiler/apt/util/Util.java | 207 ++++
.../compiler/ast/AllocationExpression.java | 2 +-
.../internal/compiler/ast/LambdaExpression.java | 17 +-
.../ast/QualifiedAllocationExpression.java | 2 +-
.../internal/compiler/ast/ReferenceExpression.java | 6 +-
.../jdt/internal/compiler/ast/Wildcard.java | 9 +-
.../internal/compiler/codegen/ConstantPool.java | 2 +
.../lookup/AptBinaryLocalVariableBinding.java | 27 +
.../lookup/AptSourceLocalVariableBinding.java | 38 +
.../jdt/internal/compiler/lookup/ArrayBinding.java | 14 +-
.../internal/compiler/lookup/BaseTypeBinding.java | 5 +-
.../compiler/lookup/BinaryTypeBinding.java | 21 +-
.../jdt/internal/compiler/lookup/BoundSet.java | 10 +-
.../internal/compiler/lookup/CaptureBinding.java | 11 +-
.../lookup/ConstraintExpressionFormula.java | 3 +-
.../compiler/lookup/InferenceContext18.java | 3 +-
.../compiler/lookup/LookupEnvironment.java | 24 +
.../internal/compiler/lookup/MethodVerifier15.java | 14 +-
.../internal/compiler/lookup/NullTypeBinding.java | 6 +-
.../compiler/lookup/ParameterizedTypeBinding.java | 17 +-
.../internal/compiler/lookup/RawTypeBinding.java | 17 +
.../compiler/lookup/SourceTypeBinding.java | 12 +-
.../lookup/SyntheticFactoryMethodBinding.java | 5 +
.../jdt/internal/compiler/lookup/TypeBinding.java | 8 +-
.../compiler/lookup/TypeVariableBinding.java | 48 +-
.../internal/compiler/lookup/VoidTypeBinding.java | 6 +-
.../internal/compiler/lookup/WildcardBinding.java | 44 +-
.../jdt/internal/compiler/parser/Parser.java | 5 +
.../internal/compiler/problem/ProblemReporter.java | 5 +
.../jdt/internal/compiler/tool/Archive.java | 103 ++
.../internal/compiler/tool/ArchiveFileObject.java | 241 ++++
.../internal/compiler/tool/EclipseCompiler.java | 231 ++++
.../compiler/tool/EclipseCompilerImpl.java | 566 ++++++++++
.../internal/compiler/tool/EclipseFileManager.java | 1148 ++++++++++++++++++++
.../internal/compiler/tool/EclipseFileObject.java | 217 ++++
.../jdt/internal/compiler/tool/Options.java | 277 +++++
.../eclipse/jdt/internal/compiler/tool/Util.java | 207 ++++
89 files changed, 14068 insertions(+), 111 deletions(-)
diff --cc debian/changelog
index e72a1c4,0000000..462f039
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,584 -1,0 +1,591 @@@
++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
diff --cc debian/control
index d8845de,0000000..b580d2e
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,71 -1,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-4.9-jdk (>= 4.9.0),
++ gcj-4.9-jdk (>= 4.9.1),
+ libgcj-bc (>= 4.6.3),
- libecj-java (>= 3.8.2) [arm], unzip [arm],
+ 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.5
- Vcs-Git: git://anonscm.debian.org/pkg-java/ecj.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/ecj.git
++Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/ecj
++Vcs-Browser: http://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 and 1.7.
++ 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 and 1.7.
++ 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 and 1.7.
++ 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 arm armel armhf
++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 and 1.7.
++ 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.
diff --cc debian/patches/series
index bc7fe40,0000000..590acf3
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
+gcc-changes.diff
+remove-overrides.diff
- issue438812.diff
diff --cc debian/rules
index e5e1da6,0000000..bf77615
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,277 -1,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 := 4.9
+
+LIBGCJ_EXT := $(shell ls -l /usr/lib/$(DEB_HOST_MULTIARCH)/libgcj_bc.so.1 | sed 's/.*\.//')
+LIBGCJ_SOVER = $(LIBGCJ_EXT)
+LIBGCJ_SOVER = 15
+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/$(VERSION)/' build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties
++ 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/$(VERSION)/' build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties
++ 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
+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)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git
More information about the pkg-java-commits
mailing list