All of our depends now come from Maven.

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

build.xml

@@ -6,16 +6,6 @@
   <property name="classes.dir"  value="${deploy.dir}/classes"/>
   <property name="tclasses.dir" value="${deploy.dir}/test-classes"/>
 
-  <!-- TEMP: this can go away when all of our depends come from Maven -->
-  <property name="libs.dir" value="lib"/>
-  <fileset dir="${libs.dir}" id="nenya.libs">
-    <!-- these LWJGL (for OpenAL) and codec libraries are optional -->
-    <include name="jogg-0.0.7.jar"/>
-    <include name="jorbis-0.0.15.jar"/>
-    <include name="jl1.0.jar"/>
-  </fileset>
-  <!-- end TEMP -->
-
   <property name="maven-ant.vers" value="2.1.1"/>
   <property name="maven-ant.dir" value="${user.home}/.m2/ant-support"/>
   <property name="maven-ant.jar" value="${maven-ant.dir}/maven-ant-tasks-${maven-ant.vers}.jar"/>
@@ -32,24 +22,12 @@
     <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
              uri="urn:maven-artifact-ant" classpath="${maven-ant.jar}"/>
     <artifact:pom id="pom" file="pom.xml"/>
-    <artifact:dependencies pathId="complibs.classpath" pomRefId="pom" useScope="compile"/>
+    <artifact:dependencies pathId="compile.classpath" pomRefId="pom" useScope="compile"/>
     <artifact:dependencies pathId="testlibs.classpath" pomRefId="pom" useScope="test"/>
   </target>
 
   <target name="-prepare" depends="-init-maven-ant">
     <mkdir dir="${deploy.dir}"/>
-
-    <!-- TEMP: this can go away when all of our depends come from Maven -->
-    <mkdir dir="${deploy.dir}/lib"/>
-    <copy todir="${deploy.dir}/lib" flatten="true">
-      <fileset refid="${ant.project.name}.libs"/>
-    </copy>
-    <!-- end TEMP -->
-
-    <path id="compile.classpath">
-      <path refid="complibs.classpath"/>
-      <fileset dir="${deploy.dir}/lib" includes="**/*.jar"/>
-    </path>
     <path id="built.classpath">
       <path refid="compile.classpath"/>
       <pathelement location="${classes.dir}"/>
@@ -61,28 +39,6 @@
     </path>
   </target>
 
-  <target name="-check-available" depends="-prepare">
-    <available property="lwjgl.present"
-     classname="org.lwjgl.LWJGLException" classpathref="compile.classpath"/>
-    <echo level="info" message="Have LWJGL: ${lwjgl.present}"/>
-
-    <available property="jorbis.present"
-     classname="com.jcraft.jorbis.Info" classpathref="compile.classpath"/>
-    <echo level="info" message="Have JOrbis: ${jorbis.present}"/>
-
-    <available property="jl.present"
-     classname="javazoom.jl.decoder.Decoder" classpathref="compile.classpath"/>
-    <echo level="info" message="Have JL: ${jl.present}"/>
-
-    <condition property="build.openal">
-      <and>
-        <isset property="lwjgl.present"/>
-        <isset property="jorbis.present"/>
-        <isset property="jl.present"/>
-      </and>
-    </condition>
-  </target>
-
   <target name="-preptools" depends="-prepare">
     <artifact:dependencies pathId="tools.classpath">
       <!-- TODO: we should publish a narya-tools "artifact" which has the
@@ -105,12 +61,11 @@
     <delete dir="${deploy.dir}"/>
   </target>
 
-  <target name="compile" depends="-check-available" description="Compiles source files.">
+  <target name="compile" depends="-prepare" description="Compiles source files.">
     <mkdir dir="${classes.dir}"/>
     <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
            debug="on" optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5">
       <classpath refid="compile.classpath"/>
-      <exclude name="com/threerings/openal/**" unless="build.openal"/>
       <exclude name="**/OggPlayer.java"/>
       <exclude name="**/ModPlayer.java"/>
       <exclude name="**/MidiPlayer.java"/>