Project

General

Profile

Revision 4435

Added by daigle over 12 years ago

added testPrepare target which copies server test files into the war if the test.build property is set to true in build.properties

View differences:

build.xml
39 39
  <condition property="enable.ecogrid">
40 40
    <equals arg1="${install.ecogrid}" arg2="true" />
41 41
  </condition>
42
	
43
   <condition property="enable.testBuild">
44
      <equals arg1="${test.build}" arg2="true" />   	 
45
   </condition>
42 46

  
43 47
   <target name="config">
44 48
   	  <property name="jsdk" value="${build.tomcat.dir}/common/lib/servlet-api.jar"/>
......
115 119
      <property name="eml-css"             value="eml_xsl.css"/>
116 120
      <property name="eml-module.default.css"
117 121
                                           value="default.css"/>
122
   	<property name="systemidserver"             value=""/>
123
   	<property name="html-path"             value=""/>
124
   	
118 125
   	  
119 126
      <!-- Config for registry variables -->
120 127
      <!-- TODO: SCW remove these, covered in metacat.properties or in skin.properties --> 
......
709 716
       </war>
710 717
   </target>
711 718
	
712
   <target name="warPrepare" depends="cgiPrepare,jar,clientjar,harvesterjar"
719
   <target name="warPrepare" depends="cgiPrepare,jar,clientjar,harvesterjar,testPrepare"
713 720
            description="Prepare files for creating a web archive (WAR)">
714 721

  
715 722
       <property name="war.lib" value="${build.war}/lib" />
......
838 845
		</exec>
839 846
		<exec dir="src/perl/Metacat/" command="make" />
840 847
	</target>
848
	
849
	<target name="testPrepare" if="enable.testBuild"
850
		description="Copies test files into the war directories">
851
		<echo>in testPrepare</echo>
852
		<property name="war.context.test" value="${build.war}/${metacat.context}/test" />
853
		<mkdir dir="${war.context.test}" />
854
	    <copy todir="${war.context.test}" filtering="yes">
855
		   <fileset dir="test/servertestfiles">
856
	          <include name="*/**"/>
857
		   </fileset>
858
		</copy>
859
	</target>
841 860

  
842 861
   <target name="getConversionXSL" depends="prepare"
843 862
            unless="styles.not.needed"

Also available in: Unified diff