[ecj] 31/145: Import Debian changes 3.3.0-1

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Mar 27 23:11:25 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 a198fd766123e8b09da73f5c2f0223bc733d00a0
Merge: 43de312 98baf37
Author: Matthias Klose <doko at ubuntu.com>
Date:   Sat Jul 7 02:13:27 2007 +0200

    Import Debian changes 3.3.0-1
    
    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.

 debian/README.Debian                               |   4 +-
 debian/changelog                                   |   9 +
 debian/control                                     |  16 +-
 debian/copyright                                   |   2 +-
 debian/ecj.install                                 |   1 -
 debian/{ecj.install => libecj-java.install}        |   1 -
 debian/{ecj.links => libecj-java.links}            |   0
 debian/rules                                       |  41 +-
 src/org.eclipse.jdt.core/META-INF/MANIFEST.MF      |  25 +
 src/org.eclipse.jdt.core/META-INF/eclipse.inf      |   2 +
 .../META-INF/services/javax.tools.JavaCompiler     |   1 +
 src/org.eclipse.jdt.core/about.html                |  28 +
 src/org.eclipse.jdt.core/build.xml                 |  43 +
 .../eclipse/jdt/internal/compiler/ClassFile.java   |  60 +-
 .../apt/dispatch/AnnotationDiscoveryVisitor.java   | 154 ++++
 .../internal/compiler/apt/dispatch/AptProblem.java |  60 ++
 .../dispatch/BaseAnnotationProcessorManager.java   | 151 ++++
 .../compiler/apt/dispatch/BaseMessagerImpl.java    | 156 ++++
 .../apt/dispatch/BaseProcessingEnvImpl.java        | 165 ++++
 .../dispatch/BatchAnnotationProcessorManager.java  | 177 ++++
 .../compiler/apt/dispatch/BatchFilerImpl.java      | 134 +++
 .../compiler/apt/dispatch/BatchMessagerImpl.java   |  78 ++
 .../apt/dispatch/BatchProcessingEnvImpl.java       | 144 ++++
 .../apt/dispatch/HookedJavaFileObject.java         | 241 ++++++
 .../compiler/apt/dispatch/IProcessorProvider.java  |  47 ++
 .../compiler/apt/dispatch/ProcessorInfo.java       | 149 ++++
 .../compiler/apt/dispatch/RoundDispatcher.java     | 108 +++
 .../compiler/apt/dispatch/RoundEnvImpl.java        | 225 +++++
 .../compiler/apt/model/AnnotationMirrorImpl.java   | 490 +++++++++++
 .../compiler/apt/model/AnnotationValueImpl.java    | 265 ++++++
 .../internal/compiler/apt/model/ArrayTypeImpl.java |  55 ++
 .../compiler/apt/model/DeclaredTypeImpl.java       | 105 +++
 .../internal/compiler/apt/model/ElementImpl.java   | 159 ++++
 .../internal/compiler/apt/model/ElementsImpl.java  | 595 ++++++++++++++
 .../compiler/apt/model/ErrorTypeElement.java       | 152 ++++
 .../internal/compiler/apt/model/ErrorTypeImpl.java |  77 ++
 .../compiler/apt/model/ExecutableElementImpl.java  | 337 ++++++++
 .../compiler/apt/model/ExecutableTypeImpl.java     | 125 +++
 .../jdt/internal/compiler/apt/model/Factory.java   | 676 +++++++++++++++
 .../internal/compiler/apt/model/IElementInfo.java  |  30 +
 .../jdt/internal/compiler/apt/model/NameImpl.java  |  95 +++
 .../internal/compiler/apt/model/NoTypeImpl.java    |  69 ++
 .../compiler/apt/model/PackageElementImpl.java     | 125 +++
 .../compiler/apt/model/PrimitiveTypeImpl.java      |  84 ++
 .../compiler/apt/model/TypeElementImpl.java        | 260 ++++++
 .../compiler/apt/model/TypeMirrorImpl.java         | 110 +++
 .../apt/model/TypeParameterElementImpl.java        | 169 ++++
 .../compiler/apt/model/TypeVariableImpl.java       |  85 ++
 .../jdt/internal/compiler/apt/model/TypesImpl.java | 453 ++++++++++
 .../compiler/apt/model/VariableElementImpl.java    | 179 ++++
 .../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      | 843 +++++++++++++++++++
 .../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 +++++
 .../internal/compiler/ast/AND_AND_Expression.java  |  13 +-
 .../compiler/ast/CompilationUnitDeclaration.java   |   6 +-
 .../compiler/ast/ConditionalExpression.java        |  27 +-
 .../jdt/internal/compiler/ast/Expression.java      | 910 +++++++++++----------
 .../internal/compiler/ast/OR_OR_Expression.java    |  23 +-
 .../ast/ParameterizedQualifiedTypeReference.java   |   4 +-
 .../ast/ParameterizedSingleTypeReference.java      |   2 +-
 .../compiler/ast/QualifiedTypeReference.java       |   2 +-
 .../internal/compiler/ast/SingleTypeReference.java |   4 +-
 .../eclipse/jdt/internal/compiler/batch/Main.java  | 175 +++-
 .../internal/compiler/batch/messages.properties    |   3 +-
 .../internal/compiler/classfmt/AnnotationInfo.java |   2 +-
 .../compiler/classfmt/AnnotationMethodInfo.java    |   2 +-
 .../AnnotationMethodInfoWithAnnotations.java       |   2 +-
 .../compiler/classfmt/ElementValuePairInfo.java    |   2 +-
 .../compiler/classfmt/FieldInfoWithAnnotation.java |   2 +-
 .../jdt/internal/compiler/classfmt/MethodInfo.java |   3 +
 .../classfmt/MethodInfoWithAnnotations.java        |   2 +-
 .../MethodInfoWithParameterAnnotations.java        |   2 +-
 .../compiler/codegen/AttributeNamesConstants.java  |   3 +-
 .../jdt/internal/compiler/env/ClassSignature.java  |   2 +-
 .../compiler/env/EnumConstantSignature.java        |   2 +-
 .../internal/compiler/env/IBinaryAnnotation.java   |   2 +-
 .../compiler/env/IBinaryElementValuePair.java      |   2 +-
 .../internal/compiler/flow/NullInfoRegistry.java   |   3 +-
 .../internal/compiler/impl/CompilerOptions.java    |   3 +-
 .../compiler/lookup/BinaryTypeBinding.java         |   7 +
 .../jdt/internal/compiler/lookup/ClassScope.java   |  29 +-
 .../compiler/lookup/CompilationUnitScope.java      |   2 +
 .../internal/compiler/lookup/InferenceContext.java |   6 +-
 .../compiler/lookup/LocalVariableBinding.java      |  32 +-
 .../internal/compiler/lookup/MethodBinding.java    |  16 +-
 .../internal/compiler/lookup/MethodVerifier.java   |  89 +-
 .../lookup/ParameterizedGenericMethodBinding.java  |  22 +-
 .../compiler/lookup/ParameterizedTypeBinding.java  |   9 +-
 .../internal/compiler/lookup/ReferenceBinding.java |   7 +
 .../jdt/internal/compiler/lookup/Scope.java        | 113 ++-
 .../compiler/lookup/TypeVariableBinding.java       |  38 +-
 .../compiler/parser/JavadocTagConstants.java       |   8 +-
 .../jdt/internal/compiler/parser/Parser.java       |   8 +-
 .../jdt/internal/compiler/tool/Archive.java        | 102 +++
 .../internal/compiler/tool/ArchiveFileObject.java  | 222 +++++
 .../internal/compiler/tool/EclipseCompiler.java    | 585 +++++++++++++
 .../internal/compiler/tool/EclipseFileManager.java | 843 +++++++++++++++++++
 .../internal/compiler/tool/EclipseFileObject.java  | 205 +++++
 .../jdt/internal/compiler/tool/Options.java        | 236 ++++++
 .../eclipse/jdt/internal/compiler/tool/Util.java   | 207 +++++
 105 files changed, 12433 insertions(+), 719 deletions(-)

