From b0b4b5912c299eacc6cdb53d52f231686c8d8fce Mon Sep 17 00:00:00 2001
From: Charlie Groves <charlie@threerings.net>
Date: Sun, 6 Mar 2011 23:11:08 +0000
Subject: [PATCH] Get a little crazy with the Cheez Whiz and use our shared
 build system for narya.

This has a few benefits over the old system:
* We don't have to copy our Maven, Java, and Actionscript settings to every project
* Maven dependency fetching uses a cache in dist until clean is run instead of checking for
  snapshots on every build
* Building aslibs no longer needs to generate a configuration file, which grows confusingly stale
* Nailgun can be used to run mxmlc. This cuts actionscript compile time in half. It can also
  generate a script to call nailgun, which avoids the few seconds of Java startup required to run Ant.

This means we're using Flex 4 to compile naryalib.swc now, but we released a 1.7 recently. Any
projects wishing to stay out of Flex 4 land can pin to that.

If this goes off without too much turbulence, I'll migrate our other projects in a couple days.



git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6513 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 bootstrap.xml |  36 +++++++++
 build.xml     | 209 ++++++++++++++------------------------------------
 2 files changed, 92 insertions(+), 153 deletions(-)
 create mode 100644 bootstrap.xml

diff --git a/bootstrap.xml b/bootstrap.xml
new file mode 100644
index 000000000..b24d3886b
--- /dev/null
+++ b/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.1"/>
+       <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>
diff --git a/build.xml b/build.xml
index 66c862773..e3fac6147 100644
--- a/build.xml
+++ b/build.xml
@@ -1,35 +1,21 @@
 <?xml version="1.0" standalone="yes"?>
 <!-- build configuration -->
 <project name="narya" default="compile" xmlns:artifact="urn:maven-artifact-ant">
-  <property name="deploy.dir"   value="dist"/>
-  <property name="src.dir"      value="src/main/java"/>
-  <property name="asrc.dir"     value="src/main/as"/>
-  <property name="tsrc.dir"     value="src/test/java"/>
-  <property name="classes.dir"  value="${deploy.dir}/classes"/>
-  <property name="tclasses.dir" value="${deploy.dir}/test-classes"/>
+  <property name="deploy.dir"   location="dist"/>
+  <property name="src.dir"      location="src/main/java"/>
+  <property name="asrc.dir"     location="src/main/as"/>
+  <property name="tsrc.dir"     location="src/test/java"/>
+  <property name="classes.dir"  location="${deploy.dir}/classes"/>
+  <property name="tclasses.dir" location="${deploy.dir}/test-classes"/>
 
-  <property name="maven-ant.vers" value="2.1.1"/>
-  <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.1"/>
+  <ant antfile="bootstrap.xml"/>
+  <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/>
 
-  <target name="-init-maven-ant" depends="-download-maven-ant" unless="have.maven">
-    <property name="have.maven" value="true"/>
-    <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="compile.classpath" pomRefId="pom" useScope="compile"/>
-    <artifact:dependencies pathId="testlibs.classpath" pomRefId="pom" useScope="test"/>
-  </target>
-
-  <target name="-prepare" depends="-init-maven-ant">
+  <target name="-prepare" depends="-init-ooo">
+    <mavendep pom="pom.xml"/>
+    <mavendep pom="etc/as-pom.xml" pathProp="aslib.path"/>
+    <mavendep pom="pom.xml" id="test" scope="test"/>
     <mkdir dir="${deploy.dir}"/>
     <mkdir dir="${deploy.dir}/lib"/>
     <mkdir dir="${classes.dir}"/>
@@ -38,11 +24,11 @@
       <fileset dir="src/main/resources" includes="**"/>
     </copy>
     <path id="built.classpath">
-      <path refid="compile.classpath"/>
+      <path refid="pom.xml.path"/>
       <pathelement location="${classes.dir}"/>
     </path>
     <path id="test.classpath">
-      <path refid="testlibs.classpath"/>
+      <path refid="test.path"/>
       <pathelement location="${classes.dir}"/>
       <pathelement location="${tclasses.dir}"/>
     </path>
@@ -51,22 +37,22 @@
   <target name="-preptools" depends="-prepare">
     <!-- Turn off generation checking if enablegencheck hasn't already set this property -->
     <property name="gencheck" value="false"/>
-    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" deprecation="on"
-           source="1.5" target="1.5" classpathref="compile.classpath">
-      <compilerarg value="-Xlint"/>
-      <compilerarg value="-Xlint:-serial"/>
+    <ooojavac version="1.5" srcdir="${src.dir}" destdir="${classes.dir}"
+        classpathref="pom.xml.path">
       <include name="com/threerings/presents/tools/**"/>
