From cac3a29d85bb9a9ae0da5abf19543461c0cfa0f4 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@tipit.to>
Date: Thu, 15 Oct 2009 11:44:17 +0200
Subject: [PATCH] Added maven-publish to the build scripts. Just about every
 aspect of build and publish is now in the script.

---
 build.xml                                     |   6 +++
 buildScripts/maven.ant.xml                    |  35 +++++++++++++++++-
 buildScripts/website.ant.xml                  |  14 +++----
 .../ant-googlecode-0.0.2.jar                  | Bin
 deps/{website => buildScripts}/ant-jsch.jar   | Bin
 deps/{website => buildScripts}/java2html.jar  | Bin
 .../{website => buildScripts}/jsch-0.1.42.jar | Bin
 deps/{website => buildScripts}/markdownj.jar  | Bin
 8 files changed, 46 insertions(+), 9 deletions(-)
 rename deps/{website => buildScripts}/ant-googlecode-0.0.2.jar (100%)
 rename deps/{website => buildScripts}/ant-jsch.jar (100%)
 rename deps/{website => buildScripts}/java2html.jar (100%)
 rename deps/{website => buildScripts}/jsch-0.1.42.jar (100%)
 rename deps/{website => buildScripts}/markdownj.jar (100%)

diff --git a/build.xml b/build.xml
index 2bdfd79a..b9030b8c 100644
--- a/build.xml
+++ b/build.xml
@@ -81,6 +81,12 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		</ant>
 	</target>
 	
+	<target name="maven-publish" depends="version" description="Build a maven repository then upload it to projectlombok.org">
+		<ant antfile="buildScripts/maven.ant.xml" target="maven-publish" inheritAll="false">
+			<property name="lombok.version" value="${lombok.version}" />
+		</ant>
+	</target>
+	
 	<target name="publish" depends="version" description="Publishes the latest build to googlecode">
 		<ant antfile="buildScripts/publish.ant.xml" target="publish" inheritAll="false">
 			<property name="lombok.version" value="${lombok.version}" />
diff --git a/buildScripts/maven.ant.xml b/buildScripts/maven.ant.xml
index ff71b718..f86de42b 100644
--- a/buildScripts/maven.ant.xml
+++ b/buildScripts/maven.ant.xml
@@ -24,6 +24,13 @@
 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>
+	
+	<path id="buildScripts.deps.path">
+		<fileset dir="deps/buildScripts">
+			<include name="**/*.jar" />
+		</fileset>
+	</path>
+	
 	<target name="version" unless="lombok.version">
 		<ant antfile="build.xml" target="version" inheritAll="false" />
 		<loadresource property="lombok.version">
@@ -35,7 +42,7 @@ the maven repository that contains lombok's deliverables for those using maven.
 	</target>
 	
 	<target name="dist" unless="lombok.dist.built" depends="version">
-		<ant antfile="buildScripts/compile.xml" target="dist" inheritAll="false">
+		<ant antfile="buildScripts/compile.ant.xml" target="dist" inheritAll="false">
 			<property name="lombok.version" value="${lombok.version}" />
 		</ant>
 	</target>
@@ -108,6 +115,30 @@ the maven repository that contains lombok's deliverables for those using maven.
 		<tar destfile="dist/maven.tar.bz2" compression="bzip2">
 			<tarfileset dir="build/maven" />
 		</tar>