diff --cc debian/README.Debian
index e647f71,0000000..05fb499
mode 100644,000000..100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -1,12 -1,0 +1,12 @@@
- ecj-bootstrap
- =============
++ecj
++===
 +
 +This package is not intended for end users!  This is basically to make
 +it so that you can sanely bootstrap a port.  This high-quality java
 +compiler is buildable with just gcj-4, which in turn is built in C.
 +
 +In particular, this doesn't include support for ant - When compiling
 +with this version of ecj, ant will spawn a new VM instance and shell
 +out to it to compile.  This means significantly higher memory costs,
 +and slower compiles. 
 +
diff --cc debian/changelog
index 33c5c65,0000000..b15900e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,332 -1,0 +1,341 @@@
++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 61be297,0000000..6226307
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,46 -1,0 +1,60 @@@
 +Source: ecj
 +Section: devel
 +Priority: optional
 +Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 +Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>
 +Build-Depends: cdbs (>= 0.4.26), debhelper (>= 5), gcj-4.1 (>= 4.1.2-1), libgcj-bc (>= 4.1.2-1), fastjar, ant, zip, dpkg (>= 1.13.19), python, time
 +Build-Conflicts: ecj-bootstrap-gcj (<< 3.2.2)
 +Standards-Version: 3.7.2
 +
 +Package: ecj
 +Architecture: all
