From 267c15d9c9f3d7279519101c6c7c64886964f5ea Mon Sep 17 00:00:00 2001
From: Charlie Groves <charlie.groves@gmail.com>
Date: Thu, 30 Jun 2011 12:53:16 -0700
Subject: [PATCH] Use ooo-build

---
 build.xml         | 54 +++++++++++++----------------------------------
 etc/bootstrap.xml | 36 +++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 39 deletions(-)
 create mode 100644 etc/bootstrap.xml

diff --git a/build.xml b/build.xml
index db297a6..057d526 100644
--- a/build.xml
+++ b/build.xml
@@ -1,40 +1,26 @@
 <?xml version="1.0"?>
 <project name="pythagoras" default="compile" basedir="." xmlns:artifact="urn:maven-artifact-ant">
-  <property name="src.dir"      value="src/main/java"/>
-  <property name="test.dir"     value="src/test/java"/>
-  <property name="target.dir"   value="target"/>
-  <property name="classes.dir"  value="${target.dir}/classes"/>
-  <property name="tclasses.dir" value="${target.dir}/test-classes"/>
-  <property name="javadoc.dir"  value="${target.dir}/docs"/>
+  <property name="src.dir"      location="src/main/java"/>
+  <property name="test.dir"     location="src/test/java"/>
+  <property name="target.dir"   location="target"/>
+  <property name="classes.dir"  location="${target.dir}/classes"/>
+  <property name="tclasses.dir" location="${target.dir}/test-classes"/>
+  <property name="javadoc.dir"  location="${target.dir}/docs"/>
 
-  <property name="maven-ant.vers" value="2.1.3"/>
-  <property name="maven-ant.dir" value="${user.home}/.m2/ant-support"/>
-  <property name="maven-ant.jar" value="${maven-ant.dir}/maven-ant-tasks-${maven-ant.vers}.jar"/>
-  <property name="maven-ant.url"
-            value="http://mirrors.ibiblio.org/pub/mirrors/apache/maven/binaries"/>
-  <condition property="maven-ant.exists"><available file="${maven-ant.jar}"/></condition>
-  <target name="-download-maven-ant" unless="maven-ant.exists">
-    <mkdir dir="${maven-ant.dir}"/>
-    <get src="${maven-ant.url}/maven-ant-tasks-${maven-ant.vers}.jar"
-         dest="${maven-ant.jar}" usetimestamp="true"/>
-  </target>
+  <property name="ooo-build.vers" value="2.6"/>
+  <ant antfile="etc/bootstrap.xml"/>
+  <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/>
 
-  <target name="-init-maven-ant" depends="-download-maven-ant">
-    <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
-             uri="urn:maven-artifact-ant" classpath="${maven-ant.jar}"/>
-    <artifact:pom id="pom" file="pom.xml"/>
-    <artifact:dependencies pathId="classpath" pomRefId="pom"/>
+  <target name="-prepare" depends="-init-ooo">
+    <mkdir dir="${target.dir}"/>
+    <mavendep pom="pom.xml"/>
     <path id="test.classpath">
-      <path refid="classpath"/>
+      <path refid="pom.xml.path"/>
       <pathelement location="${classes.dir}"/>
       <pathelement location="${tclasses.dir}"/>
     </path>
   </target>
 
-  <target name="-prepare" depends="-init-maven-ant">
-    <mkdir dir="${target.dir}"/>
-  </target>
-
   <target name="clean" description="Deletes all build results.">
     <delete dir="${target.dir}"/>
   </target>
@@ -42,12 +28,7 @@
   <target name="compile" depends="-prepare" description="Compiles the code.">
     <mkdir dir="${classes.dir}"/>
     <copy todir="${classes.dir}"><fileset dir="src/main/resources" includes="**"/></copy>
-    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" source="1.6" target="1.6" encoding="utf-8">
-      <classpath refid="classpath"/>
-      <compilerarg value="-Xlint"/>
-      <compilerarg value="-Xlint:-serial"/>
-    </javac>
+    <ooojavac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="pom.xml.path"/>
 
 <!--
     <mkdir dir="${tclasses.dir}"/>
@@ -99,11 +80,6 @@
   <property name="maven.install.repo" value="file://${user.home}/.m2/repository"/>
   <target name="install" depends="package"
           description="Deploys our build artifacts to a Maven repository.">
-    <jar basedir="${src.dir}" destfile="${target.dir}/${ant.project.name}-sources.jar"/>
-    <artifact:deploy file="${target.dir}/${ant.project.name}.jar" uniqueVersion="false">
-      <remoteRepository url="${maven.install.repo}"/>
-      <pom refid="pom"/>
-      <attach file="${target.dir}/${ant.project.name}-sources.jar" classifier="sources"/>
-    </artifact:deploy>
+    <mavendeploy file="${target.dir}/${ant.project.name}.jar" srcdir="${src.dir}" pom="pom.xml"/>
   </target>
 </project>
diff --git a/etc/bootstrap.xml b/etc/bootstrap.xml
new file mode 100644
index 0000000..ceabc27
--- /dev/null
+++ b/etc/bootstrap.xml
@@ -0,0 +1,36 @@
+<project name="bootstrap" default="-extract-ooo-build">
+  <!--
+       Pulls in ooo-build from our maven repository to make our base build system available.
+       From http://ooo-build.googlecode.com/hg/etc/bootstrap.xml
+
+       To use, copy this file into your project's directory and add
+
+       <property name="ooo-build.vers" value="2.5"/>
+       <ant antfile="bootstrap.xml"/>
+       <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/>
+
+       to the top level of your build.xml.  Then you can depend on -init-ooo in your lowest level
+       target to expose ooo-build's maven macros, javac macros, and antcontrib.
+  -->
+
+  <property name="maven.dir" value="${user.home}/.m2"/>
+  <property name="ooo-build.path"
+    value="com/threerings/ooo-build/${ooo-build.vers}"/>
+  <property name="ooo-build.jar"
+    value="ooo-build-${ooo-build.vers}.jar"/>
+  <property name="ooo-build.local.dir" value="${maven.dir}/repository/${ooo-build.path}"/>
+  <property name="ooo-build.local.file" value="${ooo-build.local.dir}/${ooo-build.jar}"/>
+  <condition property="ooo-build.exists"><available file="${ooo-build.local.file}"/></condition>
+  <target name="-download-ooo-build" unless="ooo-build.exists">
+    <mkdir dir="${ooo-build.local.dir}"/>
+    <get src="http://ooo-maven.googlecode.com/hg/repository/${ooo-build.path}/${ooo-build.jar}"
+      dest="${ooo-build.local.file}" usetimestamp="true"/>
+  </target>
+
+  <property name="ooo-build.dir" value="${maven.dir}/ooo-build/${ooo-build.vers}"/>
+  <condition property="extracted.exists"><available file="${ooo-build.dir}/ooo-build.xml"/></condition>
+  <target name="-extract-ooo-build" depends="-download-ooo-build" unless="extracted.exists">
+    <mkdir dir="${ooo-build.dir}"/>
+    <unjar src="${ooo-build.local.file}" dest="${ooo-build.dir}"/>
+  </target>
+</project>