Obtain our ActionScript dependencies from Maven as well, and publish our swc

artifacts thereto.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6289 542714f4-19e9-0310-aa3c-eee0fc999fb1

as-pom.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.threerings</groupId>
+  <artifactId>naryalib</artifactId>
+  <packaging>swc</packaging>
+  <version>1.2-SNAPSHOT</version>
+  <name>narya</name>
+  <description>Facilities for making networked multiplayer games.</description>
+  <url>http://code.google.com/p/narya/</url>
+  <issueManagement>
+    <url>http://code.google.com/p/narya/issues/list</url>
+  </issueManagement>
+
+  <repositories>
+    <repository>
+      <id>as3corelib-repo</id>
+      <url>https://github.com/samskivert/as3corelib/raw/master/repository</url>
+    </repository>
+  </repositories>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>aspirin</artifactId>
+      <version>1.6</version>
+      <scope>compile</scope>
+      <type>swc</type>
+    </dependency>
+    <dependency>
+      <groupId>com.adobe</groupId>
+      <artifactId>as3corelib</artifactId>
+      <version>0.93</version>
+      <scope>compile</scope>
+      <type>swc</type>
+    </dependency>
+  </dependencies>
+</project>

build.xml

@@ -3,6 +3,7 @@
 <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"/>
@@ -43,16 +44,6 @@
       <pathelement location="${classes.dir}"/>
       <pathelement location="${tclasses.dir}"/>
     </path>
-    <!-- TEMP: needed for ActionScript library build -->
-    <property name="libs.dir" value="lib"/>
-    <copy todir="${deploy.dir}/lib" flatten="true">
-      <fileset dir="${libs.dir}">
-        <include name="aspirin*.swc"/>
-        <include name="asunit.swc"/>
-        <include name="corelib.swc"/>
-      </fileset>
-    </copy>
-    <!-- END TEMP -->
   </target>
 
   <target name="-preptools" depends="-prepare">
@@ -103,13 +94,21 @@
     <condition property="no_rebuild_aslib"><or>
       <isset property="no_build_aslib"/>
       <uptodate targetfile="${deploy.dir}/${ant.project.name}lib.swc">
-        <srcfiles dir="src/as" includes="**/*.as"/>
+        <srcfiles dir="${asrc.dir}" includes="**/*.as"/>
       </uptodate>
     </or></condition>
   </target>
 
-  <target name="aslib" unless="no_rebuild_aslib" depends="-checkaslib"
+  <target name="aslib" unless="no_rebuild_aslib" depends="-checkaslib,-prepare"
           description="Builds the ActionScript code">
+    <!-- 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>
+
     <!-- generate aslib-config.xml for Flash Player and general compilation -->
     <copy file="etc/aslib-config.xml.in" tofile="${deploy.dir}/aslib-config.xml">
       <filterset>
@@ -121,8 +120,8 @@
       <arg value="-load-config"/>
       <arg value="${deploy.dir}/aslib-config.xml"/>
       <arg value="-compiler.optimize"/>
-      <arg value="-compiler.source-path=src/as/"/>
-      <arg value="-include-sources=src/as/"/>
+      <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>
@@ -153,7 +152,7 @@
       <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 ${asrc.dir}"/>
       <arg line="-output ${deploy.dir}/asdocs"/>
     </java>
   </target>
@@ -235,7 +234,7 @@
       <exclude name="**/InvocationService.java"/>
     </javac>
     <!-- generate services with an actionscript counterpart-->
-    <genservice header="lib/SOURCE_HEADER" asroot="src/as" classpathref="built.classpath">
+    <genservice header="lib/SOURCE_HEADER" asroot="${asrc.dir}" classpathref="built.classpath">
       <fileset dir="${src.dir}" includes="**/*Service.java">
         <exclude name="**/RegistrationService.java"/>
         <exclude name="**/InvocationService.java"/>
@@ -319,7 +318,7 @@
 
   <target name="genascript" depends="-preptools"
           description="Generates ActionScript versions of our Streamable classes">
-    <genascript header="lib/SOURCE_HEADER" asroot="src/as">
+    <genascript header="lib/SOURCE_HEADER" asroot="${asrc.dir}">
       <fileset dir="${src.dir}" includes="**/data/*.java"/>
     </genascript>
   </target>
@@ -357,5 +356,10 @@
       <remoteRepository url="${maven.deploy.repo}"/>
       <pom refid="gwt-pom"/>
     </artifact:deploy>
+    <artifact:pom id="as-pom" file="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>
   </target>
 </project>

pom.xml

@@ -105,7 +105,7 @@
     <dependency>
       <groupId>com.threerings</groupId>
       <artifactId>gwt-utils</artifactId>
-      <version>1.1</version>
+      <version>1.2</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>