- Depends: gij-4.1 (>= 4.1.1-20), libgcj7-jar (>= 4.1.1-20), java-common (>= 0.23)
++Depends: libecj-java (>= ${source:Version}), gij-4.1 (>= 4.1.1-20), libgcj7-jar (>= 4.1.1-20), java-common (>= 0.23)
 +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 and 1.6.
 +
++Package: libecj-java
++Architecture: all
++Section: libs
++Depends: java-common (>= 0.23)
++Recommends: ecj, java2-runtime
++Conflicts: ecj-bootstrap (<< 3.2.2), eclipse-ecj
++Replaces: ecj-bootstrap (<< 3.2.2), eclipse-ecj, ecj (<< 3.3.0-1)
++Suggests: ant
++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 and 1.6.
++
 +Package: ecj-gcj
 +Architecture: any
 +Depends: ecj (>= ${source:Version}), ${shlibs: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 and 1.6.
 + .
 + This package contains a native version of ecj built using gcj.
 +
 +Package: ecj-bootstrap
 +Architecture: all
 +Depends: ecj 
 +Recommends: ecj-bootstrap-gcj
 +Description: standalone version of the Eclipse Java compiler (transitional package)
 + This is a transitional package; it can safely be removed.
 +
 +Package: ecj-bootstrap-gcj
 +Architecture: all
 +Depends: ecj-bootstrap (>= ${source:Version}), ecj-gcj (>= ${source:Version})
 +Description: standalone version of the Eclipse Java compiler (transitional package)
 + This is a transitional package; it can safely be removed.
diff --cc debian/copyright
index 5efc60d,0000000..ecfe6fe
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,258 -1,0 +1,258 @@@
 +This package was debianized by Jerry Haltom <wasabi at larvalstage.net> on
 +Thu, 10 Feb 2005 14:47:15 -0600
 +
- It was downloaded from dev.eclipse.org cvs. 
++It was downloaded from http://download.eclipse.org/eclipse/downloads/
 +
 +This software is copyright (c) 2000, 2004 IBM Corporation and others,
 +licensed under the Common Public License - v 1.0.
 +
 +The ecj script is Copyright (C) 2004  Red Hat, licensed under the GPL with
 +a special exception. The full text of the GPL can be found in
 +/usr/share/common-licenses/GPL-2. The full text of the exception is stated
 +below.
 +
 +Copyright:
 +
 +Common Public License - v 1.0
 +
 +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON 
 +PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF 
 +THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 +
 +1. DEFINITIONS
 +
 +"Contribution" means:
 +
 +      a) in the case of the initial Contributor, the initial code and 
 +documentation distributed under this Agreement, and
 +      b) in the case of each subsequent Contributor:
 +
 +      i) changes to the Program, and
 +
 +      ii) additions to the Program;
 +
 +      where such changes and/or additions to the Program originate from 
 +and are distributed by that particular Contributor. A Contribution 
 +'originates' from a Contributor if it was added to the Program by such 
 +Contributor itself or anyone acting on such Contributor's behalf. 
 +Contributions do not include additions to the Program which: (i) are 
 +separate modules of software distributed in conjunction with the Program 
 +under their own license agreement, and (ii) are not derivative works of 
 +the Program. 
 +
 +"Contributor" means any person or entity that distributes the Program.
 +
 +"Licensed Patents " mean patent claims licensable by a Contributor which 
 +are necessarily infringed by the use or sale of its Contribution alone 
 +or when combined with the Program.
 +
 +"Program" means the Contributions distributed in accordance with this 
 +Agreement.
 +
 +"Recipient" means anyone who receives the Program under this Agreement, 
 +including all Contributors.
 +
 +2. GRANT OF RIGHTS
 +
 +      a) Subject to the terms of this Agreement, each Contributor hereby 
 +grants Recipient a non-exclusive, worldwide, royalty-free copyright 
 +license to reproduce, prepare derivative works of, publicly display, 
 +publicly perform, distribute and sublicense the Contribution of such 
 +Contributor, if any, and such derivative works, in source code and 
 +object code form.
 +
 +      b) Subject to the terms of this Agreement, each Contributor hereby 
 +grants Recipient a non-exclusive, worldwide, royalty-free patent license 
 +under Licensed Patents to make, use, sell, offer to sell, import and 
 +otherwise transfer the Contribution of such Contributor, if any, in 
 +source code and object code form. This patent license shall apply to the 
 +combination of the Contribution and the Program if, at the time the 
 +Contribution is added by the Contributor, such addition of the 
 +Contribution causes such combination to be covered by the Licensed 
 +Patents. The patent license shall not apply to any other combinations 
 +which include the Contribution. No hardware per se is licensed 
 +hereunder. 
 +
 +      c) Recipient understands that although each Contributor grants the 
 +licenses to its Contributions set forth herein, no assurances are 
 +provided by any Contributor that the Program does not infringe the 
 +patent or other intellectual property rights of any other entity. Each 
 +Contributor disclaims any liability to Recipient for claims brought by 
 +any other entity based on infringement of intellectual property rights 
 +or otherwise. As a condition to exercising the rights and licenses 
 +granted hereunder, each Recipient hereby assumes sole responsibility to 
 +secure any other intellectual property rights needed, if any. For 
 +example, if a third party patent license is required to allow Recipient 
 +to distribute the Program, it is Recipient's responsibility to acquire 
 +that license before distributing the Program.
 +
 +      d) Each Contributor represents that to its knowledge it has 
 +sufficient copyright rights in its Contribution, if any, to grant the 
 +copyright license set forth in this Agreement. 
 +
 +3. REQUIREMENTS
 +
 +A Contributor may choose to distribute the Program in object code form 
 +under its own license agreement, provided that:
 +
 +      a) it complies with the terms and conditions of this Agreement; 
 +and
 +
 +      b) its license agreement:
 +
 +      i) effectively disclaims on behalf of all Contributors all 
 +warranties and conditions, express and implied, including warranties or 
 +conditions of title and non-infringement, and implied warranties or 
 +conditions of merchantability and fitness for a particular purpose; 
 +
 +      ii) effectively excludes on behalf of all Contributors all 
 +liability for damages, including direct, indirect, special, incidental 
 +and consequential damages, such as lost profits; 
 +
 +      iii) states that any provisions which differ from this Agreement 
 +are offered by that Contributor alone and not by any other party; and
 +
 +      iv) states that source code for the Program is available from such 
 +Contributor, and informs licensees how to obtain it in a reasonable 
 +manner on or through a medium customarily used for software exchange. 
 +
 +When the Program is made available in source code form:
 +
 +      a) it must be made available under this Agreement; and 
 +
 +      b) a copy of this Agreement must be included with each copy of the 
 +Program. 
 +
 +Contributors may not remove or alter any copyright notices contained 
 +within the Program.
 +
 +Each Contributor must identify itself as the originator of its 
 +Contribution, if any, in a manner that reasonably allows subsequent 
 +Recipients to identify the originator of the Contribution.
 +
 +4. COMMERCIAL DISTRIBUTION
 +
 +Commercial distributors of software may accept certain responsibilities 
 +with respect to end users, business partners and the like. While this 
 +license is intended to facilitate the commercial use of the Program, the 
 +Contributor who includes the Program in a commercial product offering 
 +should do so in a manner which does not create potential liability for 
 +other Contributors. Therefore, if a Contributor includes the Program in 
 +a commercial product offering, such Contributor ("Commercial 
 +Contributor") hereby agrees to defend and indemnify every other 
 +Contributor ("Indemnified Contributor") against any losses, damages and 
 +costs (collectively "Losses") arising from claims, lawsuits and other 
 +legal actions brought by a third party against the Indemnified 
 +Contributor to the extent caused by the acts or omissions of such 
 +Commercial Contributor in connection with its distribution of the 
 +Program in a commercial product offering. The obligations in this 
 +section do not apply to any claims or Losses relating to any actual or 
 +alleged intellectual property infringement. In order to qualify, an 
 +Indemnified Contributor must: a) promptly notify the Commercial 
 +Contributor in writing of such claim, and b) allow the Commercial 
 +Contributor to control, and cooperate with the Commercial Contributor 
 +in, the defense and any related settlement negotiations. The Indemnified 
 +Contributor may participate in any such claim at its own expense.
 +
 +For example, a Contributor might include the Program in a commercial 
 +product offering, Product X. That Contributor is then a Commercial 
 +Contributor. If that Commercial Contributor then makes performance 
 +claims, or offers warranties related to Product X, those performance 
 +claims and warranties are such Commercial Contributor's responsibility 
 +alone. Under this section, the Commercial Contributor would have to 
 +defend claims against the other Contributors related to those 
 +performance claims and warranties, and if a court requires any other 
 +Contributor to pay any damages as a result, the Commercial Contributor 
 +must pay those damages.
 +
 +5. NO WARRANTY
 +
 +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 
 +ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
 +EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES 
 +OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR 
 +A PARTICULAR PURPOSE. Each Recipient is solely responsible for 
 +determining the appropriateness of using and distributing the Program 
 +and assumes all risks associated with its exercise of rights under this 
 +Agreement, including but not limited to the risks and costs of program 
 +errors, compliance with applicable laws, damage to or loss of data, 
 +programs or equipment, and unavailability or interruption of operations.
 +
 +6. DISCLAIMER OF LIABILITY
 +
 +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR 
 +ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, 
 +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING 
 +WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF 
 +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR 
 +DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED 
 +HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 +
 +7. GENERAL
 +
 +If any provision of this Agreement is invalid or unenforceable under 
 +applicable law, it shall not affect the validity or enforceability of 
 +the remainder of the terms of this Agreement, and without further action 
 +by the parties hereto, such provision shall be reformed to the minimum 
 +extent necessary to make such provision valid and enforceable.
 +
 +If Recipient institutes patent litigation against a Contributor with 
 +respect to a patent applicable to software (including a cross-claim or 
 +counterclaim in a lawsuit), then any patent licenses granted by that 
 +Contributor to such Recipient under this Agreement shall terminate as of 
 +the date such litigation is filed. In addition, if Recipient institutes 
 +patent litigation against any entity (including a cross-claim or 
 +counterclaim in a lawsuit) alleging that the Program itself (excluding 
 +combinations of the Program with other software or hardware) infringes 
 +such Recipient's patent(s), then such Recipient's rights granted under 
 +Section 2(b) shall terminate as of the date such litigation is filed.
 +
 +All Recipient's rights under this Agreement shall terminate if it fails 
 +to comply with any of the material terms or conditions of this Agreement 
 +and does not cure such failure in a reasonable period of time after 
 +becoming aware of such noncompliance. If all Recipient's rights under 
 +this Agreement terminate, Recipient agrees to cease use and distribution 
 +of the Program as soon as reasonably practicable. However, Recipient's 
 +obligations under this Agreement and any licenses granted by Recipient 
 +relating to the Program shall continue and survive.
 +
 +Everyone is permitted to copy and distribute copies of this Agreement, 
 +but in order to avoid inconsistency the Agreement is copyrighted and may 
 +only be modified in the following manner. The Agreement Steward reserves 
 +the right to publish new versions (including revisions) of this 
 +Agreement from time to time. No one other than the Agreement Steward has 
 +the right to modify this Agreement. IBM is the initial Agreement 
 +Steward. IBM may assign the responsibility to serve as the Agreement 
 +Steward to a suitable separate entity. Each new version of the Agreement 
 +will be given a distinguishing version number. The Program (including 
 +Contributions) may always be distributed subject to the version of the 
 +Agreement under which it was received. In addition, after a new version 
 +of the Agreement is published, Contributor may elect to distribute the 
 +Program (including its Contributions) under the new version. Except as 
 +expressly stated in Sections 2(a) and 2(b) above, Recipient receives no 
 +rights or licenses to the intellectual property of any Contributor under 
 +this Agreement, whether expressly, by implication, estoppel or 
 +otherwise. All rights in the Program not expressly granted under this 
 +Agreement are reserved.
 +
 +This Agreement is governed by the laws of the State of New York and the 
 +intellectual property laws of the United States of America. No party to 
 +this Agreement will bring a legal action under this Agreement more than 
 +one year after the cause of action arose. Each party waives its rights 
 +to a jury trial in any resulting litigation. 
 +
 +
 +Linking Exception clause for GPL
 +
 +As a special exception, the copyright holders of this library give you
 +permission to link this library with independent modules to produce an
 +executable, regardless of the license terms of these independent
 +modules, and to copy and distribute the resulting executable under
 +terms of your choice, provided that you also meet, for each linked
 +independent module, the terms and conditions of the license of that
 +module.  An independent module is a module which is not derived from
 +or based on this library.  If you modify this library, you may extend
 +this exception to your version of the library, but you are not
 +obligated to do so.  If you do not wish to do so, delete this
 +exception statement from your version.
