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

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

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

Modified Files:
	build.properties customTargets.xml 
Log Message:
added comments


Index: customTargets.xml
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/cruiseControl/customTargets.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** customTargets.xml	20 Jan 2006 01:52:39 -0000	1.5
--- customTargets.xml	5 Feb 2006 16:40:58 -0000	1.6
***************
*** 107,115 ****
  	
  	<target name="replaceVersions" if="baseFeatureVersion">
! 		<echo message="Nightly or integration build: replacing version ${baseFeatureVersion} with ${featureVersion}"/>
  		<replace dir="${buildDirectory}/features">
  			<include name="org.rubypeople.*/feature.xml"/>
  			<replacefilter token="${baseFeatureVersion}" value="${featureVersion}" />
  		</replace>
  		<replace dir="${buildDirectory}/plugins">
  			<include name="org.rubypeople.*/plugin.xml"/>
--- 107,119 ----
  	
  	<target name="replaceVersions" if="baseFeatureVersion">
! 		<echo message="Replacing version in the feature files: replacing ${baseFeatureVersion} with ${featureVersion}"/>
! 		<!-- make sure to select the test feature file as well -->
  		<replace dir="${buildDirectory}/features">
  			<include name="org.rubypeople.*/feature.xml"/>
  			<replacefilter token="${baseFeatureVersion}" value="${featureVersion}" />
  		</replace>
+ 		<!-- in a manual build started with export from the feature.xml, there is no
+ 			need to replace the versions in the plugin.xml files if they are set to 0.0.0,
+ 			but here it needs to be -->
  		<replace dir="${buildDirectory}/plugins">
  			<include name="org.rubypeople.*/plugin.xml"/>
***************
*** 119,123 ****
  			<include name="org.rubypeople.*/META-INF/MANIFEST.MF"/>
  			<replacefilter token="Bundle-Version: ${baseFeatureVersion}" value="Bundle-Version: ${featureVersion}" />
! 		</replace>				
  	</target>
  
--- 123,127 ----
  			<include name="org.rubypeople.*/META-INF/MANIFEST.MF"/>
  			<replacefilter token="Bundle-Version: ${baseFeatureVersion}" value="Bundle-Version: ${featureVersion}" />
! 		</replace>	
  	</target>
  

Index: build.properties
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/cruiseControl/build.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.properties	29 Dec 2005 09:45:25 -0000	1.2
--- build.properties	5 Feb 2006 16:40:58 -0000	1.3
***************
*** 113,117 ****
  # The baseFeatureVersion must be set, because it is used to replace the version in the
  # feature.xml files of the rdt feature.xml and the test feature.xml with the created featureVersion
! baseFeatureVersion=0.6.0
  
  # B) Every other Build type
--- 113,117 ----
  # The baseFeatureVersion must be set, because it is used to replace the version in the
  # feature.xml files of the rdt feature.xml and the test feature.xml with the created featureVersion
! baseFeatureVersion=0.0.0
  
  # B) Every other Build type
***************
*** 124,127 ****
--- 124,130 ----
  # customTargets.xml. The featureVersion consists of the nightlyBuildFeatureVersionPrefix 
  # concatenated with a timestamp in the format yyyyMMddhhmm
+ # Please mind that this property is not used from cruiseControl. CruiseControl needs to 
+ # calculate the build label by its own with a label incrementer. See config.xml for
+ # how to change the prefix for the eclipse label incrementer
  nightlyBuildFeatureVersionPrefix=0.7.0.