If we don't have xml-writer avoid compiling all the XML scene crap (and

unfortunately also the Miso Viewer).


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@79 ed5b42cb-e716-0410-a449-f6a68f950b19

build.xml

@@ -17,6 +17,7 @@
   <!-- import some targets to enumerate library dependencies -->
   <property name="libs.dir" value="lib"/>
   <import file="libs-incl.xml"/>
+  <import file="depends-incl.xml"/>
 
   <!-- declare our classpath business -->
   <path id="classpath">
@@ -24,34 +25,6 @@
     <fileset dir="${deploy.dir}/lib" includes="**/*.jar"/>
   </path>
 
-  <!-- checks the availability of certain libraries -->
-  <target name="check-available">
-    <available property="lwjgl.present"
-     classname="org.lwjgl.LWJGLException" classpathref="classpath"/>
-    <echo message="Have LWJGL: ${lwjgl.present}"/>
-    <available property="jme.present"
-     classname="com.jme.scene.Node" classpathref="classpath"/>
-    <echo message="Have JME: ${jme.present}"/>
-    <available property="jme-bui.present"
-     classname="com.jmex.bui.BWindow" classpathref="classpath"/>
-    <echo message="Have JME-BUI: ${jme-bui.present}"/>
-    <available property="jme-sound.present"
-     classname="com.jmex.sound.openAL.SoundSystem" classpathref="classpath"/>
-    <echo message="Have OpenAL: ${jme-sound.present}"/>
-    <condition property="build.jme">
-      <and>
-        <isset property="jme.present"/>
-        <isset property="jme-bui.present"/>
-      </and>
-    </condition>
-    <condition property="build.openal">
-      <and>
-        <isset property="lwjgl.present"/>
-        <isset property="jme-sound.present"/>
-      </and>
-    </condition>
-  </target>
-
   <!-- prepares the application directories -->
   <target name="prepare">
     <mkdir dir="${deploy.dir}"/>
@@ -91,6 +64,8 @@
       <classpath refid="classpath"/>
       <exclude name="com/threerings/jme/**" unless="build.jme"/>
       <exclude name="com/threerings/openal/**" unless="build.openal"/>
+      <exclude name="com/threerings/**/tools/xml/**" unless="build.xml"/>
+      <exclude name="com/threerings/miso/viewer/**" unless="build.xml"/>
       <exclude name="**/OggPlayer.java"/>
       <exclude name="**/ModPlayer.java"/>
       <exclude name="**/MidiPlayer.java"/>

depends-incl.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+
+<!-- build configuration -->
+<project name="nenya-checks" basedir=".">
+
+  <!-- checks the availability of certain libraries -->
+  <target name="check-available">
+    <available property="lwjgl.present"
+     classname="org.lwjgl.LWJGLException" classpathref="classpath"/>
+    <echo message="Have LWJGL: ${lwjgl.present}"/>
+
+    <available property="jme.present"
+     classname="com.jme.scene.Node" classpathref="classpath"/>
+    <echo message="Have JME: ${jme.present}"/>
+
+    <available property="jme-bui.present"
+     classname="com.jmex.bui.BWindow" classpathref="classpath"/>
+    <echo message="Have JME-BUI: ${jme-bui.present}"/>
+
+    <available property="jme-sound.present"
+     classname="com.jmex.sound.openAL.SoundSystem" classpathref="classpath"/>
+    <echo message="Have OpenAL: ${jme-sound.present}"/>
+
+    <available property="xml-writer.present"
+     classname="com.megginson.sax.DataWriter" classpathref="classpath"/>
+    <echo message="Have XML Writer: ${xml-writer.present}"/>
+
+    <condition property="build.jme">
+      <and>
+        <isset property="jme.present"/>
+        <isset property="jme-bui.present"/>
+      </and>
+    </condition>
+
+    <condition property="build.openal">
+      <and>
+        <isset property="lwjgl.present"/>
+        <isset property="jme-sound.present"/>
+      </and>
+    </condition>
+
+    <condition property="build.xml">
+      <isset property="xml-writer.present"/>
+    </condition>
+  </target>
+
+</project>

tests/build.xml

@@ -12,6 +12,9 @@
   <property name="cbundle.dir" value="rsrc/bundles/components"/>
   <property name="tbundle.dir" value="rsrc/bundles/tiles"/>
 
+  <!-- import some targets to check dependency availability -->
+  <import file="../depends-incl.xml"/>
+
   <!-- declare our classpath -->
   <property name="classes.dir" value="${deploy.dir}/classes"/>
   <property name="narya.classes.dir" value="../${deploy.dir}/classes"/>
@@ -21,27 +24,6 @@
     <fileset dir="../${deploy.dir}/lib" includes="**/*.jar"/>
   </path>
 
-  <!-- checks the availability of certain libraries -->
-  <target name="check-available">
-    <available property="lwjgl.present"
-     classname="org.lwjgl.LWJGLException" classpathref="classpath"/>
-    <available property="jme.present"
-     classname="com.jme.scene.Node" classpathref="classpath"/>
-    <available property="jme-bui.present"
-     classname="com.jme.bui.BWindow" classpathref="classpath"/>
-    <condition property="build.jme">
-      <and>
-        <isset property="jme.present"/>
-        <isset property="jme-bui.present"/>
-      </and>
-    </condition>
-    <condition property="build.openal">
-      <and>
-        <isset property="lwjgl.present"/>
-      </and>
-    </condition>
-  </target>
-
   <!-- generates additional methods for distributed object classes -->
   <target name="gendobj" depends="prepare"> 
     <taskdef name="dobj"
@@ -110,6 +92,8 @@
       <classpath refid="classpath"/>
       <exclude name="com/threerings/jme/**" unless="build.jme"/>
       <exclude name="com/threerings/openal/**" unless="build.openal"/>
+      <exclude name="com/threerings/**/tools/xml/**" unless="build.xml"/>
+      <exclude name="com/threerings/miso/viewer/**" unless="build.xml"/>
     </javac>
   </target>