diff --cc debian/ecj.install
index 5c694a7,0000000..1b34224
mode 100644,000000..100644
--- a/debian/ecj.install
+++ b/debian/ecj.install
@@@ -1,2 -1,0 +1,1 @@@
 +debian/tmp/usr/bin/ecj
- debian/tmp/usr/share/java/eclipse-ecj.jar
diff --cc debian/libecj-java.install
index 5c694a7,0000000..a5ba1e7
mode 100644,000000..100644
--- a/debian/libecj-java.install
+++ b/debian/libecj-java.install
@@@ -1,2 -1,0 +1,1 @@@
- debian/tmp/usr/bin/ecj
 +debian/tmp/usr/share/java/eclipse-ecj.jar
diff --cc debian/libecj-java.links
index f6a8ada,0000000..f6a8ada
mode 100644,000000..100644
--- a/debian/libecj-java.links
+++ b/debian/libecj-java.links
diff --cc debian/rules
index 9124ea2,0000000..feac4ac
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,177 -1,0 +1,184 @@@
 +#!/usr/bin/make -f
 +
 +include /usr/share/cdbs/1/rules/debhelper.mk
 +include /usr/share/cdbs/1/rules/simple-patchsys.mk
 +
 +gcc_version = 4.1
 +ant_version = 1.6
 +ant_version =
 +GCJ = gcj-$(gcc_version)
 +GIJ = gij-$(gcc_version)
 +GCJDBTOOL = gcj-dbtool-$(gcc_version)
 +
 +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 +
 +with_native := yes
 +with_rebuild := yes
 +
 +ifneq (,$(findstring $(DEB_HOST_ARCH), arm))
 +  with_rebuild := no
 +endif
 +
 +JAR = eclipse-ecj.jar
 +
 +default: build
 +
