Author: ebourg-guest Date: 2016-03-25 08:48:04 +0000 (Fri, 25 Mar 2016) New Revision: 19017
Added: trunk/ecj/debian/patches/remove-overrides.diff trunk/ecj/debian/watch Modified: trunk/ecj/debian/changelog trunk/ecj/debian/compat trunk/ecj/debian/control trunk/ecj/debian/ecj.1 trunk/ecj/debian/ecj.postinst trunk/ecj/debian/ecj.prerm trunk/ecj/debian/patches/gcc-changes.diff trunk/ecj/debian/patches/series trunk/ecj/debian/poms/ecj.pom trunk/ecj/debian/rules Log: Imported ecj/3.10.1-2 Modified: trunk/ecj/debian/changelog =================================================================== --- trunk/ecj/debian/changelog 2016-03-21 13:37:14 UTC (rev 19016) +++ trunk/ecj/debian/changelog 2016-03-25 08:48:04 UTC (rev 19017) @@ -1,22 +1,61 @@ -ecj (3.10.0+3.9.0-3) unstable; urgency=medium +ecj (3.10.1-2) unstable; urgency=medium - * Add Vcs attributes to the control file. + * Build using GCC 5. - -- Matthias Klose <[email protected]> Mon, 07 Jul 2014 19:01:18 +0200 + -- Matthias Klose <[email protected]> Tue, 01 Sep 2015 01:32:26 +0200 -ecj (3.10.0+3.9.0-2) unstable; urgency=medium +ecj (3.10.1-1) unstable; urgency=medium - * Disable the source build and build the architecture dependent packages - from the libecj-java in the archive. + * Upstream 3.10.1 release (marketing version 4.4.1). - -- Matthias Klose <[email protected]> Mon, 07 Jul 2014 15:14:50 +0200 + -- Matthias Klose <[email protected]> Tue, 30 Sep 2014 16:38:20 +0200 -ecj (3.10.0+3.9.0-1) unstable; urgency=high +ecj (3.10.1~rc2-1) unstable; urgency=medium - * Revert back to 3.9.0, as long as #753315 is not fixed. + * Upstream 3.10.1 release candidate 2. + * Update package descriptions. - -- Matthias Klose <[email protected]> Sat, 05 Jul 2014 15:55:57 +0200 + -- Matthias Klose <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Thu, 26 Jun 2014 17:45:28 +0200 + ecj (3.9.0-2) unstable; urgency=medium * Build using gcj-4.9. Modified: trunk/ecj/debian/compat =================================================================== --- trunk/ecj/debian/compat 2016-03-21 13:37:14 UTC (rev 19016) +++ trunk/ecj/debian/compat 2016-03-25 08:48:04 UTC (rev 19017) @@ -1 +1 @@ -5 +9 Modified: trunk/ecj/debian/control =================================================================== --- trunk/ecj/debian/control 2016-03-21 13:37:14 UTC (rev 19016) +++ trunk/ecj/debian/control 2016-03-25 08:48:04 UTC (rev 19017) @@ -3,17 +3,16 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Matthias Klose <[email protected]> -Build-Depends: cdbs (>= 0.4.90ubuntu9), debhelper (>= 5), - gcj-4.9-jdk (>= 4.9.0), - libgcj-bc (>= 4.6.3), - libecj-java (>= 3.10.0+3.9.0), libecj-java (<< 3.10.0+3.9.1), unzip, - libecj-java (>= 3.8.2) [arm], unzip [arm], +Build-Depends: cdbs (>= 0.4.90ubuntu9), debhelper (>= 9), + gcj-5-jdk, + libgcj-bc, fastjar, ant, zip, dpkg (>= 1.13.19), python, time Build-Depends-Indep: maven-repo-helper Build-Conflicts: ecj-bootstrap-gcj (<< 3.8.2) -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 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 @@ -25,19 +24,18 @@ 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) -Recommends: default-jre-headless | java2-runtime-headless | java5-runtime-headless 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 @@ -46,12 +44,12 @@ 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 @@ -67,6 +65,6 @@ 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. Modified: trunk/ecj/debian/ecj.1 =================================================================== --- trunk/ecj/debian/ecj.1 2016-03-21 13:37:14 UTC (rev 19016) +++ trunk/ecj/debian/ecj.1 2016-03-25 08:48:04 UTC (rev 19017) @@ -32,8 +32,10 @@ .TP \fB\-1.7\fR set compliance level to 1.7 .TP -\fB\-source\fR <ver> assertions toggle (1.3 or 1.4, default is 1.3 in -1.3 mode and 1.4 in -1.4 mode) +\fB\-1.8\fR set compliance level to 1.8 .TP +\fB\-source\fR <ver> assertions toggle (1.3 or 1.4, default is 1.3 in \-1.3 mode and 1.4 in \-1.4 mode) +.TP \fB\-target\fR <ver> classfile target setting .TP \fB\-nowarn\fR no warning (equivalent to '\-warn:none') @@ -83,7 +85,7 @@ .TP \fB\-noImportError\fR no errors for unresolved imports .TP -\fB\-encoding\fR specify default source encoding format (custom encoding can also be specifed on a per file basis by suffixing each input source file/folder name with '[encoding]') +\fB\-encoding\fR specify default source encoding format (custom encoding can also be specified on a per file basis by suffixing each input source file/folder name with '[encoding]') .PP \fB\-log\fR <filename> specify a log file .TP Modified: trunk/ecj/debian/ecj.postinst =================================================================== --- trunk/ecj/debian/ecj.postinst 2016-03-21 13:37:14 UTC (rev 19016) +++ trunk/ecj/debian/ecj.postinst 2016-03-25 08:48:04 UTC (rev 19017) @@ -1,5 +1,7 @@ -#! /bin/sh -e +#! /bin/sh +set -e + update-alternatives --quiet --install /usr/bin/javac javac /usr/bin/ecj 143 \ --slave /usr/share/man/man1/javac.1.gz javac.1.gz /usr/share/man/man1/ecj.1.gz Modified: trunk/ecj/debian/ecj.prerm =================================================================== --- trunk/ecj/debian/ecj.prerm 2016-03-21 13:37:14 UTC (rev 19016) +++ trunk/ecj/debian/ecj.prerm 2016-03-25 08:48:04 UTC (rev 19017) @@ -1,5 +1,7 @@ -#! /bin/sh -e +#! /bin/sh +set -e + update-alternatives --quiet --remove javac /usr/bin/ecj #DEBHELPER# Modified: trunk/ecj/debian/patches/gcc-changes.diff =================================================================== --- trunk/ecj/debian/patches/gcc-changes.diff 2016-03-21 13:37:14 UTC (rev 19016) +++ trunk/ecj/debian/patches/gcc-changes.diff 2016-03-25 08:48:04 UTC (rev 19017) @@ -1,5 +1,3 @@ -Index: b/gcc.properties -=================================================================== --- /dev/null +++ b/gcc.properties @@ -0,0 +1,5 @@ @@ -8,11 +6,9 @@ +gcc.zipArg=-fzip-target requires argument +gcc.zipDepArg=-fzip-dependency requires argument +gcc.noClasspath=no classpath specified -Index: b/src/org.eclipse.jdt.core/build.xml -=================================================================== --- a/src/org.eclipse.jdt.core/build.xml +++ b/src/org.eclipse.jdt.core/build.xml -@@ -49,9 +49,10 @@ +@@ -38,9 +38,10 @@ <include name="**/readableNames.props"/> <include name="META-INF/**"/> <include name="**/*.properties"/> @@ -25,11 +21,9 @@ -</project> \ No newline at end of file +</project> -Index: b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java -=================================================================== --- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java +++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java -@@ -1188,9 +1188,9 @@ +@@ -1215,9 +1215,9 @@ // by default only lines and source attributes are generated. this.produceDebugAttributes = ClassFileConstants.ATTR_SOURCE | ClassFileConstants.ATTR_LINES; @@ -42,8 +36,6 @@ this.defaultEncoding = null; // will use the platform default encoding -Index: b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/GCCMain.java -=================================================================== --- /dev/null +++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/GCCMain.java @@ -0,0 +1,502 @@ Added: trunk/ecj/debian/patches/remove-overrides.diff =================================================================== --- trunk/ecj/debian/patches/remove-overrides.diff (rev 0) +++ trunk/ecj/debian/patches/remove-overrides.diff 2016-03-25 08:48:04 UTC (rev 19017) @@ -0,0 +1,55 @@ +Description: Fixes compilation errors caused by @Override annotations (bug?) +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/lookup/CaptureBinding18.java ++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/lookup/CaptureBinding18.java +@@ -196,15 +196,12 @@ + final CaptureBinding18 newCapture = (CaptureBinding18) clone(enclosingType()); + newCapture.tagBits = this.tagBits; + Substitution substitution = new Substitution() { +- @Override + public TypeBinding substitute(TypeVariableBinding typeVariable) { + return (typeVariable == CaptureBinding18.this) ? newCapture : typeVariable; //$IDENTITY-COMPARISON$ + } +- @Override + public boolean isRawSubstitution() { + return false; + } +- @Override + public LookupEnvironment environment() { + return CaptureBinding18.this.environment; + } +--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/NonNullDefaultAwareTypeAnnotationWalker.java ++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/NonNullDefaultAwareTypeAnnotationWalker.java +@@ -64,11 +64,9 @@ + 'L', CharOperation.concatWith(environment.getNonNullAnnotationName(), '/'), ';'); + // create the synthetic annotation: + return new IBinaryAnnotation() { +- @Override + public char[] getTypeName() { + return nonNullAnnotationName; + } +- @Override + public IBinaryElementValuePair[] getElementValuePairs() { + return null; + } +--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/util/Sorting.java ++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/util/Sorting.java +@@ -112,7 +112,6 @@ + /** Sort inference variables by rank. */ + public static void sortInferenceVariables(InferenceVariable[] variables) { + Arrays.sort(variables, new Comparator<InferenceVariable>() { +- @Override + public int compare(InferenceVariable iv1, InferenceVariable iv2) { + return iv1.rank - iv2.rank; + } +--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/MemberValuePair.java ++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/MemberValuePair.java +@@ -106,7 +106,6 @@ + // the next check may need deferring: + final boolean[] shouldExit = new boolean[1]; + Runnable check = new Runnable() { +- @Override + public void run() { + if (!(MemberValuePair.this.value.isConstantValueOfTypeAssignableToType(valueType, requiredType) + || valueType.isCompatibleWith(requiredType))) { Modified: trunk/ecj/debian/patches/series =================================================================== --- trunk/ecj/debian/patches/series 2016-03-21 13:37:14 UTC (rev 19016) +++ trunk/ecj/debian/patches/series 2016-03-25 08:48:04 UTC (rev 19017) @@ -1 +1,2 @@ gcc-changes.diff +remove-overrides.diff Modified: trunk/ecj/debian/poms/ecj.pom =================================================================== --- trunk/ecj/debian/poms/ecj.pom 2016-03-21 13:37:14 UTC (rev 19016) +++ trunk/ecj/debian/poms/ecj.pom 2016-03-25 08:48:04 UTC (rev 19017) @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.jdt.core.compiler</groupId> <artifactId>ecj</artifactId> - <version>3.8.2</version> + <version>3.10.0</version> <packaging>jar</packaging> <name>Eclipse ECJ</name> <description>Eclipse JDT Core Batch Compiler</description> Modified: trunk/ecj/debian/rules =================================================================== --- trunk/ecj/debian/rules 2016-03-21 13:37:14 UTC (rev 19016) +++ trunk/ecj/debian/rules 2016-03-25 08:48:04 UTC (rev 19017) @@ -5,16 +5,17 @@ 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 +GCC_VERSION := 5 LIBGCJ_EXT := $(shell ls -l /usr/lib/$(DEB_HOST_MULTIARCH)/libgcj_bc.so.1 | sed 's/.*\.//') LIBGCJ_SOVER = $(LIBGCJ_EXT) -LIBGCJ_SOVER = 15 +LIBGCJ_SOVER = 16 REQ_VERSION = 4.4.6 -ant_version = 1.7 -ant_version = GCJ = gcj-$(GCC_VERSION) GIJ = gij-$(GCC_VERSION) GCJDBTOOL = gcj-dbtool-$(GCC_VERSION) @@ -28,9 +29,6 @@ with_rebuild := yes with_sourcebuild := yes -# use the ecj.jar from the archive -with_sourcebuild := - ifneq (,$(filter $(DEB_HOST_ARCH), arm armel)) with_rebuild := no endif @@ -53,10 +51,8 @@ build/stamp-bytecode: ifneq (,$(findstring $(DEB_HOST_ARCH),arm)) - @echo 'ecj is not built anymore on this architecture.' - @echo 'People insist on 100% compatible packages without providing any help.' - @echo 'The porter lists are quiet on the topic of better gij/gcj support for' - @echo 'these architectures.' + @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 @@ -69,6 +65,10 @@ rm -rf build/bin/org/eclipse/jdt/internal/compiler/apt rm -rf build/bin/org/eclipse/jdt/internal/compiler/tool + # Replace the bundle_version parameter with the actual version + sed -i 's/bundle_qualifier, bundle_version/$(UVERSION)/' \ + build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties + find build/bin -name '*.java' > build/sourcefiles split -l 25 build/sourcefiles ecj-sources. ls -l @@ -80,12 +80,13 @@ 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 \ + -I/usr/share/ant/lib/ant.jar \ -Ibuild/bin \ $$(cat $$list); \ $(GCJ) -v -d build/bin -C -g \ - -I/usr/share/ant$(ant_version)/lib/ant.jar \ + -I/usr/share/ant/lib/ant.jar \ -Ibuild/bin \ + -Wno-all -Wno-unchecked -Wno-raw -Wno-resource \ $$(cat $$list); \ done @@ -106,8 +107,12 @@ rm -rf build/bin/org/eclipse/jdt/internal/compiler/apt rm -rf build/bin/org/eclipse/jdt/internal/compiler/tool + # Replace the bundle_version parameter with the actual version + sed -i 's/bundle_qualifier, bundle_version/$(UVERSION)/' \ + build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties + time $(GIJ) \ - -classpath build/bootstrap/$(JAR):/usr/share/ant$(ant_version)/lib/ant.jar \ + -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 @@ -229,10 +234,8 @@ rm -f debian/*.pyc ecj1 rm -rf debian/.mh -RR=../cvs/R3_5_maintenance/ -RR=../cvs/R3_5_1/ -RR=R4_3_1/ -tag = R4_3_1 +TAG = R4_4 +DIR = ecj-$(DEB_UPSTREAM_VERSION) MAVEN_REPO := http://repo1.maven.org/maven2 PACKAGE := ecj @@ -242,31 +245,36 @@ 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-source: - rm -rf org.eclipse.jdt.core - #wget http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/R4_3_1.tar.gz - #git clone -b R3_8_maintenance git://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git - tar xf ../R4_3_1.tar.gz - rm -rf tmp-src - mkdir -p tmp-src/org.eclipse.jdt.core - cp -p $(RR)org.eclipse.jdt.core/scripts/about.html \ - tmp-src/org.eclipse.jdt.core/ - cp -p $(RR)org.eclipse.jdt.core/scripts/build.xml \ - tmp-src/org.eclipse.jdt.core/ - tar -c -f - -C $(RR)org.eclipse.jdt.core/compiler org \ - | tar -x -f - -C tmp-src/org.eclipse.jdt.core/ +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 $(RR)org.eclipse.jdt.core/antadapter org META-INF \ - | tar -x -f - -C tmp-src/org.eclipse.jdt.core/ - find tmp-src -name CheckDebugAttributes.java | xargs -r rm -f - find tmp-src -name BuildJarIndex.java | xargs -r rm -f + 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 $(RR)org.eclipse.jdt.core/batch org \ - | tar -x -f - -C tmp-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/ - mkdir -p tmp-src/org.eclipse.jdt.core/META-INF/services -# cp -p $(RR)org.eclipse.jdt.core/scripts/META-INF/MANIFEST.MF \ -# tmp-src/org.eclipse.jdt.core/META-INF/ + 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' \ - > tmp-src/org.eclipse.jdt.core/META-INF/services/javax.tools.JavaCompiler + > $(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) Added: trunk/ecj/debian/watch =================================================================== --- trunk/ecj/debian/watch (rev 0) +++ trunk/ecj/debian/watch 2016-03-25 08:48:04 UTC (rev 19017) @@ -0,0 +1,9 @@ +version=3 +# +# There is a mismatch between the version of the Eclipse Platform which is used +# to tag the upstream source repository and the version of the Eclipse Compiler. +# The package caries the version of the compiler and the version of the platform +# has to be hardcoded here to detect the new releases. +# +opts="uversionmangle=s/_/./g,dversionmangle=s/.*/4.4/" \ +http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/refs/tags .*/R([\d_]+).tar.gz _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
