[lombok] 04/05: exclude classes that require lombok.patcher, its not packaged

[Hans-Christoph Steiner]

This is an automated email from the git hooks/post-receive script.

eighthave pushed a commit to branch master
in repository lombok.

commit 3e0db1d064a50229cb4d0db1bfcd1c18e0149668
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Tue Dec 29 10:25:04 2015 +0100

    exclude classes that require lombok.patcher, its not packaged
---
 ...clude_classes_that_require_lombok_patcher.patch | 59 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 60 insertions(+)

diff --git a/debian/patches/exclude_classes_that_require_lombok_patcher.patch b/debian/patches/exclude_classes_that_require_lombok_patcher.patch
new file mode 100644
index 0000000..3855562
--- /dev/null
+++ b/debian/patches/exclude_classes_that_require_lombok_patcher.patch
@@ -0,0 +1,59 @@
+--- a/build.xml
++++ b/build.xml
+@@ -219,12 +219,21 @@
+ 
+ 		<ivy:compile destdir="build/lombok" source="1.5" target="1.5" includeantruntime="false">
+ 			<compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" />
++			<compilerarg value="-implicit:none"/>
+ 			<src path="src/launch" />
+ 			<src path="src/core" />
+-			<src path="src/installer" />
+ 			<src path="src/eclipseAgent" />
+ 			<exclude name="lombok/javac/**" />
+ 			<exclude name="**/*Transplants.java" />
++			<exclude name="lombok/bytecode/AsmUtil.java" />
++			<exclude name="lombok/bytecode/PreventNullAnalysisRemover.java" />
++			<exclude name="lombok/bytecode/SneakyThrowsRemover.java" />
++			<exclude name="lombok/core/AnnotationProcessor.java" />
++			<exclude name="lombok/core/PublicApiCreatorApp.java" />
++			<exclude name="lombok/installer/IdeLocation.java" />
++			<exclude name="lombok/installer/Installer.java" />
++			<exclude name="lombok/eclipse/agent/EclipsePatcher.java" />
++			<exclude name="lombok/eclipse/agent/EclipseLoaderPatcher.java" />
+ 			<classpath location="build/lombok" />
+ 			<classpath refid="build.path" />
+ 		</ivy:compile>
+@@ -239,10 +248,13 @@
+ 		
+ 		<ivy:compile destdir="build/lombok" source="1.6" target="1.6" includeantruntime="false">
+ 			<compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" />
++			<compilerarg value="-implicit:none"/>
+ 			<src path="src/core" />
+ 			<src path="src/delombok" />
+ 			<include name="lombok/javac/**" />
+-			<include name="lombok/delombok/**" />
++<!-- the missing classes require lombok.patcher, which is not yet packaged -->
++			<include name="lombok/delombok/FormatPreferences.java" />
++			<include name="lombok/delombok/LombokOptionsFactory.java" />
+ 			<classpath location="build/lombok" />
+ 			<classpath refid="build.path" />
+ 		</ivy:compile>
+--- a/src/core/lombok/eclipse/TransformEclipseAST.java
++++ b/src/core/lombok/eclipse/TransformEclipseAST.java
+@@ -27,7 +27,6 @@
+ 
+ import lombok.core.debug.DebugSnapshotStore;
+ import lombok.core.debug.HistogramTracker;
+-import lombok.patcher.Symbols;
+ 
+ import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;
+ import org.eclipse.jdt.internal.compiler.ast.Annotation;
+@@ -139,8 +138,6 @@
+ 	public static void transform(Parser parser, CompilationUnitDeclaration ast) {
+ 		if (disableLombok) return;
+ 		
+-		if (Symbols.hasSymbol("lombok.disable")) return;
+-		
+ 		// Do NOT abort if (ast.bits & ASTNode.HasAllMethodBodies) != 0 - that doesn't work.
+ 		
+ 		try {
diff --git a/debian/patches/series b/debian/patches/series
index 75aafab..cadb832 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 remove_dependency_on_ensure-ipp.patch
 add_maven_repo.patch
 include_jars_from_debian_in_build_path.patch
+exclude_classes_that_require_lombok_patcher.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lombok.git