From 9e0da7aa877afb5863b1b5c517d540e5b33a2d7c Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Mon, 10 Jan 2011 22:15:07 +0100
Subject: In javac7 the BaseFileObject and JavacFileManager have been moved
 from com/sun/tools/javac/util to com/sun/tools/javac/file

---
 build.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index e65b13d6..0581ebcf 100644
--- a/build.xml
+++ b/build.xml
@@ -147,8 +147,10 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<classpath refid="build.path" />
 		</ivy:compile>
 		<ivy:compile destdir="build/lombok" source="1.6" target="1.6" includeantruntime="false">
+			<src path="src/contrib" />
 			<src path="src/core" />
 			<src path="src/delombok" />
+			<include name="com/sun/**" />
 			<include name="lombok/javac/**" />
 			<include name="lombok/delombok/**" />
 			<classpath location="build/lombok" />
@@ -163,7 +165,9 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		<mkdir dir="dist" />
 		<copy file="doc/changelog.markdown" tofile="build/changelog.txt" />
 		<jar destfile="dist/lombok-${lombok.version}.jar">
-			<fileset dir="build/lombok" />
+			<fileset dir="build/lombok">
+				<exclude name="com/sun/**"/>
+			</fileset>
 			<fileset dir="build" includes="changelog.txt" />
 			<fileset dir="." includes="LICENSE" />
 			<manifest>
@@ -187,6 +191,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 				<srcdir dir="src/eclipseAgent" />
 				<srcdir dir="src/installer" />
 				<srcdir dir="src/delombok" />
+				<srcdir dir="src/contrib" />
 				<srcdir dir="experimental/src" />
 				<srcdir dir="test/transform/src" test="true" />
 				<srcdir dir="test/core/src" test="true" />
@@ -205,6 +210,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<srcdir dir="src/eclipseAgent" />
 			<srcdir dir="src/installer" />
 			<srcdir dir="src/delombok" />
+			<srcdir dir="src/contrib" />
 			<srcdir dir="experimental/src" />
 			<srcdir dir="test/transform/src" />
 			<srcdir dir="test/core/src" />
-- 
cgit