Moving bits into src/main and src/test. Reinstatement of actual test

workingness coming shortly.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@995 c613c5cb-e716-0410-b11b-feb51c14d237

build.xml

@@ -9,10 +9,14 @@
   <property name="lib.name"    value="vilya"/>
   <property name="deploy.dir"  value="dist"/>
   <property name="savedoc.dir" value="docs"/>
+  <property name="src.dir"     value="src/main/java"/>
+  <property name="tsrc.dir"    value="src/test/java"/>
+  <property name="asrc.dir"    value="src/main/as"/>
 
   <!-- derived properties -->  
   <property name="javadoc.home" value="${deploy.dir}/docs"/>
   <property name="classes.dir"  value="${deploy.dir}/classes"/>
+  <property name="tclasses.dir"  value="${deploy.dir}/test-classes"/>
 
   <!-- import some targets to enumerate library dependencies -->
   <property name="libs.dir" value="lib"/>
@@ -24,6 +28,10 @@
     <pathelement location="${classes.dir}"/>
     <fileset dir="${deploy.dir}/lib" includes="**/*.jar"/>
   </path>
+  <path id="test.classpath">
+    <path refid="classpath"/>
+    <pathelement location="${tclasses.dir}"/>
+  </path>
 
   <!-- prepares the application directories -->
   <target name="prepare">
@@ -33,8 +41,8 @@
     <mkdir dir="${classes.dir}/rsrc"/>
     <mkdir dir="${javadoc.home}"/>
     <copy todir="${classes.dir}">
-      <fileset dir="src/java" includes="**/*.properties"/>
-      <fileset dir="src/java" includes="**/*.tmpl"/>
+      <fileset dir="${src.dir}" includes="**/*.properties"/>
+      <fileset dir="${src.dir}" includes="**/*.tmpl"/>
     </copy>
     <copy todir="${classes.dir}/rsrc">
       <fileset dir="rsrc" includes="**/*" excludes="**/bundles/**"/>
@@ -69,7 +77,7 @@
 
   <!-- build the java class files -->
   <target name="compile" depends="check-available,prepare">
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
            debug="on" optimize="${build.optimize}" deprecation="on"
            source="1.5" target="1.5">
       <classpath refid="classpath"/>
@@ -80,6 +88,15 @@
       <compilerarg value="-Xlint:-serial"/>
       <compilerarg value="-Xlint:-unchecked"/> <!-- TODO: fix -->
     </javac>
+
+    <mkdir dir="${tclasses.dir}"/>
+    <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>
   </target>
 
   <!-- checks whether our Flash library needs building -->
@@ -87,7 +104,7 @@
     <condition property="no_build_aslib"><or>
       <not><available file="${flexsdk.dir}/lib/compc.jar"/></not>
       <uptodate targetfile="${deploy.dir}/${lib.name}lib.swc">
-        <srcfiles dir="src/as" includes="**/*.as"/>
+        <srcfiles dir="${asrc.dir}" includes="**/*.as"/>
       </uptodate>
     </or></condition>
   </target>
@@ -104,8 +121,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}/${lib.name}lib.swc"/>
     </java>
@@ -114,7 +131,7 @@
 
   <!-- builds the javadoc documentation -->
   <target name="javadoc" depends="prepare">
-    <javadoc sourcepath="src/java" packagenames="com.threerings.*"
+    <javadoc sourcepath="${src.dir}" packagenames="com.threerings.*"
              destdir="${javadoc.home}" stylesheetfile="docs/stylesheet.css"
              additionalparam="-breakiterator"
              link="http://www.threerings.net/code/vilya/docs/api">
@@ -127,7 +144,7 @@
       <link href="http://www.threerings.net/code/nenya/docs/api"/>
     </javadoc>
     <copy todir="${javadoc.home}">
-      <fileset dir="src/java" includes="**/*.png"/>
+      <fileset dir="${src.dir}" includes="**/*.png"/>
     </copy>
   </target>
 
@@ -152,16 +169,11 @@
       <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="-templates-path ${flexsdk.dir}/asdoc/templates"/>
-      <arg line="-doc-sources src/as"/>
+      <arg line="-doc-sources ${asrc.dir}"/>
       <arg line="-output ${deploy.dir}/asdocs"/>
     </java>
   </target>
 
