diff build.xml @ 34:3fead3e53b4a

Split the build file in two: build.xml (default) and build-isvr.xml (which assumes you have the isvr.jar file avaiulable).

Changed the installation intructions accordingly.

--- a/build.xml	Tue Dec 10 17:52:41 2013 +0000
+++ b/build.xml	Tue Dec 10 18:43:20 2013 +0000
@@ -4,49 +4,26 @@
     </description>
 
   <!-- set global properties for this build -->
-  <property name="matlab-src" location="mcode/human-echolocation"/>
-  <property name="matlab-build" location="scratch"/>
   <property name="lib" location="WebContent/WEB-INF/lib"/>
   <property name="src" location="src"/>
   <property name="classes" location="WebContent/WEB-INF/classes"/>
   <property name="web.dir" location="WebContent"/>
   <property name="war.file"  location="echoapp.war"/>
 
-  <uptodate property="matlabCompile.notRequired" targetfile="${matlab-build}/isvr.jar" >
-    <srcfiles dir= "${matlab-src}" includes="*.m"/>
-    <srcfiles dir= "${matlab-src}/private" includes="*.m"/>
-  </uptodate>
-
   <uptodate property="warBuild.notRequired" targetfile="${war.file}" >
     <srcfiles dir= "${classes}" includes="*.class"/>
     <srcfiles dir= "${src}" includes="*.java" />
     <srcfiles dir= "${web.dir}" includes="*.jsp"/>
     <srcfiles dir= "${web.dir}" includes="*.css"/>
     <srcfiles dir= "${web.dir}" includes="*.xml" />
-    <srcfiles dir= "${web.dir}/script" includes="*.js" />
-    <srcfiles dir= "${web.dir}/script" includes="*.js" />
   </uptodate>
 
   <target name="init">
     <!-- Create the time stamp -->
     <tstamp/>
-    <!-- Create the build directory structure used by compile -->
-    <mkdir dir="${matlab-build}"/>
   </target>
 
-  <target name="compile-matlab" depends="init" unless="matlabCompile.notRequired"
-    description="compile the MATLAB source" >
-
-    <exec executable="/Applications/MATLAB_R2013b.app/bin/mcc">
-      <!-- Will create the java package with the HumanEcho class -->
-      <arg line='-W "java:uk.ac.soton.isvr,HumanEcho" -d ${matlab-build} -T "link:lib" -v "class{HumanEcho:${matlab-src}/simulateBinauralSignals.m}"'/>
-    </exec>
-
-    <!-- Copy the generated jar to the lib folder -->
-    <copy file="${matlab-build}/isvr.jar" tofile="${lib}/isvr.jar" overwrite="true" />
-  </target>
-
-  <target name="build" depends="compile-matlab">
+  <target name="build">
     <javac srcdir="${src}" destdir="${classes}" classpath="servlet-api.jar:${lib}/javabuilder.jar:${lib}/isvr.jar:${lib}/log4j-1.2.17.jar" includeantruntime="false"/>
   </target>