-		<echo>Now copy maven.tar.bz2 to the website and unpack it in the mavenrepo directory. Let it overwrite files.</echo>
+	</target>
+	
+	<taskdef name="scp" classname="org.apache.tools.ant.taskdefs.optional.ssh.Scp" classpathref="buildScripts.deps.path" />
+	<taskdef name="sshexec" classname="org.apache.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="buildScripts.deps.path" />
+	<target name="maven-publish" depends="maven">
+		<available file="libertad-upload.key" property="libertad.key.available" />
+		<fail unless="libertad.key.available">You don't have the libertad-upload.key; you'll need it to get write access to the server.</fail>
+		<scp
+			localFile="dist/maven.tar.bz2"
+			todir="lombokup@projectlombok.org:/staging"
+			keyfile="libertad-upload.key" passphrase=""
+			sftp="true" verbose="true" trust="true" />
+		<sshexec
+			host="projectlombok.org"
+			username="lombokup"
+			keyfile="libertad-upload.key" passphrase=""
+			trust="true" command="./deployMavenRepo" />
+	</target>
+	
+	<target name="FOO">
+		<sshexec
+			host="projectlombok.org"
+			username="lombokup"
+			keyfile="libertad-upload.key" passphrase=""
+			trust="true" command="./deployMavenRepo" />
 	</target>
 </project>
diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index a0818681..e091ef8d 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -37,8 +37,8 @@ such as converting the changelog into HTML, and creating javadoc.
 		</fileset>
 	</path>
 	
-	<path id="webclasses.deps.path">
-		<fileset dir="deps/website">
+	<path id="buildScripts.deps.path">
+		<fileset dir="deps/buildScripts">
 			<include name="**/*.jar" />
 		</fileset>
 	</path>
@@ -64,12 +64,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">
-			<classpath refid="webclasses.deps.path" />
+			<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">
-			<classpath refid="webclasses.deps.path" />
+			<classpath refid="buildScripts.deps.path" />
 			<src path="buildScripts/src" />
 			<include name="lombok/website/CompileChangelog.java" />
 		</javac>
@@ -151,8 +151,8 @@ such as converting the changelog into HTML, and creating javadoc.
 		</tar>
 	</target>
 	
-	<taskdef name="scp" classname="org.apache.tools.ant.taskdefs.optional.ssh.Scp" classpathref="webclasses.deps.path" />
-	<taskdef name="sshexec" classname="org.apache.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="webclasses.deps.path" />
+	<taskdef name="scp" classname="org.apache.tools.ant.taskdefs.optional.ssh.Scp" classpathref="buildScripts.deps.path" />
+	<taskdef name="sshexec" classname="org.apache.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="buildScripts.deps.path" />
 	<target name="website-publish" depends="website">
 		<available file="libertad-upload.key" property="libertad.key.available" />
 		<fail unless="libertad.key.available">You don't have the libertad-upload.key; you'll need it to get write access to the server.</fail>
@@ -211,7 +211,7 @@ such as converting the changelog into HTML, and creating javadoc.
 		<property name="CHANGELOG_HTML" location="build/website/changelog.html" />
 		<java fork="true" classname="lombok.website.CompileChangelog" failonerror="true">
 			<classpath>
-				<path refid="webclasses.deps.path" />
+				<path refid="buildScripts.deps.path" />
 				<pathelement location="build/webclasses" />
 			</classpath>
 			<arg value="${CHANGELOG_FILE}" />
diff --git a/deps/website/ant-googlecode-0.0.2.jar b/deps/buildScripts/ant-googlecode-0.0.2.jar
similarity index 100%
rename from deps/website/ant-googlecode-0.0.2.jar
rename to deps/buildScripts/ant-googlecode-0.0.2.jar
diff --git a/deps/website/ant-jsch.jar b/deps/buildScripts/ant-jsch.jar
similarity index 100%
rename from deps/website/ant-jsch.jar
rename to deps/buildScripts/ant-jsch.jar
diff --git a/deps/website/java2html.jar b/deps/buildScripts/java2html.jar
similarity index 100%
rename from deps/website/java2html.jar
rename to deps/buildScripts/java2html.jar
diff --git a/deps/website/jsch-0.1.42.jar b/deps/buildScripts/jsch-0.1.42.jar
similarity index 100%
rename from deps/website/jsch-0.1.42.jar
rename to deps/buildScripts/jsch-0.1.42.jar
diff --git a/deps/website/markdownj.jar b/deps/buildScripts/markdownj.jar
similarity index 100%
rename from deps/website/markdownj.jar
rename to deps/buildScripts/markdownj.jar