You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ha...@apache.org on 2005/07/05 21:28:04 UTC

cvs commit: ws-axis/c build.xml

hawkeye     2005/07/05 12:28:04

  Modified:    c        build.xml
  Log:
  Created buildAndRunUnitTests target. this target is going to be the default target when I'm sure that it works OK for everyone.
  
  Revision  Changes    Path
  1.26      +37 -1     ws-axis/c/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- build.xml	14 Jun 2005 04:08:56 -0000	1.25
  +++ build.xml	5 Jul 2005 19:28:04 -0000	1.26
  @@ -48,7 +48,6 @@
   	<import file="${basedir}/build/buildWSDL2Ws.xml"/>
   	<import file="${basedir}/build/buildDocumentation.xml"/>
   
  -
       <target name="buildVersionResource" if="windows">
           <delete>
               <fileset dir="${basedir}/build">
  @@ -213,6 +212,43 @@
   		<antcall target="buildAll" inheritall="true"/>
   	</target>
   
  +	<target name="buildAndRunUnitTests" depends="initialize">
  +		<description>
  +			Calls the buildAll target and then runs the unit tests by calling the callRunUnitTests target.
  +		</description>
  +
  +		<antcall target="buildAll" inheritall="true"/>
  +
  +		<antcall target="callRunUnitTests" inheritall="false">
  +			<param name="dir.properties" value="${basedir}"/>
  +			<param name="dir.obj" value="${dir.obj}"/>
  +			<param name="dir.include" value="${dir.include}"/>
  +		</antcall>
  +	</target>
  +	
  +	
  +	<target name="callRunUnitTests" depends="initialize">
  +		<description>
  +			This target calls the unit test.xml file with the correct properties that are 
  +	a combination of whatever the build has been run with and a refresh from test properties and build properties.
  +		</description>
  +	
  +		<!-- load platform specific test override properties -->
  +		<property name="dir.release" value="${dir.obj}"/>
  +		<property name="dir.wsdl2ws" value="${dir.release}/classes"/>
  +		<property name="test.include" value="${dir.include}"/>
  +		<property name="dir.xmlParser" value="${env.XERCES_HOME}/bin${path.separator}${env.XERCES_HOME}/lib"/>
  +			
  +		<property file="${dir.properties}/version.properties" />
  +		<property file="${dir.properties}/test.${platform}.properties" />
  +	
  +		<!-- also need build.properties -->
  +		<property file="${dir.properties}/build/build.${platform}.properties" />
  +        <property file="${dir.properties}/build/build.common.properties" />
  +
  +		<ant dir="." antFile="unitTest.xml" inheritAll="true"/>
  +	</target>
  +
   	<target name="buildWithTrace" depends="initialize"
    	 description="Build traced runtime libraries, WSDL2Ws tool and API Documentation">
   		<antcall target="addTrace" inheritall="true"/>