-    </javac>
+    </ooojavac>
     <taskdef resource="com/threerings/presents/tools.properties" classpathref="built.classpath"/>
   </target>
 
-  <target name="clean" description="Cleans out build results">
+  <target name="clean" depends="-init-ooo" description="Cleans out build results">
     <delete dir="${classes.dir}"/>
     <delete dir="${tclasses.dir}"/>
     <delete dir="${deploy.dir}/docs"/>
     <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.jar"/></delete>
     <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.swc"/></delete>
+    <cleanmavendepcache pom="pom.xml"/>
+    <cleanmavendepcache pom="etc/as-pom.xml"/>
+    <cleanmavendepcache id="test"/>
   </target>
 
   <target name="distclean" description="Scorched earth clean">
@@ -74,64 +60,17 @@
   </target>
 
   <target name="compile" depends="-prepare" description="Builds the Java code.">
-    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" deprecation="on"
-           source="1.5" target="1.5" classpathref="compile.classpath">
-      <compilerarg value="-Xlint"/>
-      <compilerarg value="-Xlint:-serial"/>
-    </javac>
+    <ooojavac version="1.5" srcdir="${src.dir}" destdir="${classes.dir}"
+        classpathref="pom.xml.path"/>
     <copy todir="${tclasses.dir}"><fileset dir="src/test/resources" includes="**"/></copy>
-    <javac srcdir="${tsrc.dir}" destdir="${tclasses.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" source="1.5" target="1.5"
-           encoding="utf-8" classpathref="test.classpath">
-      <compilerarg value="-Xlint"/>
-      <compilerarg value="-Xlint:-serial"/>
-    </javac>
+    <ooojavac srcdir="${tsrc.dir}" destdir="${tclasses.dir}"
+        version="1.5" classpathref="test.classpath"/>
   </target>
 
-  <target name="-checkaslib">
-    <condition property="no_build_aslib">
-      <not><available file="${flexsdk.dir}/lib/compc.jar"/></not>
-    </condition>
-    <condition property="no_rebuild_aslib"><or>
-      <isset property="no_build_aslib"/>
-      <uptodate targetfile="${deploy.dir}/${ant.project.name}lib.swc">
-        <srcfiles dir="${asrc.dir}" includes="**/*.as"/>
-      </uptodate>
-    </or></condition>
-  </target>
-  <target name="-noteaslib" if="no_build_aslib"><echo>
-    NOTE: not building ActionScript library. Pass -Dflexsdk.dir=DIR to
-    activate ActionScript library build.
-  </echo></target>
-
-  <target name="aslib" unless="no_rebuild_aslib" depends="-prepare,-checkaslib,-noteaslib"
-          description="Builds the ActionScript code">
-    <!-- obtain our ActionScript dependencies via Maven -->
-    <artifact:pom id="as-pom" file="etc/as-pom.xml"/>
-    <artifact:dependencies filesetId="aslibs.fileset" pomRefId="as-pom" useScope="compile"/>
-    <copy todir="${deploy.dir}/lib">
-      <fileset refid="aslibs.fileset"/>
-      <mapper type="flatten"/>
-    </copy>
-
-    <!-- generate aslib-config.xml for Flash Player and general compilation -->
-    <copy file="etc/aslib-config.xml.in" tofile="${deploy.dir}/aslib-config.xml">
-      <filterset>
-        <filter token="flex_sdk_dir" value="${flexsdk.dir}"/>
-        <filter token="lib_name" value="${ant.project.name}"/>
-      </filterset>
-    </copy>
-    <java jar="${flexsdk.dir}/lib/compc.jar" fork="true" failonerror="true">
-      <arg value="-load-config"/>
-      <arg value="${deploy.dir}/aslib-config.xml"/>
-      <arg value="-compiler.optimize"/>
-      <arg value="-compiler.source-path=${asrc.dir}/"/>
-      <arg value="-include-sources=${asrc.dir}/"/>
-      <arg value="-output"/>
-      <arg value="${deploy.dir}/${ant.project.name}lib.swc"/>
-    </java>
-    <delete file="${deploy.dir}/aslib-config.xml"/>
+  <target name="aslib" depends="-prepare" description="Builds the ActionScript code">
+    <maventaskdef groupId="com.threerings.ant" artifactId="actionscript" version="1.0"/>
+    <compc srcdir="${asrc.dir}" libpath="${aslib.path}"
+        dest="${deploy.dir}/${ant.project.name}lib.swc"/>
   </target>
 
   <target name="javadoc" depends="-prepare" description="Builds the Java documentation">
