From 88e95158f0958beb5804aab07ee0022b038d2847 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Thu, 22 Mar 2012 16:55:33 +0100
Subject: Expanded on android+maven+eclipse instructions.

---
 website/setup/android.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/website/setup/android.html b/website/setup/android.html
index bbcc9c66..0eb5853e 100644
--- a/website/setup/android.html
+++ b/website/setup/android.html
@@ -55,7 +55,9 @@
 				In eclipse, create a 'lightweight' lombok jar that contains only the annotations by running:
 				<pre>
 java -jar lombok.jar publicApi</pre>
-				Then, add this jar to your android project, and, as usual, install lombok into eclipse.
+				Then, add the <code>lombok-api.jar</code> file created by running this command
+				to your android project instead of the complete <code>lombok.jar</code>, and,
+				as usual, install lombok into eclipse by double-clicking <code>lombok.jar</code>.
 			</div>
 			<h3>Ant</h3>
 			<div>
@@ -70,6 +72,9 @@ java -jar lombok.jar publicApi</pre>
 			<h3>Maven</h3>
 			<div>
 				You should be able to just follow the normal <a href="../mavenrepo/index.html">lombok with maven instructions</a>.<br />
+				Note that if you use android, eclipse, and maven together you may have to replace <code>lombok.jar</code> in your eclipse android project's build path
+				(which you can modify in that project's properties page) with <code>lombok-api.jar</code>, as produced in the procedure explained for <em>Eclipse</em>,
+				above.
 			</div>
 		<div class="endBar">
 		</div>
-- 
cgit 


From 389dbf5edadfb61e808e7d5273bb11990821ff9f Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Thu, 22 Mar 2012 17:16:31 +0100
Subject: build script now contains an explicit javadoc target.

---
 build.xml                    | 6 ++++++
 buildScripts/website.ant.xml | 1 +
 2 files changed, 7 insertions(+)

diff --git a/build.xml b/build.xml
index e9497c2c..d6134f14 100644
--- a/build.xml
+++ b/build.xml
@@ -391,6 +391,12 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		</tar>
 	</target>
 	
+	<target name="javadoc" depends="compile, version" description="Builds javadoc into doc/api.">
+		<ant antfile="buildScripts/website.ant.xml" target="javadoc" inheritAll="false">
+			<property name="lombok.version" value="${lombok.version}" />
+		</ant>
+	</target>
+	
 	<target name="maven" depends="version, dist, test" description="Build a maven artifact bundle.">
 		<ant antfile="buildScripts/website.ant.xml" target="javadoc" inheritAll="false">
 			<property name="lombok.version" value="${lombok.version}" />
diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index d9e2e8a1..f949efcf 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -303,6 +303,7 @@ such as converting the changelog into HTML, and creating javadoc.
 		]]></echo>
 		<javadoc sourcepath="src/core" defaultexcludes="yes" destdir="build/api" windowtitle="Lombok" Overview="${javadoc.overview.html}">
 			<classpath refid="build.path" />
+			<classpath location="build/lombok" />
 			<link href="http://download.oracle.com/javase/6/docs/api/" />
 			<link href="http://www.slf4j.org/api/" />
 			<link href="http://commons.apache.org/logging/apidocs/" />
-- 
cgit