From 514bcfd70d3bfbdce8f7951d50d72a14cf1ae25b Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 2 Dec 2010 06:15:26 +0000
Subject: [PATCH] Fix up the asdoc build. Not that it works, but at least it's
 not broken because of build-related problems.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1022 c613c5cb-e716-0410-b11b-feb51c14d237
---
 build.xml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/build.xml b/build.xml
index c660d8a2..1d237616 100644
--- a/build.xml
+++ b/build.xml
@@ -93,7 +93,17 @@
     activate ActionScript library build.
   </echo></target>
 
-  <target name="aslib" unless="no_rebuild_aslib" depends="-checkaslib,-noteaslib"
+  <target name="-asprepare" depends="-checkaslib">
+    <!-- obtain our ActionScript dependencies via Maven -->
+    <artifact:pom id="as-pom" file="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>
+  </target>
+
+  <target name="aslib" unless="no_rebuild_aslib" depends="-asprepare,-noteaslib"
           description="Builds the ActionScript code">
     <!-- TODO: these don't seem to be needed for the ActionScript library
                build, why are/where they here -->
@@ -108,14 +118,6 @@
     </copy>
     <!-- END TODO -->
 
-    <!-- obtain our ActionScript dependencies via Maven -->
-    <artifact:pom id="as-pom" file="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>
-
     <copy file="etc/aslib-config.xml.in" tofile="${deploy.dir}/aslib-config.xml">
       <filterset>
         <filter token="flex_sdk_dir" value="${flexsdk.dir}"/>
@@ -148,7 +150,7 @@
     </copy>
   </target>
 
-  <target name="asdoc" unless="no_build_aslib" depends="-checkaslib"
+  <target name="asdoc" unless="no_build_aslib" depends="-asprepare"
           description="Builds the ActionScript documention">
     <mkdir dir="${deploy.dir}/asdocs"/>
     <java classpath="${flexsdk.dir}/lib/asdoc.jar" classname="flex2.tools.ASDoc" fork="true">
@@ -157,8 +159,8 @@
       <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="-library-path ${deploy.dir}/lib/naryalib-0.0-SNAPSHOT.swc"/>
-      <arg line="-library-path ${deploy.dir}/lib/nenyalib-0.0-SNAPSHOT.swc"/>
+      <arg line="-library-path ${com.threerings:naryalib:swc}"/>
+      <arg line="-library-path ${com.threerings:nenyalib:swc}"/>
       <arg line="-templates-path ${flexsdk.dir}/asdoc/templates"/>
       <arg line="-doc-sources ${asrc.dir}"/>
       <arg line="-output ${deploy.dir}/asdocs"/>