From e56d83869134d6eb679d06cd0f334dc51396bea8 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@tipit.to>
Date: Sat, 17 Oct 2009 13:20:24 +0200
Subject: Fixes to the buildScripts, and disableCheckedExceptions now works.

---
 buildScripts/compile.ant.xml | 4 ++--
 buildScripts/website.ant.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'buildScripts')

diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml
index b5aa990f..2207fec2 100644
--- a/buildScripts/compile.ant.xml
+++ b/buildScripts/compile.ant.xml
@@ -62,14 +62,14 @@ lombok code including the various agents.
 		     javac 1.5, partly because they completely rewrote large swaths of javac,
 		     and partly because our injection mechanism (annotations) doesn't work very
 		     well on javac 1.5, hence, when using javac, we do demand you're on 1.6. -->
-		<javac debug="on" destdir="build/lombok" target="1.5">
+		<javac includeDestClasses="false" debug="on" destdir="build/lombok" target="1.5">
 			<src path="src" />
 			<src path="src_eclipseagent" />
 			<exclude name="lombok/javac/**" />
 			<classpath refid="deps.path" />
 			<classpath refid="libs.path" />
 		</javac>
-		<javac srcdir="src" debug="on" destdir="build/lombok" target="1.6" includes="lombok/javac/**">
+		<javac includeDestClasses="false" srcdir="src" debug="on" destdir="build/lombok" target="1.6" includes="lombok/javac/**">
 			<classpath refid="deps.path" />
 			<classpath refid="libs.path" />
 		</javac>
diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index f384deca..c8bdf2c2 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -63,12 +63,12 @@ such as converting the changelog into HTML, and creating javadoc.
 	
 	<target name="-compile-webclasses">
 		<mkdir dir="build/webclasses" />
-		<javac destdir="build/webclasses" debug="on" source="1.4" target="1.4">
+		<javac includeDestClasses="false" destdir="build/webclasses" debug="on" source="1.4" target="1.4">
 			<classpath refid="buildScripts.deps.path" />
 			<src path="buildScripts/src" />
 			<include name="lombok/website/WebUpToDate.java" />
 		</javac>
-		<javac destdir="build/webclasses" debug="on" source="1.5">
+		<javac includeDestClasses="false" destdir="build/webclasses" debug="on" source="1.5">
 			<classpath refid="buildScripts.deps.path" />
 			<src path="buildScripts/src" />
 			<include name="lombok/website/CompileChangelog.java" />
@@ -94,7 +94,7 @@ such as converting the changelog into HTML, and creating javadoc.
 	</target>
 	
 	<target name="-website-main" depends="-website-clean, version, javadoc, changelogToHtml">
-		<taskdef classpath="deps/website/java2html.jar" name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" />
+		<taskdef classpath="deps/buildScripts/java2html.jar" name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" />
 		<mkdir dir="build/website" />
 		<copy todir="build/website">
 			<fileset dir="website">
-- 
cgit