Pretty big revamp of the build script system. Downloading dependencies is now done automatically by this script, which also means that e.g. lombok-patcher.jar no longer needs to be checked in.

9 files changed, 606 insertions, 79 deletions

diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml
index 075bc394..b5aa990f 100644
--- a/buildScripts/compile.ant.xml
+++ b/buildScripts/compile.ant.xml
@@ -20,8 +20,10 @@
   THE SOFTWARE.
 -->
 <project name="lombok-compile" basedir=".." default="dist">
-	<description>This buildfile is part of projectlombok.org. It responsible for compiling the main
-lombok code including the various agents.</description>
+	<description>
+This buildfile is part of projectlombok.org. It responsible for compiling the main
+lombok code including the various agents.
+	</description>
 	<property name="build.compiler" value="javac1.6" />
 	
 	<target name="version" unless="lombok.version">
diff --git a/buildScripts/deps.ant.xml b/buildScripts/deps.ant.xml
index b9d447f8..f3a07ec8 100644
--- a/buildScripts/deps.ant.xml
+++ b/buildScripts/deps.ant.xml
@@ -19,33 +19,33 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 -->
-<project name="lombok-deps" basedir=".." default="buildDeps">
-	<description>This buildfile is part of projectlombok.org. It responsible for finding, downloading,
-and building dependencies.</description>
+<project name="lombok-deps" basedir=".." default="install">
+	<description>
+This buildfile is part of projectlombok.org. It responsible for finding, downloading,
+and building dependencies.
+	</description>
 	
-	<property name="lombok.patcher.dir" location="../lombok.patcher" />
-	<available file="${lombok.patcher.dir}/build.xml" property="lombok.patcher.available" />
-	
-	<target name="buildDeps" description="Builds dependencies" depends="build-lombok.patcher" />
+	<target name="install" description="Gets all dependencies, including optional ones, interactively (asks you)">
+		<subant target="install">
+			<fileset dir="buildScripts/deps" includes="*.ant.xml" />
+		</subant>
+	</target>
 	
-	<target name="-warn-lombok.patcher" unless="lombok.patcher.available">
-		<echo>Skipping lombok.patcher. clone from: http://github.com/rzwitserloot/lombok.patcher</echo>
+	<target name="install-silent" description="Gets all dependencies, including optional ones, assuming you want everything.">
+		<subant target="install-silent">
+			<fileset dir="buildScripts/deps" includes="*.ant.xml" />
+		</subant>
 	</target>
 	
-	<target name="-check-lombok.patcher" depends="-warn-lombok.patcher" if="lombok.patcher.available">
-		<ant dir="${lombok.patcher.dir}" target="dist" inheritAll="false" />
-		<condition property="lombok.patcher.replace">
-			<or>
-				<not><available file="lib/lombok/lombok-patcher.jar" /></not>
-				<not><uptodate
-						srcfile="${lombok.patcher.dir}/dist/lombok-patcher.jar"
-						targetfile="lib/lombok/lombok-patcher.jar" /></not>
-			</or>
-		</condition>
+	<target name="update" description="Updates without interaction those deps you already have.">
+		<subant target="update">
+			<fileset dir="buildScripts/deps" includes="*.ant.xml" />
+		</subant>
 	</target>
 	
-	<target name="build-lombok.patcher" depends="-check-lombok.patcher" if="lombok.patcher.replace">
-		<copy file="${lombok.patcher.dir}/dist/lombok-patcher.jar" todir="lib/lombok" />
-		<echo level="info">** UPDATED: lib/lombok/lombok-patcher.jar</echo>
+	<target name="build" description="Builds all dependencies for which you've installed the source version.">
+		<subant target="build">
+			<fileset dir="buildScripts/deps" includes="*.ant.xml" />
+		</subant>
 	</target>
 </project>
