[jboss-cvs] jbosside/releng/org.jboss.ide.eclipse.releng/builders/product ...

[Marshall Culpepper]

  User: mculpepper
  Date: 06/08/10 03:54:58

  Modified:    releng/org.jboss.ide.eclipse.releng/builders/product 
                        productBuild.xml
  Log:
  added support for subversion tags (using the %svnURL% token in svn maps)
  
  Revision  Changes    Path
  1.35      +27 -0     jbosside/releng/org.jboss.ide.eclipse.releng/builders/product/productBuild.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: productBuild.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/releng/org.jboss.ide.eclipse.releng/builders/product/productBuild.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -b -r1.34 -r1.35
  --- productBuild.xml	1 Jul 2006 18:41:22 -0000	1.34
  +++ productBuild.xml	10 Aug 2006 07:54:58 -0000	1.35
  @@ -147,11 +147,18 @@
   		<attribute name="builder"/>
   		<sequential>
   			<var name="cvsTag" unset="true"/>
  +			<var name="svnURL" unset="true"/>
   			<if>
   	  			<equals arg1="${product.buildDesc}" arg2="release"/>
   	  			<then>
   	  				<propertycopy override="true" name="builder.version" from="versionTags.@{builder}"/>
   	  				<propertycopy override="true" name="cvsTag" from="versionTags.@{builder}.cvs"/>
  +	  				<if>
  +	  					<isset property="versiontags.@{builder}.svn"/>
  +	  					<then>
  +	  						<propertycopy override="true" name="svnURL" from="versionTags.@{builder}.svn"/>
  +	  					</then>
  +	  				</if>
   	  			</then>
   	  			<else>
   	  				<if>
  @@ -161,6 +168,26 @@
   	  					</then>
   	  					<else>
   		  					<propertycopy override="true" name="cvsTag" from="default.cvs.tag"/>
  +	  						<loadproperties srcFile="${builder.root}/@{builder}/build.properties">
  +								<filterchain>
  +									<linecontains>
  +										<contains value="defaultSvnUrl"/>
  +									</linecontains>
  +									<prefixlines prefix="@{builder}"/>
  +								</filterchain>
  +							</loadproperties>
  +	  						<if>
  +	  							<isset property="@{builder}.svn"/>
  +	  							<then>
  +	  								<propertycopy override="true" name="svnURL" from="@{builder}.svn"/>
  +	  							</then>
  +	  							<elseif>
  +	  								<isset property="@{builder}.defaultSvnUrl"/>
  +	  								<then>
  +		  								<propertycopy override="true" name="svnURL" from="@{builder}.defaultSvnUrl"/>
  +	  								</then>
  +	  							</elseif>
  +	  						</if>
   	  					</else>
   	  				</if>
   	  				<property name="builder.version" value="${product.versionTag}"/>