@@ -147,26 +86,16 @@
     </javadoc>
   </target>
 
-  <target name="asdoc" unless="no_build_aslib" depends="-checkaslib"
-          description="Builds the ActionScript documention">
+  <target name="asdoc" depends="-prepare" description="Builds the ActionScript documention">
+    <maventaskdef groupId="com.threerings.ant" artifactId="actionscript" version="1.0"/>
     <mkdir dir="${deploy.dir}/asdocs"/>
-    <java classpath="${flexsdk.dir}/lib/asdoc.jar" classname="flex2.tools.ASDoc" fork="true">
-      <jvmarg value="-Xmx1024m"/>
-      <jvmarg value="-Dsun.io.useCanonCashes=false"/>
-      <jvmarg value="-Xbootclasspath/p:${flexsdk.dir}/asdoc/lib/xalan.jar"/>
-      <arg value="+flexlib=${flexsdk.dir}/frameworks"/>
-      <arg line="-library-path ${flexsdk.dir}/frameworks/libs"/>
-      <arg line="-templates-path ${flexsdk.dir}/asdoc/templates"/>
-      <arg line="-library-path ${deploy.dir}/lib"/>
-      <arg line="-doc-sources ${asrc.dir}"/>
-      <arg line="-output ${deploy.dir}/asdocs"/>
-    </java>
+    <asdoc srcdir="${asrc.dir}" libpath="${aslib.path}" destdir="${deploy.dir}/asdocs"/>
   </target>
 
   <property name="test" value=""/>
   <target name="tests" depends="compile"
           description="Runs unit tests. Use -Dtest=Foo to run only FooTest.">
-    <taskdef name="unit" classpathref="test.classpath"
+    <taskdef name="unit" classpathref="test.path"
       classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
     <mkdir dir="${deploy.dir}/test-reports"/>
     <unit printsummary="off" haltonfailure="yes">
@@ -180,24 +109,21 @@
     </unit>
   </target>
 
-  <target name="dist" depends="compile,procstream,aslib" description="Builds jar files.">
+  <target name="dist" depends="compile,procstream" description="Builds jar files.">
     <!-- build our main jar file -->
     <jar destfile="${deploy.dir}/${ant.project.name}.jar">
       <fileset dir="${classes.dir}" includes="**"/>
     </jar>
 
     <!-- we export a small selection of classes for use by GWT -->
-    <mkdir dir="${deploy.dir}/gwt-jar"/>
-    <copy todir="${deploy.dir}/gwt-jar">
+    <jar destfile="${deploy.dir}/${ant.project.name}-gwt.jar">
       <fileset dir="${src.dir}">
         <include name="**/web/server/*Exception.java"/>
         <include name="**/web/client/*.java"/>
         <include name="**/web/gwt/*.java"/>
         <include name="**/web/*.gwt.xml"/>
       </fileset>
-    </copy>
-    <jar basedir="${deploy.dir}/gwt-jar" destfile="${deploy.dir}/${ant.project.name}-gwt.jar"/>
-    <delete dir="${deploy.dir}/gwt-jar"/>
+    </jar>
   </target>
 
   <target name="genrecord" depends="-prepare"
@@ -205,11 +131,10 @@
     <taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask"
              classpathref="compile.classpath"/>
     <!-- make sure the record class files are all compiled -->
-    <javac srcdir="${src.dir}" destdir="${classes.dir}" debug="on" optimize="${build.optimize}"
-           includeAntRuntime="false" deprecation="on" source="1.5" target="1.5"
-           classpathref="compile.classpath">
+    <ooojavac version="1.5" srcdir="${src.dir}" destdir="${classes.dir}"
+        classpathref="pom.xml.path">
       <include name="**/*Record.java"/>
-    </javac>
+    </ooojavac>
     <!-- now update the source files -->
     <grecord classpathref="built.classpath">
       <fileset dir="${src.dir}" includes="**/*Record.java"/>
@@ -228,11 +153,10 @@
   <target name="gendobj" depends="-preptools"
           description="Generates additional methods for distributed object classes">
     <!-- make sure the dobject class files are all compiled -->
-    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false" debug="on"
-           optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5"
-           classpathref="compile.classpath">
+    <ooojavac version="1.5" srcdir="${src.dir}" destdir="${classes.dir}"
+        classpathref="pom.xml.path">
       <include name="**/*Object.java"/>