- eclipse_root = ../eclipse-3.3~M7/source-tree
- 
- get-source:
- 	test -d $(eclipse_root)
- 	rm -rf src
- 	mkdir -p src/org.eclipse.jdt.core
- 	cp -a $(eclipse_root)/plugins/org.eclipse.jdt.core/compiler/org \
- 		src/org.eclipse.jdt.core/
- 	cp -a $(eclipse_root)/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch \
- 		src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/
- 
- 	cp -a $(eclipse_root)/plugins/org.eclipse.jdt.core/antadapter/org/eclipse/jdt/core/JDTCompilerAdapter.java \
- 		src/org.eclipse.jdt.core/org/eclipse/jdt/core/
- 	cp -a $(eclipse_root)/plugins/org.eclipse.jdt.core/antadapter/org/eclipse/jdt/internal/antadapter \
- 		src/org.eclipse.jdt.core/org/eclipse/jdt/internal/
- 
++eclipse_root = $(CURDIR)/../eclipse
 +
 +build/ecj:: build/stamp-bytecode build/stamp-nativecode
 +
 +build/stamp-bytecode:
 +	rm -rf build/bin
 +	mkdir -p build/bin
 +
 +	cp -r src/org.eclipse.jdt.core/org build/bin/
++	rm -rf build/bin/org/eclipse/jdt/internal/compiler/apt
++	rm -rf build/bin/org/eclipse/jdt/internal/compiler/tool
++
 +	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
 +ifeq (0,1)
 +	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$(ant_version)/lib/ant.jar \
 +		-Ibuild/bin \
 +		@$$list; \
 +	    $(GCJ) -v -d build/bin -C -g \
 +		-I/usr/share/ant$(ant_version)/lib/ant.jar \
 +		-Ibuild/bin \
 +		@$$list; \
 +	done
 +else
 +	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$(ant_version)/lib/ant.jar \
 +		-Ibuild/bin \
 +		$$(cat $$list); \
 +	    $(GCJ) -v -d build/bin -C -g \
 +		-I/usr/share/ant$(ant_version)/lib/ant.jar \
 +		-Ibuild/bin \
 +		$$(cat $$list); \
 +	done
 +endif
 +	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)
 +	rm -rf build/bin
 +	mkdir -p build/bin
 +	cp -r src/org.eclipse.jdt.core/org build/bin/
