[jboss-cvs] jboss-seam ...

[Peter Muir]

  User: pmuir   
  Date: 07/06/25 13:23:26

  Modified:    jboss-seam  build.xml
  Log:
   date/time for version/patchlevel if not specifiecd in build.properties
  
  Revision  Changes    Path
  1.210     +82 -70    jboss-seam/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build.xml,v
  retrieving revision 1.209
  retrieving revision 1.210
  diff -u -b -r1.209 -r1.210
  --- build.xml	25 Jun 2007 16:24:28 -0000	1.209
  +++ build.xml	25 Jun 2007 17:23:26 -0000	1.210
  @@ -6,6 +6,7 @@
   	
   	<tstamp />
   
  +
   	<!-- Allow this to be overriden by others importing this project. -->
   	<dirname property="imported.basedir" file="${ant.file.Seam}" />
   
  @@ -29,6 +30,18 @@
   	<!-- Give user a chance to override without editing this file or typing -D -->
   	<property file="${imported.basedir}/build.properties" />
   
  +	<condition property="version" value="${DSTAMP}">
  +		<not>
  +			<isset property="version" />
  +		</not>
  +	</condition>
  +	<condition property="patchlevel" value="${TSTAMP}">
  +		<not>
  +			<isset property="patchelevel" />
  +		</not>
  +	</condition>
  +
  +
   	<!-- Name of project and version, used to create filenames -->
   	<property name="Name" value="JBoss Seam" />
   	<property name="name" value="jboss-seam" />
  @@ -153,11 +166,11 @@
   	</zipfileset>
   
   	<zipfileset id="example.gwt.jar" dir="${lib.dir}" description="The GWT runtime">
  -		<include name="gwt-servlet.jar" if="example.gwt.lib"/>
  +		<include name="gwt-servlet.jar" if="example.gwt.lib" />
   	</zipfileset>	
   
           <zipfileset id="example.quartz.jar" dir="${lib.dir}" description="The Quartz Jar">
  -                <include name="quartz-1.6.0.jar" if="example.quartz.lib"/>
  +		<include name="quartz-1.6.0.jar" if="example.quartz.lib" />
           </zipfileset>
   	
   	<!-- prefix="WEB-INF/lib" -->
  @@ -183,12 +196,12 @@
   	</zipfileset>
   	
   	<zipfileset id="example.trinidad.impl.jar" dir="${trinidad.lib.dir}" prefix="WEB-INF/lib" description="trinidad implementation">
  -		<include name="trinidad-impl-*.jar" if="example.trinidad.lib"/>
  +		<include name="trinidad-impl-*.jar" if="example.trinidad.lib" />
   		<include name="a4j-trinidad.jar" if="example.trinidad.lib and example.ajax4jsf.lib" />
   	</zipfileset>
   	
   	<zipfileset id="example.trinidad.api.jar" dir="${trinidad.lib.dir}"  description="trinidad api">
  -		<include name="trinidad-api-*.jar"/>
  +		<include name="trinidad-api-*.jar" />
   	</zipfileset>
   
   	<zipfileset id="example.extra.jar" dir="${lib.dir}" description="extra jars for the EAR">
  @@ -284,15 +297,15 @@
   	</zipfileset>
   
   	<patternset id="meldware.undeploy">
  -		<include name="_calendar.ear"  if="example.seam.meldware"/>
  -		<include name="_mail.ear"  if="example.seam.meldware"/>
  +		<include name="_calendar.ear" if="example.seam.meldware" />
  +		<include name="_mail.ear" if="example.seam.meldware" />
   		<include name="meldwarebase.sar" if="example.seam.meldware" />
  -		<include name="webadmin.war"  if="example.seam.meldware"/>
  -		<include name="webmail.war"  if="example.seam.meldware"/>
  +		<include name="webadmin.war" if="example.seam.meldware" />
  +		<include name="webmail.war" if="example.seam.meldware" />
   	</patternset>
   	
   	<patternset id="meldware.mail.undeploy">
  -		<include name="_mail.ear"  if="example.seam.meldware.mail"/>
  +		<include name="_mail.ear" if="example.seam.meldware.mail" />
   		<include name="meldwarebase.sar" if="example.seam.meldware.mail" />
   	</patternset>
   
  @@ -318,9 +331,9 @@
   		<exclude name="servlet-api.jar" />
   		<exclude name="ant*.jar" />
   		<exclude name="testng-*.jar" />
  -		<exclude name="jboss-embedded-all.jar"/>
  -		<exclude name="hibernate-all.jar"/>
  -		<exclude name="thirdparty-all.jar"/>
  +		<exclude name="jboss-embedded-all.jar" />
  +		<exclude name="hibernate-all.jar" />
  +		<exclude name="thirdparty-all.jar" />
   	</zipfileset>
   
   	<zipfileset id="example.tomcat.seam.jar" prefix="WEB-INF/lib" dir="${imported.basedir}">
  @@ -380,7 +393,7 @@
   	</path>
   
   	<fileset id="eejb.conf" dir="${eejb.conf.dir}">
  -		<include name="**/*.*"/>
  +		<include name="**/*.*" />
   	</fileset>
   
   	<patternset id="meta.files">
  @@ -882,8 +895,7 @@
   				<patternset refid="meta.files" />
   			</fileset>
   		</copy>
  -		<copy file="${eejb.conf.dir}/readme.txt" 
  -			 todir="${dist.eejb.conf.dir}" />
  +		<copy file="${eejb.conf.dir}/readme.txt" todir="${dist.eejb.conf.dir}" />
   
   		<copy todir="${dist.drools.dir}">
   			<fileset dir="${drools.dir}">
  @@ -907,9 +919,9 @@
   		<mkdir dir="${dist.trinidad.dir}" />
   		<copy todir="${dist.trinidad.dir}">
   			<fileset dir="${trinidad.dir}">
  -				<exclude name="build/**"/>
  -				<exclude name="examples/**/exploded-archives/**"/>
  -				<exclude name="examples/**/test-build/**"/>
  +				<exclude name="build/**" />
  +				<exclude name="examples/**/exploded-archives/**" />
  +				<exclude name="examples/**/test-build/**" />
   			</fileset>
   		</copy>
   	</target>
  @@ -1172,7 +1184,7 @@
   		<copy todir="${dist.ui.api.dir}">
   			<fileset dir="${ui.dir}/target/site">
   				<!--<include name="tlddoc/**"/>-->
  -				<include name="apidocs/**"/>
  +				<include name="apidocs/**" />
   			</fileset>		
   		</copy>	
   		
  @@ -1246,7 +1258,7 @@
   		<jar destfile="${build.dir}/${example.name}.war">
   			<zipfileset refid="example.war.docroot" />
   			<zipfileset refid="example.war.webinf.lib" />
  -			<zipfileset refid="example.seam.ui.jar"/>
  +			<zipfileset refid="example.seam.ui.jar" />
   			<zipfileset refid="example.seam.misc.jar" />
   			<zipfileset refid="example.facelets.jar" />
   			<zipfileset refid="example.urlrewrite.jar" />
  @@ -1360,7 +1372,7 @@
   		<delete dir="${tomcat.home}/webapps/${example.name}" />
   	</target>
   
  -	<target name="initValidateConfiguration" >
  +	<target name="initValidateConfiguration">
   		
   	</target>