From ef0f727bc420b5c7dd38bdb57efed7bac5ad209f Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 13 Oct 2011 18:42:46 +0000
Subject: [PATCH] Switch to separate install and deploy targets.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1183 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 build.xml | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/build.xml b/build.xml
index 4a1c99aa..a507c8e8 100644
--- a/build.xml
+++ b/build.xml
@@ -7,7 +7,7 @@
   <property name="classes.dir"  location="${deploy.dir}/classes"/>
   <property name="tclasses.dir" location="${deploy.dir}/test-classes"/>
 
-  <property name="ooo-build.vers" value="2.5"/>
+  <property name="ooo-build.vers" value="2.9"/>
   <ant antfile="etc/bootstrap.xml"/>
   <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/>
 
@@ -106,11 +106,11 @@
              destdir="${deploy.dir}/docs" stylesheetfile="docs/stylesheet.css"
              link="http://www.threerings.net/code/nenya/docs/api"
              additionalparam="-breakiterator" classpathref="built.classpath">
-      <link href="http://java.sun.com/j2se/1.5/docs/api/"/>
-      <!-- ant documentation is not available online, sorry kids -->
-      <link href="file:///usr/share/doc/ant-doc/javadocs"/>
+      <link href="http://download.oracle.com/javase/6/docs/api/"/>
+      <link href="http://docs.guava-libraries.googlecode.com/git/javadoc/"/>
       <link href="http://samskivert.googlecode.com/svn/apidocs"/>
-      <link href="http://www.threerings.net/code/narya/docs/api"/>
+      <link href="http://threerings.googlecode.com/narya/apidocs"/>
+      <link href="http://www.jajakarta.org/ant/ant-1.6.1/docs/ja/manual/api/"/>
     </javadoc>
   </target>
 
@@ -256,13 +256,22 @@
     </java>
   </target>
 
-  <target name="-as-maven-deploy" depends="aslib" if="flexsdk.dir">
-    <mavendeploy file="${deploy.dir}/${ant.project.name}lib.swc" pom="etc/as-pom.xml"/>
+  <target name="-as-install" depends="aslib" if="flexsdk.dir">
+    <maveninstall file="${deploy.dir}/${ant.project.name}lib.swc" pom="etc/as-pom.xml"/>
+  </target>
+  <target name="install" depends="dist,-as-install"
+          description="Deploys build artifacts to local Maven repository.">
+    <maveninstall file="${deploy.dir}/${ant.project.name}.jar" pom="pom.xml"/>
+    <maveninstall file="${deploy.dir}/${ant.project.name}.jar" pom="etc/tools-pom.xml"/>
   </target>
 
-  <target name="maven-deploy" depends="dist,-as-maven-deploy"
+  <target name="-as-deploy" depends="aslib" if="flexsdk.dir">
+    <mavendeploy file="${deploy.dir}/${ant.project.name}lib.swc" pom="etc/as-pom.xml"/>
+  </target>
+  <target name="deploy" depends="dist,-as-deploy,javadoc"
           description="Deploys our build artifacts to a Maven repository.">
-    <mavendeploy file="${deploy.dir}/${ant.project.name}.jar" srcdir="${src.dir}" pom="pom.xml"/>
+    <mavendeploy file="${deploy.dir}/${ant.project.name}.jar" pom="pom.xml"
+                 srcdir="${src.dir}" docdir="${deploy.dir}/docs"/>
     <mavendeploy file="${deploy.dir}/${ant.project.name}.jar" pom="etc/tools-pom.xml"/>
   </target>
 </project>