++	rm -rf build/bin/org/eclipse/jdt/internal/compiler/apt
++	rm -rf build/bin/org/eclipse/jdt/internal/compiler/tool
 +
 +	time $(GIJ) \
 +	    -classpath build/bootstrap/$(JAR):/usr/share/ant$(ant_version)/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
 +	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
 +  ifneq (,$(filter $(DEB_HOST_ARCH), hppa))
 +	$(GCJ) \
 +	    -O2 -g -Wl,-Bsymbolic,-O1 -shared -fPIC -fjni -findirect-dispatch \
 +	    -o build/dist/$(JAR).so build/dist/$(JAR)
 +	$(GCJDBTOOL) -f build/dist/eclipse-ecj.db \
 +	    build/dist/$(JAR).so /usr/lib/gcj/$(JAR).so \
 +		|| touch build/dist/eclipse-ecj.db
 +  else
 +	PYTHONPATH=$(CURDIR)/debian time python debian/aot-compile \
 +	    --gcj=$(GCJ) --dbtool=$(GCJDBTOOL) \
 +	    -L /usr/lib/gcj build/dist build/dist
 +	mv build/dist/$(JAR).db build/dist/eclipse-ecj.db
 +  endif
 +
 +	: # ecj-gcj
 +	time $(GCJ) \
 +	    -O2 -g -Wl,-O1 \
 +	    --main=org.eclipse.jdt.internal.compiler.batch.Main \
 +	    -o build/exe/ecj-gcj build/exe/ecj-standalone.jar
 +endif
 +
 +	touch build/stamp-nativecode
 +
 +
