r4550 - trunk

[daigle at ecoinformatics.org]

Author: daigle
Date: 2008-11-10 15:30:29 -0800 (Mon, 10 Nov 2008)
New Revision: 4550

Modified:
   trunk/build.xml
Log:
Remove test.build property.  All test driver files are now included in build.

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-11-10 23:24:14 UTC (rev 4549)
+++ trunk/build.xml	2008-11-10 23:30:29 UTC (rev 4550)
@@ -39,10 +39,6 @@
   <condition property="enable.ecogrid">
     <equals arg1="${install.ecogrid}" arg2="true" />
   </condition>
-	
-   <condition property="enable.testBuild">
-      <equals arg1="${test.build}" arg2="true" />   	 
-   </condition>
 
    <target name="config">
    	  <property name="jsdk" value="${build.tomcat.dir}/common/lib/servlet-api.jar"/>
@@ -862,7 +858,7 @@
 		<exec dir="src/perl/Metacat/" command="make" />
 	</target>
 	
-	<target name="testPrepare" if="enable.testBuild"
+	<target name="testPrepare"
 		description="Copies test files into the war directories">
 		<echo>in testPrepare</echo>
 		<property name="war.context.test" value="${build.war}/${metacat.context}/test" />
@@ -1146,13 +1142,13 @@
       <delete dir="./${ver.dir}/${build.dir}"/>
       <delete dir="./${ver.dir}/dist"/>
       -->
-      <delete file="./${name}-${release}.zip"/>
+      <!-- delete file="./${name}-${release}.zip"/>
       <zip zipfile="./${name}-${release}.zip" basedir="${dist.dir}" excludes="${name}-${release}/src/**, ${name}-${release}/build/src/**"/>
       <delete file="./${name}-${release}.tar.gz" />
       <tar tarfile="./${name}-${release}.tar" basedir="${dist.dir}" excludes="${name}-${release}/src/**, ${name}-${release}/build/src/**"/>
       <gzip zipfile="./${name}-${release}.tar.gz"
                 src="./${name}-${release}.tar"/>
-      <delete file="./${name}-${release}.tar" />
+      <delete file="./${name}-${release}.tar" / -->
   </target>
 
 	<target name="distbin" depends="install-ecogrid,war" description="prepares a binary distribution">