comparison ssdt-common-build.xml @ 60:5bf585a38400

merge changes
author Joe Ferrall <ferrall@nwoca.org>
date Tue, 26 Jul 2011 10:46:31 -0400
parents 426d160e1e4a
children 7a36ea2cb81a
comparison
equal deleted inserted replaced
59:6d4f61230dfb 60:5bf585a38400
56 <entry key="buildNumber" value="${build.number}"/> 56 <entry key="buildNumber" value="${build.number}"/>
57 <entry key="built.by" value="${ant.version}"/> 57 <entry key="built.by" value="${ant.version}"/>
58 <entry key="build.java.version" value="${ant.java.version}"/> 58 <entry key="build.java.version" value="${ant.java.version}"/>
59 <entry key="built.on" value="${os.name} ${os.arch} ${os.version} (${user.name})"/> 59 <entry key="built.on" value="${os.name} ${os.arch} ${os.version} (${user.name})"/>
60 </propertyfile> 60 </propertyfile>
61 <property file="${project.version.file}" prefix="version"/>
62
61 </target> 63 </target>
62 64
63 <target name="-project.pre-init" depends="init"> 65 <target name="-project.pre-init" depends="init">
64 <condition property="tomcat.available"> 66 <condition property="tomcat.available">
65 <and> 67 <and>