[Rubyeclipse-commit] org.rubypeople.rdt.build/bootstrap customTargets.xml,1.7,1.8

[Markus B. <mba...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15796/bootstrap

Modified Files:
	customTargets.xml 
Log Message:
create updateSite before tests, several small changes

Index: customTargets.xml
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap/customTargets.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** customTargets.xml	27 Mar 2005 11:32:38 -0000	1.7
--- customTargets.xml	28 Mar 2005 14:12:36 -0000	1.8
***************
*** 41,45 ****
  	<!-- ===================================================================== -->
  	<target name="getMapFiles">
- 		<property name="mapVersionTag" value="HEAD" />
  		<antcall target="getMapFilesWithExtMethod"/>
  		<antcall target="getMapFilesWithPserverMethod"/>
--- 41,44 ----
***************
*** 138,146 ****
  	<!-- Steps to do after the build is done. -->
  	<!-- ===================================================================== -->
! 	<target name="postBuild">
! 		<antcall target="test"/>
  		<property name="UpdateSiteStagingLocation" value="${buildDirectory}/updateSite"/>
  		<property name="sitePackagePrefix" value="org.rubypeople.updatesite"/>
  		<antcall target="generateUpdateSite"/>
  	</target>
  	<!-- ===================================================================== -->
--- 137,145 ----
  	<!-- Steps to do after the build is done. -->
  	<!-- ===================================================================== -->
! 	<target name="postBuild">		
  		<property name="UpdateSiteStagingLocation" value="${buildDirectory}/updateSite"/>
  		<property name="sitePackagePrefix" value="org.rubypeople.updatesite"/>
  		<antcall target="generateUpdateSite"/>
+ 		<antcall target="test"/>
  	</target>
  	<!-- ===================================================================== -->
***************
*** 149,154 ****
  	<target name="test" unless="dontRunTests">
  		<echo message="Setting up tests in ${eclipseAutomatedTestHome}"/>
  		<copy file="${buildDirectory}/${buildLabel}/org.rubypeople.rdt-${buildId}.zip" tofile="${eclipseAutomatedTestHome}/eclipse-SDK-RDT-${buildId}.zip" />
! 		<copy file="${buildDirectory}/${buildLabel}/org.rubypeople.rdt-tests-${buildId}.zip" tofile="${eclipseAutomatedTestHome}/eclipse-junit-tests-rdt-${buildId}.zip" />
  		<ant antfile="${eclipseAutomatedTestHome}/test.xml" target="runtests" dir="${eclipseAutomatedTestHome}">
  			<property name="os" value="${baseos}" />
--- 148,156 ----
  	<target name="test" unless="dontRunTests">
  		<echo message="Setting up tests in ${eclipseAutomatedTestHome}"/>
+ 		<delete>
+ 			<fileset dir="${eclipseAutomatedTestHome}" includes="**/*RDT*.zip"/>
+ 		</delete>
  		<copy file="${buildDirectory}/${buildLabel}/org.rubypeople.rdt-${buildId}.zip" tofile="${eclipseAutomatedTestHome}/eclipse-SDK-RDT-${buildId}.zip" />
! 		<copy file="${buildDirectory}/${buildLabel}/org.rubypeople.rdt-tests-${buildId}.zip" tofile="${eclipseAutomatedTestHome}/eclipse-junit-tests-RDT-${buildId}.zip" />
  		<ant antfile="${eclipseAutomatedTestHome}/test.xml" target="runtests" dir="${eclipseAutomatedTestHome}">
  			<property name="os" value="${baseos}" />
***************
*** 195,199 ****
  		<echo file="${UpdateSiteStagingLocation}/site.xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt; 
  			&lt;site&gt; 
! 			&lt;description url=&quot;http://rubyeclipse.sourceforge.net/updatesite/nightly/&quot;&gt; The Ruby Development 
  			Tools update site. &lt;/description&gt; 
  			&lt;feature url=&quot;features/org.rubypeople.rdt_${featureVersion}.jar&quot; id=&quot;org.rubypeople.rdt&quot; version=&quot;${featureVersion}&quot;&gt; &lt;category 
--- 197,201 ----
  		<echo file="${UpdateSiteStagingLocation}/site.xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt; 
  			&lt;site&gt; 
! 			&lt;description url=&quot;http://rubyeclipse.sourceforge.net/nightlyBuild/updateSite/&quot;&gt; The Ruby Development 
  			Tools update site. &lt;/description&gt; 
  			&lt;feature url=&quot;features/org.rubypeople.rdt_${featureVersion}.jar&quot; id=&quot;org.rubypeople.rdt&quot; version=&quot;${featureVersion}&quot;&gt; &lt;category