- install/ecj::
++install/libecj-java::
 +	mkdir -p debian/tmp/usr/share/java
 +	install -m 644 build/dist/$(JAR) debian/tmp/usr/share/java/
 +
++install/ecj-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/eclipse-ecj.db \
++		debian/tmp/usr/share/gcj/classmap.d/
++
++	mkdir -p debian/tmp/usr/bin
++	install -m 755 build/exe/ecj-gcj debian/tmp/usr/bin/
++endif
++	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
++
++install/ecj::
 +	mkdir -p debian/tmp/usr/bin
 +	install -m 755 ecj debian/tmp/usr/bin/
 +
 +install/ecj-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/eclipse-ecj.db \
 +		debian/tmp/usr/share/gcj/classmap.d/
 +
 +	mkdir -p debian/tmp/usr/bin
 +	install -m 755 build/exe/ecj-gcj debian/tmp/usr/bin/
 +endif
 +	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
 +
 +install/ecj-bootstrap::
 +	mkdir -p debian/ecj-bootstrap/usr/bin
 +	install -m 755 ecj-bootstrap debian/ecj-bootstrap/usr/bin/
 +
 +	mkdir -p debian/ecj-bootstrap/usr/share/man/man1
 +	ln -sf ecj.1.gz \
 +	  debian/ecj-bootstrap/usr/share/man/man1/ecj-bootstrap.1.gz
 +
 +clean::
 +	rm -rf build
 +	rm -f debian/*.pyc

-- 
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