This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ecj.
commit 4bd147c16e49c64f5c7eaec1294d2a9732d579a3 Author: Emmanuel Bourg <[email protected]> Date: Tue Mar 27 16:06:55 2018 +0200 New upstream release (from the R4_6 tag, identifies itself as 3.12.0) --- debian/build.xml | 12 +++++++++--- debian/changelog | 5 +++-- debian/patches/fix-readmanager-npe.diff | 19 ------------------- debian/patches/remove-javacore.diff | 19 ------------------- debian/patches/series | 2 -- 5 files changed, 12 insertions(+), 45 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index 355fbb3..23086e6 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -4,18 +4,24 @@ <target name="jar"> <mkdir dir="target/classes" /> <copy todir="target/classes"> - <fileset dir="src/org.eclipse.jdt.core" includes="**/*.properties"/> + <fileset dir="org.eclipse.jdt.core/batch" includes="**/*.properties"/> </copy> <replace dir="target/classes" token="bundle_qualifier, bundle_version" value="${version}"/> - <javac srcdir="src/org.eclipse.jdt.core" destdir="target/classes" debuglevel="lines,source" source="1.8" target="1.8" encoding="UTF-8"> + <javac destdir="target/classes" debuglevel="lines,source" source="1.8" target="1.8" encoding="UTF-8"> + <src path="org.eclipse.jdt.core/compiler"/> + <src path="org.eclipse.jdt.core/antadapter"/> + <src path="org.eclipse.jdt.core/batch"/> <exclude name="**/BuildJarIndex.java"/> <exclude name="**/CheckDebugAttributes.java"/> </javac> <jar destfile="target/ecj.jar"> - <fileset dir="src/org.eclipse.jdt.core" includes="**/*.props,**/*.rsc"/> + <fileset dir="org.eclipse.jdt.core/compiler" includes="**/*.props,**/*.rsc,**/*.properties"/> + <fileset dir="org.eclipse.jdt.core/antadapter" includes="**/*.props,**/*.rsc,**/*.properties"/> + <fileset dir="org.eclipse.jdt.core/batch" includes="**/*.props,**/*.rsc"/> + <fileset dir="org.eclipse.jdt.compiler.tool/src/" includes="META-INF/**"/> <fileset dir="target/classes"/> </jar> diff --git a/debian/changelog b/debian/changelog index 01d05e6..b117b15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -ecj (3.11.2-1) UNRELEASED; urgency=medium +ecj (3.12.0-1) UNRELEASED; urgency=medium - * New upstream release (from the R4_5_2 tag, identifies itself as 3.11.2) + * New upstream release (from the R4_6 tag, identifies itself as 3.12.0) + - Removed the patches * No longer build the -gcj packages (Closes: #892531) * Removed the Conflicts/Replaces fields referencing very old packages * Removed the build dependency on dpkg diff --git a/debian/patches/fix-readmanager-npe.diff b/debian/patches/fix-readmanager-npe.diff deleted file mode 100644 index 39836c6..0000000 --- a/debian/patches/fix-readmanager-npe.diff +++ /dev/null @@ -1,19 +0,0 @@ -Description: Fixes a sporadic NullPointerException in ReadManager when building ecj. - This error has been at least observed on amd64 and arm64. The cause is unknown - (race condition?) and this workaround may lead to another error later in the build. -Author: Emmanuel Bourg <[email protected]> -Forwarded: no ---- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ReadManager.java -+++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ReadManager.java -@@ -171,7 +171,10 @@ - this.filesRead[position] = unit; - this.contentsRead[position] = this.readInProcessMarker; // mark the spot so we know its being read - } -- char[] result = unit.getContents(); -+ char[] result = unit != null ? unit.getContents() : new char[0]; -+ if (unit == null) { -+ System.err.println("ICompilationUnit " + (this.nextFileToRead - 1) + " of " + units.length + " is null"); -+ } - synchronized (this) { - if (this.filesRead[position] == unit) { - if (this.contentsRead[position] == null) // wake up main thread which is waiting for this file diff --git a/debian/patches/remove-javacore.diff b/debian/patches/remove-javacore.diff deleted file mode 100644 index a3428ec..0000000 --- a/debian/patches/remove-javacore.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java -+++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java -@@ -18,7 +18,6 @@ - import java.util.Hashtable; - import java.util.List; - --import org.eclipse.jdt.core.JavaCore; - import org.eclipse.jdt.core.compiler.CharOperation; - import org.eclipse.jdt.internal.compiler.CompilationResult; - import org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies; -@@ -188,7 +187,7 @@ - ProblemReporter problemReporter = - new ProblemReporter( - DefaultErrorHandlingPolicies.proceedWithAllProblems(), -- new CompilerOptions(JavaCore.getOptions()), -+ new CompilerOptions(), - new DefaultProblemFactory()); - Parser parser = new Parser(problemReporter, false); - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 3c24925..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -remove-javacore.diff -fix-readmanager-npe.diff -- 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