-  <!-- builds the various tests -->
-  <target name="tcompile">
-    <ant dir="tests" target="compile"/>
-  </target>
-
   <!-- builds and runs our tests -->
   <target name="tests">
     <ant dir="tests" target="test"/>
@@ -171,7 +183,7 @@
   <target name="all" depends="clean,dist,javadoc,dist"/>
 
   <!-- builds our distribution files (war and jar) -->
-  <target name="dist" depends="prepare,compile,tcompile,procstream,aslib">
+  <target name="dist" depends="prepare,compile,procstream,aslib">
     <!-- build our various jar files -->
     <jar destfile="${deploy.dir}/${lib.name}-parlor.jar">
       <fileset dir="${classes.dir}" includes="rsrc/i18n/game/**"/>
@@ -204,21 +216,21 @@
     <taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask"
              classpathref="classpath"/>
     <!-- make sure the record class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}"
+    <javac srcdir="${src.dir}" destdir="${classes.dir}"
            debug="on" optimize="${build.optimize}" deprecation="on">
       <classpath refid="classpath"/>
       <include name="**/*Record.java"/>
     </javac>
     <!-- now update the source files -->
     <grecord classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Record.java"/>
+      <fileset dir="${src.dir}" includes="**/*Record.java"/>
     </grecord>
   </target>
 
   <!-- generates additional methods for distributed object classes -->
   <target name="gendobj" depends="preptools"> 
     <!-- make sure the dobject class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
            debug="on" optimize="${build.optimize}" deprecation="on"
            source="1.5" target="1.5">
       <classpath refid="classpath"/>
@@ -226,7 +238,7 @@
     </javac>
     <!-- now generate the associated files -->
     <gendobj classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Object.java"/>
+      <fileset dir="${src.dir}" includes="**/*Object.java"/>
     </gendobj>
   </target>
 
@@ -234,7 +246,7 @@
   <!-- service declarations -->
   <target name="genservice" depends="preptools"> 
     <!-- make sure the service class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
            debug="on" optimize="${build.optimize}" deprecation="on"
            source="1.5" target="1.5">
       <classpath refid="classpath"/>
@@ -243,7 +255,7 @@
     </javac>
     <!-- generate our services that have no ActionScript counterpart -->
     <genservice header="lib/SOURCE_HEADER" classpathref="classpath">
-      <fileset dir="src/java">
+      <fileset dir="${src.dir}">
         <include name="**/puzzle/client/*Service.java"/>
         <include name="**/micasa/simulator/client/*Service.java"/>
         <include name="**/micasa/lobby/*Service.java"/>
@@ -252,8 +264,8 @@
       <providerless service="SimulatorService"/>
     </genservice>
     <!-- generate our services that have an ActionScript counterpart -->
-    <genservice header="lib/SOURCE_HEADER" asroot="src/as" classpathref="classpath">
-      <fileset dir="src/java">
+    <genservice header="lib/SOURCE_HEADER" asroot="${asrc.dir}" classpathref="classpath">
+      <fileset dir="${src.dir}">
         <include name="**/client/*Service.java"/>
         <exclude name="**/puzzle/client/*Service.java"/>
         <exclude name="**/micasa/simulator/client/*Service.java"/>
@@ -266,7 +278,7 @@
   <!-- receiver declarations -->
   <target name="genreceiver" depends="preptools">
     <!-- make sure the receiver class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
            debug="on" optimize="${build.optimize}" deprecation="on"
            source="1.5" target="1.5">
       <classpath refid="classpath"/>
@@ -275,7 +287,7 @@
     </javac>
     <!-- now generate the associated files -->
     <genreceiver header="lib/SOURCE_HEADER" classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Receiver.java"
+      <fileset dir="${src.dir}" includes="**/*Receiver.java"
         excludes="**/InvocationReceiver.java"/>
     </genreceiver>
   </target>
@@ -292,8 +304,8 @@
   <!-- generates ActionScript versions of our Streamable classes -->
   <target name="genascript" depends="preptools">
     <!-- now generate the associated files -->
-    <genascript header="lib/SOURCE_HEADER" asroot="src/as">
-      <fileset dir="src/java">
+    <genascript header="lib/SOURCE_HEADER" asroot="${asrc.dir}">
+      <fileset dir="${src.dir}">
         <include name="**/parlor/data/*.java"/>
         <include name="**/parlor/**/data/*.java"/>
         <exclude name="**/parlor/game/data/GameConfig.java"/> <!-- fiddly bits -->