From 026aa9e1663c8c261030816cb931400649436b09 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 17 Nov 2010 00:56:09 +0000
Subject: [PATCH] I'm not sure the asdoc build has worked in recent years, but
 this gets it closer to working. Firstly, we need to not skip the asdoc build
 if the aslib build happens to have generated an up to date .swc. Second,
 asdoc needs to know about our library dependencies. Third, we need not to
 tell it to look for sources in the non-existent src/player directory.

It's still failing, claiming:

   [java]src/as/com/threerings/presents/util/SafeObjectManager.as(30):
   col: 37 Error: Definition com.threerings.presents.dobj:SubscriberAdapter
   could not be found.
   [java]
   [java] import com.threerings.presents.dobj.SubscriberAdapter;

which is nonsensical. If it can find SafeObjectManager to try to generate
documentation for it, then it can damned well find SubscriberAdapter which is
also part of this project. SubscriberAdapter depends on no other classes
itself, so it can't be a problem with a dependency of SubscriberAdapter.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6279 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 build.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 08d1dacad..5566dece8 100644
--- a/build.xml
+++ b/build.xml
@@ -103,17 +103,18 @@
   </target>
 
   <target name="-checkaslib">
-    <condition property="no_build_aslib"><or>
+    <condition property="no_build_aslib">
       <not><available file="${flexsdk.dir}/lib/compc.jar"/></not>
-      <and>
-        <uptodate targetfile="${deploy.dir}/${lib.name}lib.swc">
-          <srcfiles dir="src/as" includes="**/*.as"/>
-        </uptodate>
-      </and>
+    </condition>
+    <condition property="no_rebuild_aslib"><or>
+      <isset property="no_build_aslib"/>
+      <uptodate targetfile="${deploy.dir}/${lib.name}lib.swc">
+        <srcfiles dir="src/as" includes="**/*.as"/>
+      </uptodate>
     </or></condition>
   </target>
 
-  <target name="aslib" unless="no_build_aslib" depends="-checkaslib"
+  <target name="aslib" unless="no_rebuild_aslib" depends="-checkaslib"
           description="Builds the ActionScript code">
     <!-- generate aslib-config.xml for Flash Player and general compilation -->
     <copy file="etc/aslib-config.xml.in" tofile="${deploy.dir}/aslib-config.xml">
@@ -157,8 +158,8 @@
       <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 src/as"/>
-      <arg line="-doc-sources src/player"/>
       <arg line="-output ${deploy.dir}/asdocs"/>
     </java>
   </target>