diff --git a/buildScripts/deps/eclipse-debug-target.template b/buildScripts/deps/eclipse-debug-target.template
new file mode 100644
index 00000000..99e4237c
--- /dev/null
+++ b/buildScripts/deps/eclipse-debug-target.template
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="false"/>
+<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearwslog" value="true"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Lombokized DebugEclipse"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${project_loc:lombok}/debug/workspace"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;lombok.patcher&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m @START_ON_FIRST_THREAD@ -Dorg.eclipse.swt.internal.carbon.smallFonts -javaagent:${project_loc:lombok}/dist/lombok.jar -Xbootclasspath/a:${project_loc:lombok}/dist/lombok.jar -Dlombok.patcher.patchDebugDir=${project_loc:lombok}/debug/patchedClasses"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+<booleanAttribute key="usefeatures" value="false"/>
+</launchConfiguration>
diff --git a/buildScripts/deps/eclipse-debugging.ant.xml b/buildScripts/deps/eclipse-debugging.ant.xml
new file mode 100644
index 00000000..16b4361c
--- /dev/null
+++ b/buildScripts/deps/eclipse-debugging.ant.xml
@@ -0,0 +1,253 @@
+<!--
+  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
+  
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+-->
+<project name="lombok-deps-lombok-patcher" basedir="../.." default="install">
+	<description>
+This buildfile is part of projectlombok.org. It responsible for downloading, updating, and setting up the eclipse modules that are useful to have when working on lombok's eclipse integration. It's optional.
+	</description>
+	
+	<property name="repository.eclipse.org-eclipse" value=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse" />
+	<property name="repository.eclipse.org-rt" value=":pserver:anonymous@dev.eclipse.org/cvsroot/rt" />
+	<property name="eclipse.org.contrib.base" location=".." />
+	
+	<target name="install-silent" depends="-check-eclipse.org,
+		-force-eclipse.debug.target, install-eclipse.debug.target, update-eclipse.debug.target,
+		-force-org.eclipse.jdt.core, checkout-org.eclipse.jdt.core, update-org.eclipse.jdt.core,
+		-force-org.eclipse.jdt.ui, checkout-org.eclipse.jdt.ui, update-org.eclipse.jdt.ui,
+		-force-org.eclipse.core.runtime, checkout-org.eclipse.core.runtime, update-org.eclipse.core.runtime,
+		-force-org.eclipse.ltk.core.refactoring, checkout-org.eclipse.ltk.core.refactoring,  update-org.eclipse.ltk.core.refactoring,
+		-force-org.eclipse.equinox, checkout-org.eclipse.equinox, update-org.eclipse.equinox" />
+	
+	<target name="install" depends="-check-eclipse.org,
+		-ask-eclipse.debug.target, install-eclipse.debug.target, update-eclipse.debug.target,
+		-ask-org.eclipse.jdt.core, checkout-org.eclipse.jdt.core, update-org.eclipse.jdt.core,
+		-ask-org.eclipse.jdt.ui, checkout-org.eclipse.jdt.ui, update-org.eclipse.jdt.ui,
+		-ask-org.eclipse.core.runtime, checkout-org.eclipse.core.runtime, update-org.eclipse.core.runtime,
+		-ask-org.eclipse.ltk.core.refactoring, checkout-org.eclipse.ltk.core.refactoring,  update-org.eclipse.ltk.core.refactoring,
+		-ask-org.eclipse.equinox, checkout-org.eclipse.equinox, update-org.eclipse.equinox" />
+	
+	<target name="-force-eclipse.debug.target" unless="eclipse.debug.target.available">
+		<property name="eclipse.debug.target.create" value="true" />
+	</target>
+	
+	<target name="-ask-eclipse.debug.target" unless="eclipse.debug.target.available">
+		<input validargs="n,N,no,No,NO,y,Y,yes,Yes,YES" defaultvalue="no" addproperty="eclipse.debug.target.response">
+Do you want me to create an eclipse debug target so you can launch a second eclipse, lombok-ized, in the eclipse debugger?
+		</input>
+		<condition property="eclipse.debug.target.create">
+			<matches string="${eclipse.debug.target.response}" casesensitive="false" pattern="^y(es)?$" />
+		</condition>
+	</target>
+	
+	<target name="-force-org.eclipse.jdt.core" unless="org.eclipse.jdt.core.available">
+		<property name="org.eclipse.jdt.core.checkout" value="true" />
+	</target>
+	
+	<target name="-ask-org.eclipse.jdt.core" unless="org.eclipse.jdt.core.available">
+		<input validargs="n,N,no,No,NO,y,Y,yes,Yes,YES" defaultvalue="no" addproperty="org.eclipse.jdt.core.response">
+Do you want me to grab from CVS the 3.5 version of org.eclipse.jdt.core?
+Lombok integrates with this eclipse module often, and you should grab it if you're going to work on lombok's eclipse integration.</input>
+		<condition property="org.eclipse.jdt.core.checkout">
+			<matches string="${org.eclipse.jdt.core.response}" casesensitive="false" pattern="^y(es)?$" />
+		</condition>
+	</target>
+	
+	<target name="-force-org.eclipse.jdt.ui" unless="org.eclipse.jdt.ui.available">
+		<property name="org.eclipse.jdt.ui.checkout" value="true" />
+	</target>
+	
+	<target name="-ask-org.eclipse.jdt.ui" unless="org.eclipse.jdt.ui.available">
+		<input validargs="n,N,no,No,NO,y,Y,yes,Yes,YES" defaultvalue="no" addproperty="org.eclipse.jdt.ui.response">
+Do you want me to grab from CVS the 3.5 version of org.eclipse.jdt.ui?
+Lombok integrates with this eclipse module often, and you should grab it if you're going to work on lombok's eclipse integration.</input>
+		<condition property="org.eclipse.jdt.ui.checkout">
+			<matches string="${org.eclipse.jdt.ui.response}" casesensitive="false" pattern="^y(es)?$" />
+		</condition>
+	</target>
+	
+	<target name="-force-org.eclipse.core.runtime" unless="org.eclipse.core.runtime.available">
+		<property name="org.eclipse.core.runtime.checkout" value="true" />
+	</target>
+	
+	<target name="-ask-org.eclipse.core.runtime" unless="org.eclipse.core.runtime.available">
+		<input validargs="n,N,no,No,NO,y,Y,yes,Yes,YES" defaultvalue="no" addproperty="org.eclipse.core.runtime.response">
+Do you want me to grab from CVS the 3.5 version of org.eclipse.core.runtime?
+Interacting with the filer and messager (for errors and warnings) requires core.runtime, as well as interacting with modules.
+You may not need it unless you're going to work on those areas.
+		</input>
+		<condition property="org.eclipse.core.runtime.checkout">
+			<matches string="${org.eclipse.core.runtime.response}" casesensitive="false" pattern="^y(es)?$" />
+		</condition>
+	</target>
+	
+	<target name="-force-org.eclipse.ltk.core.refactoring" unless="org.eclipse.ltk.core.refactoring.available">
+		<property name="org.eclipse.ltk.core.refactoring.checkout" value="true" />
+	</target>
+	
+	<target name="-ask-org.eclipse.ltk.core.refactoring" unless="org.eclipse.ltk.core.refactoring.available">
+		<input validargs="n,N,no,No,NO,y,Y,yes,Yes,YES" defaultvalue="no" addproperty="org.eclipse.ltk.core.refactoring.response">
+Do you want me to grab from CVS the 3.5 version of org.eclipse.ltk.core.refactoring?
+Unless you're going to work with lombok's patching of the refactor scripts, you won't need it.
+		</input>
+		<condition property="org.eclipse.ltk.core.refactoring.checkout">
+			<matches string="${org.eclipse.ltk.core.refactoring.response}" casesensitive="false" pattern="^y(es)?$" />
+		</condition>
+	</target>
+	
+	<target name="-force-org.eclipse.equinox" unless="org.eclipse.equinox.available">
+		<property name="org.eclipse.equinox.checkout" value="true" />
+	</target>
+	
+	<target name="-ask-org.eclipse.equinox" unless="org.eclipse.equinox.available">
+		<input validargs="n,N,no,No,NO,y,Y,yes,Yes,YES" defaultvalue="no" addproperty="org.eclipse.equinox.response">
+Do you want me to grab from CVS the 3.5 version of org.eclipse.equinox?
+Unless you're going to work on lombok.patcher's OSGi integration, you won't need this.
+		</input>
+		<condition property="org.eclipse.equinox.checkout">
+			<matches string="${org.eclipse.equinox.response}" casesensitive="false" pattern="^y(es)?$" />
+		</condition>
+	</target>
+
+	<target name="update" depends="-check-eclipse.org,
+		update-eclipse.debug.target,
+		update-org.eclipse.jdt.core,
+		update-org.eclipse.jdt.ui,
+		update-org.eclipse.core.runtime,
+		update-org.eclipse.ltk.core.refactoring,
+		update-org.eclipse.equinox" />
+	
+	<target name="build" />
+	
+	<target name="checkout-org.eclipse.jdt.core" if="org.eclipse.jdt.core.checkout">
+		<cvs
+				cvsRoot="${repository.eclipse.org-eclipse}"
+				dest="${eclipse.org.contrib.base}"
+				package="org.eclipse.jdt.core"
+				tag="TR3_5_Maintenance"
+				failonerror="true" />
+		<echo level="info">eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace.</echo>
+	</target>
+	
+	<target name="update-org.eclipse.jdt.core" if="org.eclipse.jdt.core.available">
+		<cvs command="update" dest="${eclipse.org.contrib.base}/org.eclipse.jdt.core" />
+	</target>
+	
+	<target name="checkout-org.eclipse.jdt.ui" if="org.eclipse.jdt.ui.checkout">
+		<cvs
+				cvsRoot="${repository.eclipse.org-eclipse}"
+				dest="${eclipse.org.contrib.base}"
+				package="org.eclipse.jdt.ui"
+				tag="TR3_5_Maintenance"
+				failonerror="true" />
+		<echo level="info">eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace.</echo>
+	</target>
+	
+	<target name="update-org.eclipse.jdt.ui" if="org.eclipse.jdt.ui.available">
+		<cvs command="update" dest="${eclipse.org.contrib.base}/org.eclipse.jdt.ui" />
+	</target>
+	
+	<target name="checkout-org.eclipse.core.runtime" if="org.eclipse.core.runtime.checkout">
+		<cvs
+				cvsRoot="${repository.eclipse.org-eclipse}"
+				dest="${eclipse.org.contrib.base}"
+				package="org.eclipse.core.runtime"
+				tag="R3_5_1"
+				failonerror="true" />
+		<echo level="info">eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace.</echo>
+	</target>
+	
+	<target name="update-org.eclipse.core.runtime" if="org.eclipse.core.runtime.available">
+		<cvs command="update" dest="${eclipse.org.contrib.base}/org.eclipse.core.runtime" />
+	</target>
+	
+	<target name="checkout-org.eclipse.ltk.core.refactoring" if="org.eclipse.ltk.core.refactoring.checkout">
+		<cvs
+				cvsRoot="${repository.eclipse.org-eclipse}"
+				dest="${eclipse.org.contrib.base}"
+				package="org.eclipse.ltk.core.refactoring"
+				tag="NR3_5_1"
+				failonerror="true" />
+		<echo level="info">eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace.</echo>
+	</target>
+	
+	<target name="update-org.eclipse.ltk.core.refactoring" if="org.eclipse.ltk.core.refactoring.available">
+		<cvs command="update" dest="${eclipse.org.contrib.base}/org.eclipse.ltk.core.refactoring" />
+	</target>
+	
+	<target name="checkout-org.eclipse.equinox" if="org.eclipse.equinox.checkout">
+		<cvs
+				cvsRoot="${repository.eclipse.org-rt}"
+				dest="${eclipse.org.contrib.base}"
+				package="org.eclipse.equinox"
+				failonerror="true" />
+		<echo level="info">eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace.</echo>
+	</target>
+	
+	<target name="update-org.eclipse.equinox" if="org.eclipse.equinox.available">
+		<cvs command="update" dest="${eclipse.org.contrib.base}/org.eclipse.equinox" />
+	</target>
+	
+	<target name="install-eclipse.debug.target" if="eclipse.debug.target.create">
+		<antcall target="-create-eclipse.debug.target" />
+		<echo level="info">
+		---------------------------
+
+		Launch target configured; it should show up in your eclipse under the debug menu as "LombokizedEclipse".
+		It does NOT hot-code-replace on lombok itself - you'll need to run 'ant dist' every time you want to use it. This is an unavoidable shortcoming of java agents. You can, however, breakpoint and step through your eclipse this way.
+
+		---------------------------
+		</echo>
+	</target>
+	
+	<target name="update-eclipse.debug.target" if="eclipse.debug.target.available">
+		<antcall target="-create-eclipse.debug.target" />
+	</target>
+	
+	<target name="detect-mac">
+		<condition property="startOnFirstThread" value="-XstartOnFirstThread">
+			<os family="mac" />
+		</condition>
+		<condition property="startOnFirstThread" value="">
+			<not><os family="mac" /></not>
+		</condition>
+	</target>
+	
+	<target name="-create-eclipse.debug.target" depends="detect-mac">
+		<copy
+				file="buildScripts/deps/eclipse-debug-target.template"
+				tofile="LombokizedEclipse.launch"
+				preservelastmodified="true"
+				overwrite="true">
+			<filterset>
+				<filter token="START_ON_FIRST_THREAD" value="${startOnFirstThread}" />
+			</filterset>
+		</copy>
+	</target>
+	
+	<target name="-check-eclipse.org">
+		<available file="${eclipse.org.contrib.base}/org.eclipse.jdt.core/.project" property="org.eclipse.jdt.core.available" />
+		<available file="${eclipse.org.contrib.base}/org.eclipse.jdt.ui/.project" property="org.eclipse.jdt.ui.available" />
+		<available file="${eclipse.org.contrib.base}/org.eclipse.core.runtime/.project" property="org.eclipse.core.runtime.available" />
+		<available file="${eclipse.org.contrib.base}/org.eclipse.ltk.core.refactoring/.project" property="org.eclipse.ltk.core.refactoring.available" />
+		<available file="${eclipse.org.contrib.base}/org.eclipse.equinox/.project" property="org.eclipse.equinox.available" />
+		<available file="LombokizedEclipse.launch" property="eclipse.debug.target.available" />
+	</target>
+</project>
diff --git a/buildScripts/deps/lombok-patcher.ant.xml b/buildScripts/deps/lombok-patcher.ant.xml
new file mode 100644
index 00000000..c0dfbf77
--- /dev/null
+++ b/buildScripts/deps/lombok-patcher.ant.xml
@@ -0,0 +1,158 @@
+<!--
+  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
+  
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+-->
+<project name="lombok-deps-lombok-patcher" basedir="../.." default="install">
+	<description>
+This buildfile is part of projectlombok.org. It responsible for finding, downloading, and updating the lombok.patcher dependency.
+	</description>
+	<import file="../git.ant.xml" />
+	
+	<property name="lombok.patcher.giturl" value="git://github.com/rzwitserloot/lombok.patcher.git" />
+	<property name="lombok.patcher.dir" location="../lombok.patcher" />
+	<property name="lombok.patcher.fileurl" value="http://projectlombok.org/downloads/lombok-patcher.jar" />
+	<property name="lombok.patcher.fileloc" location="lib/lombok/lombok-patcher.jar" />
+	
+	<target name="install-silent" depends="-check-lombok.patcher, -update-git-lombok.patcher, -update-file-lombok.patcher">
+		<condition property="lombok.patcher.git.grab">
+			<not><isset property="lombok.patcher.available.git" /></not>
+		</condition>
+		<antcall target="-grab-git-lombok.patcher" />
+		<antcall target="-update-git-lombok.patcher" />
+	</target>
+	
+	<target name="install" depends="-check-lombok.patcher, -missing1-lombok.patcher, -missing2-lombok.patcher, -update-git-lombok.patcher" />
+	
+	<target name="update" depends="-check-lombok.patcher, -warn-lombok.patcher, -update-git-lombok.patcher, -check-replace-lombok.patcher, -replace-lombok.patcher">
+		<condition property="lombok.patcher.file.update">
+			<and>
+				<isset property="lombok.patcher.available.file" />
+				<not><isset property="lombok.patcher.available.git" /></not>
+			</and>
+		</condition>
+		<antcall target="-update-file-lombok.patcher" />
+	</target>
+	
+	<target name="build" depends="-check-lombok.patcher, -warn-lombok.patcher, -check-replace-lombok.patcher, -replace-lombok.patcher" />
+	
+	<target name="-warn-lombok.patcher" unless="lombok.patcher.available">
+		<fail>You don't have any version of lombok-patcher.jar installed. Run 'ant installDeps' to fix this.</fail>
+	</target>
+	
+	<target name="-check-replace-lombok.patcher" if="lombok.patcher.checkreplace.git">
+		<ant dir="${lombok.patcher.dir}" target="dist" inheritAll="false" />
+		
+		<condition property="lombok.patcher.replace">
+			<or>
+				<not><available file="${lombok.patcher.fileloc}" /></not>
+				<not><uptodate
+						srcfile="${lombok.patcher.dir}/dist/lombok-patcher.jar"
+						targetfile="${lombok.patcher.fileloc}" /></not>
+			</or>
+		</condition>
+	</target>
+	
+	<target name="-replace-lombok.patcher" if="lombok.patcher.replace">
+		<copy file="${lombok.patcher.dir}/dist/lombok-patcher.jar" tofile="${lombok.patcher.fileloc}" />
+		<echo level="info">** UPDATED: ${lombok.patcher.fileloc}</echo>
+	</target>
+	
+	<target name="-check-lombok.patcher">
+		<available file="${lombok.patcher.dir}/.project" property="lombok.patcher.available.git" />
+		<available file="${lombok.patcher.fileloc}" property="lombok.patcher.available.file" />
+		<condition property="lombok.patcher.available">
+			<or>
+				<isset property="lombok.patcher.available.git" />
+				<isset property="lombok.patcher.available.file" />
+			</or>
+		</condition>
+		<condition property="lombok.patcher.skip.missing2">
+			<isset property="lombok.patcher.available.git" />
+		</condition>
+		<condition property="lombok.patcher.checkreplace.git">
+			<isset property="lombok.patcher.available.git" />
+		</condition>
+	</target>
+	
+	<target name="-missing1-lombok.patcher" unless="lombok.patcher.available">
+		<property name="lombok.patcher.skip.missing2" value="true" />
+		<input validArgs="s,S,skip,Skip,SKIP,g,G,get,Get,GET,d,D,download,Download,DOWNLOAD" addproperty="missing1.feedback">
+You don't have the lombok.patcher dependency. I can grab the lombok.patcher project form version control. If you want me to do so, I will put the project in a sibling directory next to your 'lombok' project directory. Otherwise, I can grab a copy from the internet, though it won't be as up-to-date, and may thus be insufficient to run the very latest lombok.
+		Pick one (first letter will do):
+		Skip     - Skips this download. This dependency is not optional, so your lombok won't compile.
+		Get      - Grabs the latest version of lombok.patcher from source control.
+		Download - Downloads the latest version from the internet, and will not be as up to date as 'get'.
+		</input>
+		<condition property="lombok.patcher.git.grab">
+			<matches string="${missing1.feedback}" casesensitive="false" pattern="^g(et)?$" />
+		</condition>
+		<condition property="lombok.patcher.file.grab">
+			<matches string="${missing1.feedback}" casesensitive="false" pattern="^d(ownload)?$" />
+		</condition>
+		<antcall target="-grab-git-lombok.patcher" />
+		<antcall target="-grab-file-lombok.patcher" />
+	</target>
+	
+	<target name="-missing2-lombok.patcher" unless="lombok.patcher.skip.missing2">
+		<input validArgs="s,S,skip,Skip,SKIP,g,G,get,Get,GET" defaultvalue="s" addproperty="missing2.feedback">
+You only have the lombok.patcher dependency as a downloaded file, which won't be as cutting edge as grabbing it from version control. Do you want to grab lombok.patcher from source control? I will put the project in a sibling directory next to your 'lombok' directory.
+		Pick one (first letter will do):
+		Skip  - Skips this download, and continues to rely on the occasionally updated web version.
+		Get   - Grabs the latest version of lombok.patcher from source control. Lombok will start using this instead.
+		</input>
+		<condition property="lombok.patcher.git.grab">
+			<matches string="${missing2.feedback}" casesensitive="false" pattern="^g(et)?$" />
+		</condition>
+		<condition property="lombok.patcher.file.update">
+			<matches string="${missing2.feedback}" casesensitive="false" pattern="^s(kip)?$" />
+		</condition>
+		<antcall target="-grab-git-lombok.patcher" />
+		<antcall target="-update-file-lombok.patcher" />
+	</target>
+	
+	<target name="-grab-git-lombok.patcher" if="lombok.patcher.git.grab">
+		<echo level="info">Cloning ${lombok.patcher.giturl} into ${lombok.patcher.dir}</echo>
+		<git-clone repository="${lombok.patcher.giturl}" dest="${lombok.patcher.dir}" />
+		<echo level="info">
+Done! lombok-patcher.jar will now be resolved from this cloned repository.
+You may want to import this project into your eclipse workspace as well.
+		</echo>
+		<property name="lombok.patcher.checkreplace.git" value="true" />
+	</target>
+	
+	<target name="-update-git-lombok.patcher" if="lombok.patcher.available.git">
+		<echo level="info">Updating existing git repository of lombok.patcher...</echo>
+		<git-pull gitdir="${lombok.patcher.dir}" />
+	</target>
+	
+	<target name="-grab-file-lombok.patcher" if="lombok.patcher.file.grab">
+		<echo level="info">Downloading lombok-patcher.jar from the internet...</echo>
+		<antcall target="-download-file-lombok.patcher" />
+	</target>
+	
+	<target name="-update-file-lombok.patcher" if="lombok.patcher.file.update">
+		<echo level="info">Updating existing lombok-patcher.jar from the internet...</echo>
+		<antcall target="-download-file-lombok.patcher" />
+	</target>
+	
+	<target name="-download-file-lombok.patcher">
+		<get src="${lombok.patcher.fileurl}" dest="${lombok.patcher.fileloc}" verbose="true" usetimestamp="true" />
+	</target>
+</project>
diff --git a/buildScripts/git.ant.xml b/buildScripts/git.ant.xml
new file mode 100644
index 00000000..14d3e963
--- /dev/null
+++ b/buildScripts/git.ant.xml
@@ -0,0 +1,73 @@
+<!--
+  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
+  
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+  
+  Thanks, Thomas Robinson, for the basis and inspiration of this ant script.
+  See: http://tlrobinson.net/blog/2008/11/13/ant-tasks-for-git/
+-->
+<project name="git4ant" default="help">
+	<description>Useful macrodefs for using git from ant.</description>
+	<target name="help">
+		<fail message="This script just contains macrodefs for other scripts. It doesn't by itself do anything." />
+	</target>
+	
+	<macrodef name="git">
+		<attribute name="command" />
+		<attribute name="dir" default="" />
+		<element name="args" optional="true" />
+		<sequential>
+			<echo message="git @{command}" />
+			<exec executable="git" dir="@{dir}" resultproperty="git.oserror" failifexecutionfails="false" failonerror="true" searchpath="true">
+				<arg value="@{command}" />
+				<args />
+			</exec>
+			<condition property="git.notfound">
+				<not><equals arg1="0" arg2="${git.oserror}" /></not>
+			</condition>
+			<fail if="git.notfound">
+[GIT NOT FOUND]
+
+You don't appear to have git installed. If you're on windows, try running this in your git shell.
+Otherwise, install git. git is a free and open source version control system.
+You can download it from: http://git-scm.com/
+			</fail>
+		</sequential>
+	</macrodef>
+	
+	<macrodef name="git-clone">
+		<attribute name="repository" />
+		<attribute name="dest" />
+		<sequential>
+			<git command="clone">
+				<args>
+					<arg value="@{repository}" />
+					<arg value="@{dest}" />
+				</args>
+			</git>
+		</sequential>
+	</macrodef>
+	
+	<macrodef name="git-pull">
+		<attribute name="gitdir" default="." />
+		<sequential>
+			<git command="pull" dir="@{gitdir}" />
+		</sequential>
+	</macrodef>
+</project>
diff --git a/buildScripts/maven.ant.xml b/buildScripts/maven.ant.xml
index 783303f2..ff71b718 100644
--- a/buildScripts/maven.ant.xml
+++ b/buildScripts/maven.ant.xml
@@ -20,8 +20,10 @@
   THE SOFTWARE.
 -->
 <project name="lombok-maven" basedir=".." default="maven">
