This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ecj.
commit 955ab6da997072434542b0a6af470389f0754b39 Merge: cac8482 132ff42 Author: Matthias Klose <[email protected]> Date: Sat Jan 28 08:09:25 2006 +0000 Import Debian changes 3.1.2-1 ecj-bootstrap (3.1.2-1) unstable; urgency=low * New upstream version. debian/changelog | 6 + debian/control | 2 +- debian/rules | 1 + .../jdt/internal/compiler/CompilationResult.java | 2 +- .../eclipse/jdt/internal/compiler/ast/ASTNode.java | 3 +- .../compiler/ast/AbstractMethodDeclaration.java | 13 +- .../compiler/ast/AllocationExpression.java | 2 +- .../compiler/ast/AnnotationMethodDeclaration.java | 2 +- .../jdt/internal/compiler/ast/Assignment.java | 4 +- .../internal/compiler/ast/BinaryExpression.java | 502 +++++++++++---------- .../jdt/internal/compiler/ast/CastExpression.java | 2 + .../internal/compiler/ast/ClassLiteralAccess.java | 2 +- .../compiler/ast/ConstructorDeclaration.java | 4 +- .../jdt/internal/compiler/ast/EqualExpression.java | 449 +++++++++++++++--- .../compiler/ast/ExplicitConstructorCall.java | 2 +- .../internal/compiler/ast/FieldDeclaration.java | 9 +- .../jdt/internal/compiler/ast/ForStatement.java | 2 +- .../internal/compiler/ast/ForeachStatement.java | 2 +- .../jdt/internal/compiler/ast/MessageSend.java | 4 +- .../ast/ParameterizedQualifiedTypeReference.java | 4 +- .../compiler/ast/QualifiedNameReference.java | 42 +- .../compiler/ast/QualifiedTypeReference.java | 2 +- .../internal/compiler/ast/SingleNameReference.java | 2 +- .../jdt/internal/compiler/ast/TryStatement.java | 2 +- .../jdt/internal/compiler/ast/TypeDeclaration.java | 8 +- .../eclipse/jdt/internal/compiler/batch/Main.java | 42 +- .../internal/compiler/batch/messages.properties | 4 +- .../jdt/internal/compiler/codegen/CodeStream.java | 20 +- .../jdt/internal/compiler/codegen/Label.java | 73 ++- .../internal/compiler/impl/BooleanConstant.java | 6 +- .../jdt/internal/compiler/impl/ByteConstant.java | 5 +- .../jdt/internal/compiler/impl/CharConstant.java | 5 +- .../jdt/internal/compiler/impl/Constant.java | 38 +- .../jdt/internal/compiler/impl/DoubleConstant.java | 4 +- .../jdt/internal/compiler/impl/FloatConstant.java | 4 +- .../jdt/internal/compiler/impl/IntConstant.java | 5 +- .../jdt/internal/compiler/impl/LongConstant.java | 6 +- .../jdt/internal/compiler/impl/ShortConstant.java | 6 +- .../jdt/internal/compiler/lookup/BaseTypes.java | 20 +- .../compiler/lookup/BinaryTypeBinding.java | 27 +- .../internal/compiler/lookup/CaptureBinding.java | 19 +- .../compiler/lookup/CompilationUnitScope.java | 9 + .../internal/compiler/lookup/MethodBinding.java | 10 +- .../internal/compiler/lookup/MethodVerifier.java | 89 ++-- .../internal/compiler/lookup/MethodVerifier15.java | 235 +++++++--- .../lookup/ParameterizedGenericMethodBinding.java | 9 +- .../lookup/ParameterizedMethodBinding.java | 36 +- .../compiler/lookup/ParameterizedTypeBinding.java | 77 +++- .../jdt/internal/compiler/lookup/Scope.java | 47 +- .../compiler/lookup/SourceTypeBinding.java | 12 +- .../jdt/internal/compiler/lookup/TypeBinding.java | 2 + .../compiler/parser/AbstractCommentParser.java | 4 +- .../jdt/internal/compiler/parser/Parser.java | 11 +- .../jdt/internal/compiler/parser/Scanner.java | 4 +- .../compiler/parser/diagnose/DiagnoseParser.java | 2 +- .../internal/compiler/problem/ProblemReporter.java | 18 +- .../internal/compiler/problem/messages.properties | 2 + 57 files changed, 1279 insertions(+), 645 deletions(-) diff --cc debian/changelog index d1aefcc,0000000..7d5e826 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,158 -1,0 +1,164 @@@ ++ecj-bootstrap (3.1.2-1) unstable; urgency=low ++ ++ * New upstream version. ++ ++ -- Matthias Klose <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Sat, 11 Jun 2005 16:57:27 +0000 + +ecj-bootstrap (3.0.1-3) experimental; urgency=low + + * Synchronize. + + -- Matthias Klose <[email protected]> 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 <[email protected]> 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 <[email protected]> Sun, 22 May 2005 15:53:07 +0000 + +ecj-bootstrap (3.0.1-1ubuntu5) hoary; urgency=low + + * Fixed path to ant.jar. + + -- Jerry Haltom <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Fri, 11 Feb 2005 20:37:21 +0000 + +ecj-bootstrap (3.0.1-0) unstable; urgency=low + + * Initial release. + + -- Jerry Haltom <[email protected]> Wed, 09 Feb 2005 19:36:07 -0600 diff --cc debian/control index 7e1a785,0000000..b5d9c98 mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,35 -1,0 +1,35 @@@ +Source: ecj-bootstrap +Section: devel +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Jerry Haltom <[email protected]>, Michael Koch <[email protected]>, Matthias Klose <[email protected]> - Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.1.0), gcj-4.0 (>= 4.0.2-6), libgcj6-jar, fastjar, ant ++Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.1.0), gcj-4.0 (>= 4.0.2-7), fastjar, ant +Standards-Version: 3.6.2 + +Package: ecj-bootstrap +Architecture: all +Depends: gij-4.0 (>= 4.0.2-6), libgcj6-jar, java-common (>= 0.22ubuntu1) +Recommends: ecj-bootstrap-gcj +Suggests: libant1.6-java | ant +Provides: ecj +Conflicts: ecj +Description: bootstrap version of the Eclipse Java compiler + This package provides a bootstrap 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 and 1.4. + . + This bootstrap version should be used for uploading initial versions of + packages which are a dependency of Eclipse and build with ECJ. + +Package: ecj-bootstrap-gcj +Architecture: any +Depends: ecj-bootstrap (= ${Source-Version}), ${shlibs:Depends} +Description: bootstrap version of the Eclipse Java compiler (native version) + This package provides a bootstrap 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 and 1.4. + . + This bootstrap version should be used for uploading initial versions of + packages which are a dependency of Eclipse and build with ECJ. + . + This package contains a native version of ecj built using gcj. diff --cc debian/rules index 5626459,0000000..a20ffe7 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,148 -1,0 +1,149 @@@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +gcc_version = 4.0 +ant_version = 1.6 +ant_version = +GCJ = gcj-$(gcc_version) +GIJ = gij-$(gcc_version) + +#DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +#ifeq ($(DEB_HOST_ARCH),amd64) +# DH_OPTIONS = -Necj-bootstrap-ecj +# export DH_OPTIONS +#else +# with_native := yes +#endif + +with_native := yes +with_rebuild := yes +ifeq ($(DEB_HOST_ARCH),arm) + with_rebuild := no +endif +ifeq ($(DEB_HOST_ARCH),hppa) + with_rebuild := no +endif + +default: build + +eclipse_root = ../eclipse-3.1.1/source-tree ++eclipse_root = ../s + +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) \ + -O2 -g -Wl,-Bsymbolic -shared -fPIC -fjni -findirect-dispatch \ + -o build/dist/ecj.jar.so build/dist/ecj.jar + + $(GCJ) \ + -O2 -g -Wl,-Bsymbolic -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 + +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/java + install -m 644 build/dist/ecj.jar.so debian/tmp/usr/lib/java + + # 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-$(gcc_version)/classmap.d + gcj-dbtool-$(gcc_version) -n debian/tmp/usr/share/gcj-$(gcc_version)/classmap.d/ecj-bootstrap.db + + cd debian/tmp && \ + for jar in $$(find usr/share/java -name '*.jar'); do \ + echo $$jar '->' usr/lib/java/$$(basename $$jar).so; \ + gcj-dbtool-$(gcc_version) -f usr/share/gcj-$(gcc_version)/classmap.d/ecj-bootstrap.db \ + $$jar /usr/lib/java/$$(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 [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
