From 3cc46b73f69854554fb3a68bdf08e19e7316db46 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 18 Nov 2010 04:24:03 +0000
Subject: [PATCH] Finished wired up Maven build. Still no LWJGL, but we'll sort
 that out later.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1069 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 build.xml | 13 ++++++++-----
 pom.xml   | 29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index aaa92212..afd82129 100644
--- a/build.xml
+++ b/build.xml
@@ -226,14 +226,16 @@
     </java>
   </target>
 
-  <target name="-prep-test-rsrcs">
+  <target name="-prep-test-rsrcs" depends="-prepare">
     <copy todir="${tclasses.dir}">
       <fileset dir="src/test/resources" includes="**"/>
     </copy>
     <property name="testrsrc.dir" value="${tclasses.dir}/rsrc"/>
   </target>
 
-  <target name="test-colorpos" depends="compile,-prep-test-rsrcs"
+  <!-- these can't depend on the compile target otherwise things break when we -->
+  <!-- call into -test-rsrcs from Maven, alas -->
+  <target name="test-colorpos" depends="-prep-test-rsrcs"
           description="Builds the test colorpository data.">
     <taskdef name="confcomp" classpathref="test.classpath"
       classname="com.threerings.tools.CompiledConfigTask"/>
@@ -242,7 +244,7 @@
       target="${testrsrc.dir}/config/media/colordefs.dat"/>
   </target>
 
-  <target name="test-tsbundles" depends="compile,-prep-test-rsrcs"
+  <target name="test-tsbundles" depends="-prep-test-rsrcs"
           description="Build test tileset bundles.">
     <taskdef name="tilebundle" classpathref="test.classpath"
       classname="com.threerings.media.tile.bundle.tools.TileSetBundlerTask"/>
@@ -265,7 +267,7 @@
                 target="${testrsrc.dir}/config/miso/tile/fringeconf.dat"/>
   </target>
 
-  <target name="test-cbundles" depends="compile,-prep-test-rsrcs"
+  <target name="test-cbundles" depends="-prep-test-rsrcs"
           description="Builds test component bundles.">
     <taskdef name="metabundle" classpathref="test.classpath"
       classname="com.threerings.cast.bundle.tools.MetadataBundlerTask"/>
@@ -289,7 +291,8 @@
   </target>
 
   <property name="test" value=""/>
-  <target name="tests" depends="compile,test-colorpos,test-tsbundles,test-cbundles" 
+  <target name="-test-rsrcs" depends="test-colorpos,test-tsbundles,test-cbundles"/>
+  <target name="tests" depends="compile,-test-rsrcs" 
           description="Runs unit tests. Use -Dtest=Foo to run only FooTest.">
     <taskdef name="unit" classpathref="test.classpath"
       classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
diff --git a/pom.xml b/pom.xml
index 4a1b65e3..23b5a55a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,6 +123,10 @@
             <exclude>**/MidiPlayer.java</exclude>
             <exclude>**/Mp3Player.java</exclude>
           </excludes>
+          <testExcludes>
+            <!-- TODO: need LWJGL in Maven -->
+            <exclude>com/threerings/openal/**</exclude>
+          </testExcludes>
         </configuration>
       </plugin>
       <plugin>
@@ -147,6 +151,27 @@
           </links>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>RELEASE</version>
+        <executions>
+          <execution>
+            <phase>process-test-resources</phase>
+            <configuration>
+              <target>
+                <property name="deploy.dir" value="target" />
+                <ant antfile="${basedir}/build.xml">
+                  <target name="-test-rsrcs"/>
+                </ant>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -155,6 +180,10 @@
           <includes>
             <include>com/threerings/**/*Test.java</include>
           </includes>
+          <systemPropertyVariables>
+            <resource_dir>target/test-classes/rsrc</resource_dir>
+            <no_unpack_resources>true</no_unpack_resources>
+          </systemPropertyVariables>
         </configuration>
       </plugin>
       <plugin>