-		<description>This buildfile is part of projectlombok.org. It is responsible for creating and maintaining
-the maven repository that contains lombok's deliverables for those using maven.</description>
+	<description>
+This buildfile is part of projectlombok.org. It is responsible for creating and maintaining
+the maven repository that contains lombok's deliverables for those using maven.
+	</description>
 	<target name="version" unless="lombok.version">
 		<ant antfile="build.xml" target="version" inheritAll="false" />
 		<loadresource property="lombok.version">
diff --git a/buildScripts/publish.ant.xml b/buildScripts/publish.ant.xml
index 6c31b42b..973318e1 100644
--- a/buildScripts/publish.ant.xml
+++ b/buildScripts/publish.ant.xml
@@ -20,56 +20,60 @@
   THE SOFTWARE.
 -->
 <project name="lombok-publish" basedir=".." default="publish">
-		<description>This buildfile is part of projectlombok.org. It is responsible for turning the build results
-into the actual deliverable form, and uploading it to the distribution websites.</description>
-		<property name="credentialsFile" value="google.properties" />
-		
-		<target name="version" unless="lombok.version">
-			<ant antfile="build.xml" target="version" inheritAll="false" />
-			<loadresource property="lombok.version">
-				<file file="build/version.txt" />
-				<filterchain>
-					<striplinebreaks />
-				</filterchain>
-			</loadresource>
-		</target>
-		
-		<target name="dist" unless="lombok.dist.built" depends="version">
-			<ant antfile="buildScripts/compile.xml" target="dist" inheritAll="false">
-				<property name="lombok.version" value="${lombok.version}" />
-			</ant>
-		</target>
-		
-		<target name="-credentials">
-			<available property="hasCredentialsFile" file="${credentialsFile}"/>
-		</target>
-		
-		<target name="-checkCredentialsFile" depends="-credentials" unless="hasCredentialsFile">
-			<echo file="${credentialsFile}">#username=[your google account name without @gmail.com]
-#password=[your googlecode password, is NOT your gmail password]</echo>
-			<fail message="fill in ${credentialsFile} to provide your credentials"/>
-		</target>
-		
-		<target name="publish" description="Publishes the latest build to googlecode" depends="version, -checkCredentialsFile, dist">
-			<taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask" classpath="deps/website/ant-googlecode-0.0.2.jar" name="gcupload"/>
-			<property file="${credentialsFile}" prefix="google" />
-			<gcupload 
-					username="${google.username}"
-					password="${google.password}"
-					projectname="projectlombok"
-					filename="dist/lombok.jar"
-					targetfilename="lombok-${lombok.version}.jar"
-					summary="Version ${lombok.version}"
-					labels=""
-					verbose="true" />
-			<gcupload 
-					username="${google.username}"
-					password="${google.password}" 
-					projectname="projectlombok" 
-					filename="dist/lombok.jar" 
-					targetfilename="lombok.jar"
-					summary="Version ${lombok.version} - The everything jar - doubleclick it to install, or just include it in your projects."
-					labels="Featured" 
-					verbose="true" />
-		</target>
+	<description>
+This buildfile is part of projectlombok.org. It is responsible for turning the build results
+into the actual deliverable form, and uploading it to the distribution websites.
+	</description>
+	<property name="credentialsFile" value="google.properties" />
+	
+	<target name="version" unless="lombok.version">
+		<ant antfile="build.xml" target="version" inheritAll="false" />
+		<loadresource property="lombok.version">
+			<file file="build/version.txt" />
+			<filterchain>
+				<striplinebreaks />
+			</filterchain>
+		</loadresource>
+	</target>
+	
+	<target name="dist" unless="lombok.dist.built" depends="version">
+		<ant antfile="buildScripts/compile.xml" target="dist" inheritAll="false">
+			<property name="lombok.version" value="${lombok.version}" />
+		</ant>
+	</target>
+	
+	<target name="-credentials">
+		<available property="hasCredentialsFile" file="${credentialsFile}"/>
+	</target>
+	
+	<target name="-checkCredentialsFile" depends="-credentials" unless="hasCredentialsFile">
+		<echo file="${credentialsFile}">
+#username=[your google account name without @gmail.com]
+#password=[your googlecode password, is NOT your gmail password]
+		</echo>
+		<fail message="fill in ${credentialsFile} to provide your credentials" />
+	</target>
+	
+	<target name="publish" description="Publishes the latest build to googlecode" depends="version, -checkCredentialsFile, dist">
+		<taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask" classpath="deps/website/ant-googlecode-0.0.2.jar" name="gcupload" />
+		<property file="${credentialsFile}" prefix="google" />
+		<gcupload 
+				username="${google.username}"
+				password="${google.password}"
+				projectname="projectlombok"
+				filename="dist/lombok.jar"
+				targetfilename="lombok-${lombok.version}.jar"
+				summary="Version ${lombok.version}"
+				labels=""
+				verbose="true" />
+		<gcupload 
+				username="${google.username}"
+				password="${google.password}" 
+				projectname="projectlombok" 
+				filename="dist/lombok.jar" 
+				targetfilename="lombok.jar"
+				summary="Version ${lombok.version} - The everything jar - doubleclick it to install, or just include it in your projects."
+				labels="Featured" 
+				verbose="true" />
+	</target>
 </project>
diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index d4b0605d..3ce45032 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -22,7 +22,8 @@
 <project name="lombok-website" basedir=".." default="website">
 	<description>
 This buildfile is part of projectlombok.org. It is responsible for building the website and all website-related aspects,
-such as converting the changelog into HTML, and creating javadoc.</description>
+such as converting the changelog into HTML, and creating javadoc.
+	</description>
 	<property name="SNIPPET_TAB_STOP" value="2" />
 	
 	<target name="-website-clean">