-    </javac>
+    </ooojavac>
     <!-- now generate the associated files -->
     <gendobj classpathref="built.classpath" checking="${gencheck}">
       <fileset dir="${src.dir}" includes="**/*Object.java"/>
@@ -242,17 +166,14 @@
   <target name="genservice" depends="-preptools"
           description="Generates marshaller and dispatcher classes for all invocation services">
     <!-- make sure the service class files are all compiled -->
-    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false" debug="on"
-           optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5"
-           classpathref="compile.classpath">
+    <ooojavac version="1.5" srcdir="${src.dir}" destdir="${classes.dir}"
+        classpathref="pom.xml.path">
       <include name="**/*Service.java"/>
       <exclude name="**/InvocationService.java"/>
-    </javac>
-    <javac srcdir="${tsrc.dir}" destdir="${tclasses.dir}" includeAntRuntime="false" debug="on"
-           optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5"
-           classpathref="test.classpath">
+    </ooojavac>
+    <ooojavac srcdir="${tsrc.dir}" destdir="${tclasses.dir}" classpathref="test.classpath">
       <include name="**/*Service.java"/>
-    </javac>
+    </ooojavac>
     <!-- generate services with an actionscript counterpart-->
     <genservice header="lib/SOURCE_HEADER" asroot="${asrc.dir}" classpathref="built.classpath"
         checking="${gencheck}">
@@ -283,12 +204,11 @@
   <target name="genreceiver" depends="-preptools"
           description="Generates sender and decoder classes for all invocation receivers">
     <!-- make sure the receiver class files are all compiled -->
-    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5"
-           classpathref="compile.classpath">
+    <ooojavac version="1.5" srcdir="${src.dir}" destdir="${classes.dir}"
+        classpathref="pom.xml.path">
       <include name="**/*Receiver.java"/>
       <exclude name="**/InvocationReceiver.java"/>
-    </javac>
+    </ooojavac>
     <!-- now generate the associated files -->
     <genreceiver header="lib/SOURCE_HEADER" classpathref="built.classpath" checking="${gencheck}"
         asroot="${asrc.dir}">
@@ -362,29 +282,12 @@
      <delete dir="${deploy.dir}/snapshot"/>
   </target>
 
-  <property name="maven.deploy.repo" value="file://${user.home}/.m2/repository"/>
-  <target name="maven-deploy" depends="dist,tests"
+  <target name="maven-deploy" depends="dist,aslib"
           description="Deploys our build artifacts to a Maven repository.">
     <jar basedir="${src.dir}" destfile="${deploy.dir}/${ant.project.name}-sources.jar"/>
-    <artifact:deploy file="${deploy.dir}/${ant.project.name}.jar" uniqueVersion="false">
-      <remoteRepository url="${maven.deploy.repo}"/>
-      <pom refid="pom"/>
-      <attach file="${deploy.dir}/${ant.project.name}-sources.jar" classifier="sources"/>
-    </artifact:deploy>
-    <artifact:pom id="tools-pom" file="etc/tools-pom.xml"/>
-    <artifact:deploy file="${deploy.dir}/${ant.project.name}.jar" uniqueVersion="false">
-      <remoteRepository url="${maven.deploy.repo}"/>
-      <pom refid="tools-pom"/>
-    </artifact:deploy>
-    <artifact:pom id="gwt-pom" file="etc/gwt-pom.xml"/>
-    <artifact:deploy file="${deploy.dir}/${ant.project.name}-gwt.jar" uniqueVersion="false">
-      <remoteRepository url="${maven.deploy.repo}"/>
-      <pom refid="gwt-pom"/>
-    </artifact:deploy>
-    <artifact:pom id="as-pom" file="etc/as-pom.xml"/>
-    <artifact:deploy file="${deploy.dir}/${ant.project.name}lib.swc" uniqueVersion="false">
-      <remoteRepository url="${maven.deploy.repo}"/>
-      <pom refid="as-pom"/>
-    </artifact:deploy>
+    <mavendeploy file="${deploy.dir}/${ant.project.name}.jar" srcdir="${src.dir}" pom="pom.xml"/>
+    <mavendeploy file="${deploy.dir}/${ant.project.name}.jar" pom="etc/tools-pom.xml"/>
+    <mavendeploy file="${deploy.dir}/${ant.project.name}-gwt.jar" pom="etc/gwt-pom.xml"/>
+    <mavendeploy file="${deploy.dir}/${ant.project.name}lib.swc" pom="etc/as-pom.xml"/>
   </target>
 </project>