This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ecj.
commit f70205e6867d87de0453e05333e3151f1662ea12
Merge: 68f73e0 bdcb210
Author: Matthias Klose <d...@debian.org>
Date: Tue Oct 3 09:35:39 2006 +0200
Import Debian changes 3.2.1-1
ecj-bootstrap (3.2.1-1) unstable; urgency=medium
* New upstream version.
* ecj-bootstrap-gcj: Add postrm script.
debian/changelog | 7 +
debian/ecj-bootstrap-gcj.postrm | 7 +
debian/rules | 6 +-
.../eclipse/jdt/internal/compiler/ClassFile.java | 817 ++++++++++++---------
.../jdt/internal/compiler/ast/BranchStatement.java | 11 +-
.../jdt/internal/compiler/ast/BreakStatement.java | 3 +
.../jdt/internal/compiler/ast/CaseStatement.java | 10 +-
.../jdt/internal/compiler/ast/CastExpression.java | 81 +-
.../eclipse/jdt/internal/compiler/ast/Clinit.java | 9 +-
.../compiler/ast/ConditionalExpression.java | 14 +-
.../compiler/ast/ConstructorDeclaration.java | 757 ++++++++++---------
.../internal/compiler/ast/ContinueStatement.java | 3 +
.../jdt/internal/compiler/ast/Expression.java | 7 +-
.../jdt/internal/compiler/ast/ForStatement.java | 7 +
.../internal/compiler/ast/ForeachStatement.java | 118 +--
.../jdt/internal/compiler/ast/IfStatement.java | 5 +-
.../eclipse/jdt/internal/compiler/ast/Javadoc.java | 16 +-
.../internal/compiler/ast/LocalDeclaration.java | 14 +-
.../compiler/ast/QualifiedTypeReference.java | 2 +-
.../jdt/internal/compiler/ast/ReturnStatement.java | 22 +-
.../internal/compiler/ast/SubRoutineStatement.java | 2 +-
.../jdt/internal/compiler/ast/SwitchStatement.java | 3 +-
.../compiler/ast/SynchronizedStatement.java | 24 +-
.../jdt/internal/compiler/ast/TryStatement.java | 88 ++-
.../jdt/internal/compiler/ast/TypeDeclaration.java | 4 +-
.../eclipse/jdt/internal/compiler/batch/Main.java | 50 +-
.../internal/compiler/batch/messages.properties | 144 ++--
.../jdt/internal/compiler/codegen/BranchLabel.java | 2 +-
.../jdt/internal/compiler/codegen/CodeStream.java | 235 +++---
.../internal/compiler/codegen/ConstantPool.java | 7 +-
.../internal/compiler/codegen/StackMapFrame.java | 64 +-
.../compiler/codegen/StackMapFrameCodeStream.java | 279 ++++---
.../compiler/codegen/VerificationTypeInfo.java | 5 +-
.../compiler/lookup/BinaryTypeBinding.java | 18 +-
.../jdt/internal/compiler/lookup/BlockScope.java | 2 +-
.../jdt/internal/compiler/lookup/ClassScope.java | 13 +-
.../compiler/lookup/CompilationUnitScope.java | 7 +-
.../internal/compiler/lookup/MethodVerifier.java | 7 +
.../internal/compiler/lookup/MethodVerifier15.java | 70 ++
.../lookup/ParameterizedGenericMethodBinding.java | 2 +-
.../lookup/ParameterizedMethodBinding.java | 2 +-
.../internal/compiler/lookup/ReferenceBinding.java | 19 +-
.../jdt/internal/compiler/lookup/Scope.java | 192 +++--
.../compiler/lookup/SourceTypeBinding.java | 69 +-
.../compiler/lookup/SyntheticMethodBinding.java | 3 +-
.../jdt/internal/compiler/lookup/TypeBinding.java | 13 +-
.../internal/compiler/lookup/WildcardBinding.java | 19 +-
.../jdt/internal/compiler/messages.properties | 6 +-
.../compiler/parser/AbstractCommentParser.java | 1 +
.../compiler/parser/diagnose/DiagnoseParser.java | 2 +-
.../eclipse/jdt/internal/compiler/util/Util.java | 103 +--
51 files changed, 1912 insertions(+), 1459 deletions(-)
diff --cc debian/changelog
index 9b5c632,0000000..177e440
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,242 -1,0 +1,249 @@@
++ecj-bootstrap (3.2.1-1) unstable; urgency=medium
++
++ * New upstream version.
++ * ecj-bootstrap-gcj: Add postrm script.
++
++ -- Matthias Klose <d...@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 <d...@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 <d...@debian.org> Sun, 13 Aug 2006 13:01:45 +0200
+
+ecj-bootstrap (3.2-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <d...@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 <d...@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 <konque...@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 <d...@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 <d...@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 <d...@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 <d...@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 <d...@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 <d...@debian.org> Thu, 9 Feb 2006 16:33:45 +0000
+
+ecj-bootstrap (3.1.2-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <d...@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 <d...@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 <m...@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 <d...@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 <d...@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 <d...@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 <d...@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 <d...@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 <d...@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 <d...@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 <jbai...@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 <was...@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 <d...@ubuntu.com> Sat, 11 Jun 2005 16:57:27 +0000
+
+ecj-bootstrap (3.0.1-3) experimental; urgency=low
+
+ * Synchronize.
+
+ -- Matthias Klose <d...@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 <was...@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 <d...@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 <was...@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 <was...@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 <was...@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 <was...@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 <jbai...@ubuntu.com> Fri, 11 Feb 2005 20:37:21 +0000
+
+ecj-bootstrap (3.0.1-0) unstable; urgency=low
+
+ * Initial release.
+
+ -- Jerry Haltom <was...@larvalstage.net> Wed, 09 Feb 2005 19:36:07 -0600
diff --cc debian/ecj-bootstrap-gcj.postrm
index 0000000,0000000..e6c5b04
new file mode 100644
--- /dev/null
+++ b/debian/ecj-bootstrap-gcj.postrm
@@@ -1,0 -1,0 +1,7 @@@
++#! /bin/sh -e
++
++if [ "$1" = remove ] && [ -x /usr/bin/rebuild-gcj-db ]; then
++ /usr/bin/rebuild-gcj-db
++fi
++
++#DEBHELPER#
diff --cc debian/rules
index 734cc3c,0000000..2b880b7
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,153 -1,0 +1,153 @@@
+#!/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)
+
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+with_native := yes
+with_rebuild := yes
+
+ifneq (,$(findstring $(DEB_HOST_ARCH), arm m68k))
+ with_rebuild := no
+endif
+
+default: build
+
+eclipse_root = ../eclipse-3.1.2/source-tree
- eclipse_root = ../src-3.2
++eclipse_root = ../321
+
+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/
+
+build/ecj-bootstrap:: build/stamp
+build/stamp:
+ mkdir -p build/bin
+
+ cp -r src/org.eclipse.jdt.core/org build/bin/
+ echo "byte-compiling (using gcj) ..."
+ set -e; \
+ for f in $$(find build/bin -name '*.java'); do \
+ $(GCJ) -d build/bin -C -g \
+ -I/usr/share/ant$(ant_version)/lib/ant.jar \
+ -Ibuild/bin \
+ $$f; \
+ done
+
+ set -e; \
+ rv=0; \
+ for f in $$(find build/bin -name '*.java'); do \
+ f2=$${f%*.java}.class; \
+ if [ ! -f $$f2 ]; then \
+ echo not found: $$f2; \
+ rv=1; \
+ fi; \
+ done; \
+ exit $$rv
+
+ 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/ecj.jar
+
+ifeq ($(with_rebuild),yes)
+ rm -rf build/bin
+ mkdir -p build/bin
+ cp -r src/org.eclipse.jdt.core/org build/bin/
+
+ $(GIJ) \
+ -classpath
build/bootstrap/ecj.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/ecj.jar
+else
+ mkdir -p build/dist
+ cp -p build/bootstrap/ecj.jar build/dist/ecj.jar
+endif
+ rm -rf build/bin
+
+ifeq ($(with_native),yes)
- $(GCJ) -v \
++ $(GCJ) \
+ -O2 -g -Wl,-Bsymbolic,-O1 -shared -fPIC -fjni -findirect-dispatch \
+ -o build/dist/ecj.jar.so build/dist/ecj.jar
+
- $(GCJ) -v \
++ $(GCJ) \
+ -O2 -g -Wl,-Bsymbolic,-O1 -fPIC -fjni -findirect-dispatch \
+ --main=org.eclipse.jdt.internal.compiler.batch.Main \
+ -o build/dist/ecj-bootstrap-gcj build/dist/ecj.jar
+endif
+
+ touch build/stamp
+
+xxx:
+ $(GCJ) -v \
+ -O2 -g -Wl,-Bsymbolic -shared -fPIC -fjni -findirect-dispatch \
+ -o /tmp/ecj.jar.so /usr/share/java/ecj.jar
+
+ $(GCJ) -v \
+ -O2 -g -Wl,-Bsymbolic -fPIC -fjni -findirect-dispatch \
+ --main=org.eclipse.jdt.internal.compiler.batch.Main \
+ -o /tmp/ecj /usr/share/java/ecj.jar
+ objdump -x /tmp/ecj.jar.so | grep NEEDED
+ objdump -x /tmp/ecj | grep NEEDED
+
+install-ecj-bootstrap:
+ # Install pieces into proper hierarchy.
+ mkdir -p debian/tmp/usr/share/java
+ install -m 644 build/dist/ecj.jar debian/tmp/usr/share/java/
+
+ mkdir -p debian/tmp/usr/bin
+ install -m 755 ecj-bootstrap debian/tmp/usr/bin/
+
+ifeq ($(with_native),yes)
+ mkdir -p debian/tmp/usr/lib/gcj
+ install -m 644 build/dist/ecj.jar.so debian/tmp/usr/lib/gcj
+
+ # Native GCJ version.
+ mkdir -p debian/tmp/usr/bin
+ install -m 755 build/dist/ecj-bootstrap-gcj debian/tmp/usr/bin/
+
+ mkdir -p debian/tmp/usr/share/gcj/classmap.d
+ gcj-dbtool-$(gcc_version) -n
debian/tmp/usr/share/gcj/classmap.d/ecj-bootstrap.db
+
+ cd debian/tmp && \
+ for jar in $$(find usr/share/java -name '*.jar'); do \
+ echo $$jar '->' usr/lib/gcj/$$(basename $$jar).so; \
+ gcj-dbtool-$(gcc_version) -f
usr/share/gcj/classmap.d/ecj-bootstrap.db \
+ $$jar /usr/lib/gcj/$$(basename $$jar).so || exit 1; \
+ done
+endif
+
+
+install/ecj-bootstrap:: install-ecj-bootstrap
+install/ecj-bootstrap-gcj:: install-ecj-bootstrap
+ mkdir -p debian/ecj-bootstrap-gcj/usr/share/man/man1
+ ln -sf ecj-bootstrap.1.gz
debian/ecj-bootstrap-gcj/usr/share/man/man1/ecj-bootstrap-gcj.1.gz
+
+
+clean::
+ rm -rf build
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/ecj.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
