[jboss-cvs] jboss-seam/build ...

[Peter Muir]

  User: pmuir   
  Date: 07/09/24 09:12:52

  Modified:    build    utilities.build.xml common.build.xml
                        default.build.properties
  Log:
  Better version number control
  
  Revision  Changes    Path
  1.7       +2 -2      jboss-seam/build/utilities.build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: utilities.build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/utilities.build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- utilities.build.xml	22 Sep 2007 15:39:12 -0000	1.6
  +++ utilities.build.xml	24 Sep 2007 13:12:52 -0000	1.7
  @@ -17,7 +17,7 @@
   			<mkdir dir="@{todir}" />
   			<copy file="@{value}" tofile="@{tofile}" overwrite="on" verbose="false">
   				<filterset>
  -					<filter token="seam.version" value="${version}.${patchlevel}" />
  +					<filter token="seam.version" value="${complete.version}" />
   				</filterset>
   			</copy>
   			<property name="@{name}" value="@{tofile}" />
  @@ -124,7 +124,7 @@
   				<sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
   				<sysproperty key="maven.home" value="${maven.dir}" />
   				<arg line="-f @{pom}" />
  -				<arg line="-Dseam.version=${version}.${patchlevel}" />
  +				<arg line="-Dseam.version=${complete.version}" />
   				<args />
   				<arg line="@{target}" />
   			</java>
  
  
  
  1.6       +15 -9     jboss-seam/build/common.build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: common.build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/common.build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- common.build.xml	24 Sep 2007 09:40:12 -0000	1.5
  +++ common.build.xml	24 Sep 2007 13:12:52 -0000	1.6
  @@ -46,18 +46,24 @@
   	<!-- Load default build properties -->
   	<property file="${build.dir}/default.build.properties" />
   
  +	<!-- Construct the version numbers -->
  +	<property name="version" value="${major.version}${minor.version}" />
  +	<property name="level" value="${patchlevel}${qualifier}" />
  +	
   	<!-- Set the version if not set in build.properties -->
   	<condition property="version" value="${DSTAMP}">
   		<not>
   			<isset property="version" />
   		</not>
   	</condition>
  -	<condition property="patchlevel" value="${TSTAMP}">
  +	<condition property="level" value="${TSTAMP}">
   		<not>
  -			<isset property="patchelevel" />
  +			<isset property="level" />
   		</not>
   	</condition>
   
  +	<property name="complete.version" value="${version}${level}" />
  +	
   	<condition property="mavenized.property">
   		<not>
   			<equals arg1="${mavenized}" arg2="false" />
  @@ -102,13 +108,13 @@
   
   	<target name="copyseam" if="mavenized.property" unless="copyseamdone" depends="initcopy, initpoms">
   		<artifact:dependencies filesetId="seam.fileset" versionsId="seam.versions">
  -			<dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="${version}.${patchlevel}" />
  -			<dependency groupId="org.jboss.seam" artifactId="jboss-seam-debug" version="${version}.${patchlevel}" />
  -			<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ioc" version="${version}.${patchlevel}" />
  -			<dependency groupId="org.jboss.seam" artifactId="jboss-seam-mail" version="${version}.${patchlevel}" />
  -			<dependency groupId="org.jboss.seam" artifactId="jboss-seam-pdf" version="${version}.${patchlevel}" />
  -			<dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${version}.${patchlevel}" />
  -			<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ui" version="${version}.${patchlevel}" />
  +			<dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="${complete.version}" />
  +			<dependency groupId="org.jboss.seam" artifactId="jboss-seam-debug" version="${complete.version}" />
  +			<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ioc" version="${complete.version}" />
  +			<dependency groupId="org.jboss.seam" artifactId="jboss-seam-mail" version="${complete.version}" />
  +			<dependency groupId="org.jboss.seam" artifactId="jboss-seam-pdf" version="${complete.version}" />
  +			<dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" />
  +			<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ui" version="${complete.version}" />
   		</artifact:dependencies>
   		<copy todir="${lib.dir}">
   			<fileset refid="seam.fileset" />
  
  
  
  1.2       +4 -2      jboss-seam/build/default.build.properties
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: default.build.properties
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/default.build.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- default.build.properties	24 Sep 2007 09:40:12 -0000	1.1
  +++ default.build.properties	24 Sep 2007 13:12:52 -0000	1.2
  @@ -3,8 +3,10 @@
   #
   # Seam Version
   # ------------
  -version = 2.0
  -patchlevel = 0.CR1
  +major.version 2
  +minor.version .0
  +patchlevel .0
  +qualifier -SNAPSHOT
   #
   # Other program locations
   # -----------------------