[WebMacro-cvs] webmacro/webmacro build.xml,1.55,1.56

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/webmacro
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5107

Modified Files:
	build.xml 
Log Message:
Use testOutput directory for test output

Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/webmacro/build.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** build.xml	23 Feb 2010 23:12:12 -0000	1.55
--- build.xml	23 Feb 2010 23:24:00 -0000	1.56
***************
*** 61,72 ****
      <property name="examples"       value="examples"/>
      <property name="jar"            value="${app.name}.jar"/>
-     <property name="adapters-jar"   value="${app.name}-adapters.jar"/>
      <property name="src.jar"        value="${app.name}-src.jar"/>
      <property environment="ENV" />
      <property name="javacc.home"    value="${ENV.JAVACC_HOME}" />
  
!     <property name="testTarget" value="test/target"/>
!     <property name="testClasses" value="${testTarget}/test-classes"/>
!     <property name="testReports" value="${testTarget}/test-reports"/>
      <property name="test" value="Test*"/>
  
--- 61,71 ----
      <property name="examples"       value="examples"/>
      <property name="jar"            value="${app.name}.jar"/>
      <property name="src.jar"        value="${app.name}-src.jar"/>
      <property environment="ENV" />
      <property name="javacc.home"    value="${ENV.JAVACC_HOME}" />
  
!     <property name="testOutput"     value="testOutput"/>
!     <property name="testClasses"    value="${testOutput}/test-classes"/>
!     <property name="testReports"    value="${testOutput}/test-reports"/>
      <property name="test" value="Test*"/>
  
***************
*** 95,113 ****
      </taskdef>
  
-     <target name="prepare">
-         <tstamp />
-         <mkdir  dir="${classes}"/>
-         <mkdir  dir="${javadoc}"/>
-         <mkdir  dir="${dist.binary}"/>
-         <mkdir  dir="${examples}/WEB-INF/classes"/>
-         <mkdir  dir="${examples}/WEB-INF/lib"/>
-         <mkdir  dir="${dist.binary}"/>
-         <mkdir  dir="${dist.source}"/>
-         <available property="javacc.present" classname="org.javacc.parser.Main"
-             classpath="${javacc.home}/javacc.jar" />
-         <!-- <available property="javacc.present" classname="COM.sun.labs.javacc.Main" classpath="${javacc.home}/JavaCC.zip" /> -->
-     </target>
- 
- 
      <target name="clean" >
          <delete dir="${classes}"/>
--- 94,97 ----
***************
*** 121,129 ****
          <delete file="${jar}"/>
          <delete file="${src.jar}"/>
-         <delete file="${adapters-jar}"/>
          <delete dir="${tmpdir}"/>
          <delete dir="${examples}/WEB-INF/classes" />
          <delete dir="${examples}/WEB-INF/lib" />
          
          <delete dir="${testClasses}"/>
          <delete dir="${testReports}"/>
--- 105,113 ----
          <delete file="${jar}"/>
          <delete file="${src.jar}"/>
          <delete dir="${tmpdir}"/>
          <delete dir="${examples}/WEB-INF/classes" />
          <delete dir="${examples}/WEB-INF/lib" />
          
+         <delete dir="${testOutput}"/>
          <delete dir="${testClasses}"/>
          <delete dir="${testReports}"/>
***************
*** 142,145 ****
--- 126,144 ----
      </target>
  
+     <target name="prepare">
+         <tstamp />
+         <mkdir  dir="${classes}"/>
+         <mkdir  dir="${javadoc}"/>
+         <mkdir  dir="${dist.binary}"/>
+         <mkdir  dir="${examples}/WEB-INF/classes"/>
+         <mkdir  dir="${examples}/WEB-INF/lib"/>
+         <mkdir  dir="${dist.binary}"/>
+         <mkdir  dir="${dist.source}"/>
+         <available property="javacc.present" classname="org.javacc.parser.Main"
+             classpath="${javacc.home}/javacc.jar" />
+         <!-- <available property="javacc.present" classname="COM.sun.labs.javacc.Main" classpath="${javacc.home}/JavaCC.zip" /> -->
+     </target>
+ 
+ 
      <target name='javacc' depends='prepare' if='javacc.present'>
          <javacc target="${sourceDir}/org/webmacro/parser/WMParser_impl.jj" javacchome="${javacc.home}" />