[Rubyeclipse-commit] org.rubypeople.rdt.build/cruiseControl build-RDT.xml,1.2,1.3 customTargets.xml,1.4,1.5

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

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

Modified Files:
	build-RDT.xml customTargets.xml 
Log Message:
replacement of update site URL changed for prd releases. changes for 0.7.0


Index: customTargets.xml
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/cruiseControl/customTargets.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** customTargets.xml	8 Jan 2006 15:19:49 -0000	1.4
--- customTargets.xml	20 Jan 2006 01:52:39 -0000	1.5
***************
*** 97,100 ****
--- 97,101 ----
  
  		<antcall target="replaceVersions"/>		
+ 		<antcall target="setUpdateSiteURL"/>		
  		<replace file="${buildDirectory}/features/org.rubypeople.rdt/feature.xml">
  			<replacefilter token="&lt;!--@@INCLUDES@@--&gt;" value="&lt;includes id=&quot;org.rubypeople.rdt.source&quot; version=&quot;${featureVersion}&quot;/&gt;"/>
***************
*** 106,120 ****
  	
  	<target name="replaceVersions" if="baseFeatureVersion">
- 		<condition property="updateSiteUrl" 
- 				value="${nightlyBuildUpdateSiteURL}" 
- 				else="${integrationBuildUpdateSiteURL}">
- 			<isset property="isNightlyBuild"/>
- 		</condition>
  		<echo message="Nightly or integration build: replacing version ${baseFeatureVersion} with ${featureVersion}"/>
- 		<echo message="Setting update-site URL: ${updateSiteUrl}"/>
  		<replace dir="${buildDirectory}/features">
  			<include name="org.rubypeople.*/feature.xml"/>
  			<replacefilter token="${baseFeatureVersion}" value="${featureVersion}" />
- 			<replacefilter token="${releaseUpdateSiteURL}" value="${updateSiteUrl}" />						
  		</replace>
  		<replace dir="${buildDirectory}/plugins">
--- 107,114 ----
***************
*** 127,130 ****
--- 121,140 ----
  		</replace>				
  	</target>
+ 
+ 	<target name="setUpdateSiteURL" if="isNightlyOrIntegrationBuild">
+ 
+ 		<!-- do not replace the update site URL if it is a release build -->
+ 		<condition property="updateSiteUrl" 
+ 				value="${nightlyBuildUpdateSiteURL}" 
+ 				else="${integrationBuildUpdateSiteURL}">
+ 			<isset property="isNightlyBuild"/>
+ 		</condition>
+ 		<echo message="Setting update-site URL: ${updateSiteUrl}"/>
+ 		<replace dir="${buildDirectory}/features">
+ 			<include name="org.rubypeople.*/feature.xml"/>
+ 			<replacefilter token="${releaseUpdateSiteURL}" value="${updateSiteUrl}" />						
+ 		</replace>
+ 	</target>
+ 	
  	<!-- ===================================================================== -->
  	<!-- Steps to do before generating the build scripts. -->

Index: build-RDT.xml
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/cruiseControl/build-RDT.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build-RDT.xml	29 Dec 2005 09:45:25 -0000	1.2
--- build-RDT.xml	20 Jan 2006 01:52:39 -0000	1.3
***************
*** 66,70 ****
--- 66,86 ----
  	</target>
  
+ 	<target name="0.7.0">
+ 		<property name="cvsLabel" value="R2006-01-19_0-7-0"/>
+ 		<property name="label" value="0.7.0.601192300PRD"/>
+ 		<antcall target="release"/>
+ 	</target>
+ 
+ 	<target name="release">
+ 		<property name="buildType" value="-DbuildType='S'"/>
+ 		<antcall target="manual-build"/>
+ 	</target>
+ 
  	<target name="integration">
+ 		<property name="buildType" value="-DbuildType='I'"/>
+ 		<antcall target="manual-build"/>
+ 	</target>
+ 
+ 	<target name="manual-build">
  		<!-- the only difference to a nightly build is the buildType which leads to setting a differnt
  		updateSiteUrl in feature.xml -->
***************
*** 72,76 ****
  		<!-- properties which should override the values of org.rubypeople.rdt/bootstrap/build.properties must be
  		specified via -D arguments for the call to eclipseRunner -->
! 		<property name="extraArgs" value="-DbuildType='I' -DfetchTag=${cvsLabel}"/>
  		<property file="build-RDT.properties" />
  		<antcall target="clean"/>
--- 88,92 ----
  		<!-- properties which should override the values of org.rubypeople.rdt/bootstrap/build.properties must be
  		specified via -D arguments for the call to eclipseRunner -->
! 		<property name="extraArgs" value="${buildType} -DfetchTag=${cvsLabel}"/>
  		<property file="build-RDT.properties" />
  		<antcall target="clean"/>