Author: kentam
Date: Wed Mar 2 11:42:07 2005
New Revision: 155946
URL: http://svn.apache.org/viewcvs?view=rev&rev=155946
Log:
BEEHIVE-349: Beehive build and distributions should include svn revision #s
svn.rev in the root of the distribution contains the Beehive svn rev # that the
distro was built at.
lib/controls/controlhaus.rev contains the Controlhaus svn rev #s that the
controls in the distro were built at.
Modified:
incubator/beehive/trunk/build.xml
incubator/beehive/trunk/distribution.xml
Modified: incubator/beehive/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/build.xml?view=diff&r1=155945&r2=155946
==============================================================================
--- incubator/beehive/trunk/build.xml (original)
+++ incubator/beehive/trunk/build.xml Wed Mar 2 11:42:07 2005
@@ -28,10 +28,18 @@
<delete dir="${beehive.home}/build"/>
</target>
- <target name="deploy" description="Deploy Beehive">
+ <target name="deploy" description="Deploy Beehive"
depends="revision.label">
<ant dir="controls" target="build" inheritAll="false"/>
<ant dir="netui" target="deploy" inheritAll="false"/>
<ant dir="wsm" target="deploy" inheritAll="false"/>
+ </target>
+
+ <target name="revision.label" description="Creates svn revision label
file">
+ <mkdir dir="${beehive.home}/build"/>
+ <exec executable="svnversion" outputproperty="svn.revision">
+ <arg value="."/>
+ </exec>
+ <echo message="Apache Beehive svn revision #${svn.revision}"
file="${beehive.home}/build/svn.rev"/>
</target>
<target name="scrub" description="Scrub the Beehive directory of
downloaded files">
Modified: incubator/beehive/trunk/distribution.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?view=diff&r1=155945&r2=155946
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Wed Mar 2 11:42:07 2005
@@ -37,14 +37,15 @@
<!-- this pulls down the most generally useful controls from
controlhaus.org, and builds them into the distribution -->
- <!-- ============================================= -->
- <!-- -->
- <!-- EJB Control -->
- <!-- -->
- <!-- ============================================= -->
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- EJB Control -->
+ <!-- -->
+ <!-- ============================================= -->
<available property="ejb.control.exists"
file="controlhaus/ejb/trunk/build.xml"/>
<antcall target="ejb.svn.update"/>
<antcall target="ejb.svn.checkout"/>
+ <antcall target="ejb.svn.revision.label"/>
<ant dir="controlhaus/ejb/trunk" target="clean" inheritAll="false">
<property name="beehive.home" value="${dist.dir}"/>
@@ -55,14 +56,15 @@
<copy file="controlhaus/ejb/trunk/build/ejb-control.jar"
todir="${dist.dir}/lib/controls"/>
- <!-- ============================================= -->
- <!-- -->
- <!-- JDBC Control -->
- <!-- -->
- <!-- ============================================= -->
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- JDBC Control -->
+ <!-- -->
+ <!-- ============================================= -->
<available property="jdbc.control.exists"
file="controlhaus/jdbc/trunk/build.xml"/>
<antcall target="jdbc.svn.update"/>
<antcall target="jdbc.svn.checkout"/>
+ <antcall target="jdbc.svn.revision.label"/>
<ant dir="controlhaus/jdbc/trunk" target="download-dependencies"
inheritAll="false">
<property name="beehive.home" value="${dist.dir}"/>
@@ -76,14 +78,15 @@
<copy file="controlhaus/jdbc/trunk/build/dist/jdbc-control.jar"
todir="${dist.dir}/lib/controls"/>
- <!-- ============================================= -->
- <!-- -->
- <!-- JMS Control -->
- <!-- -->
- <!-- ============================================= -->
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- JMS Control -->
+ <!-- -->
+ <!-- ============================================= -->
<available property="jms.control.exists"
file="controlhaus/jms/trunk/build.xml"/>
<antcall target="jms.svn.update"/>
<antcall target="jms.svn.checkout"/>
+ <antcall target="jms.svn.revision.label"/>
<ant dir="controlhaus/jms/trunk" target="clean" inheritAll="false">
<property name="beehive.home" value="${dist.dir}"/>
@@ -94,14 +97,15 @@
<copy file="controlhaus/jms/trunk/build/jms-control.jar"
todir="${dist.dir}/lib/controls"/>
- <!-- ============================================= -->
- <!-- -->
- <!-- Webservice Control -->
- <!-- -->
- <!-- ============================================= -->
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- Webservice Control -->
+ <!-- -->
+ <!-- ============================================= -->
<available property="webservice.control.exists"
file="controlhaus/webservice/trunk/build.xml"/>
<antcall target="webservice.svn.update"/>
<antcall target="webservice.svn.checkout"/>
+ <antcall target="webservice.svn.revision.label"/>
<ant dir="controlhaus/webservice/trunk" target="clean"
inheritAll="false">
<property name="beehive.home" value="${dist.dir}"/>
@@ -112,6 +116,13 @@
<copy
file="controlhaus/webservice/trunk/servicecontrol/build/jars/webservice-control.jar"
todir="${dist.dir}/lib/controls"/>
+
+ <!-- Track the svn revs used for this distro build -->
+ <concat destfile="${dist.dir}/lib/controls/controlhaus.rev"
fixlastline="true" eol="crlf">
+ <fileset dir="controlhaus">
+ <include name="**/svn.rev"/>
+ </fileset>
+ </concat>
</target>
@@ -127,6 +138,13 @@
<arg line="checkout http://svn.controlhaus.org/ejb/trunk"/>
</exec>
</target>
+ <target name="ejb.svn.revision.label">
+ <exec executable="svnversion"
dir="${beehive.home}/controlhaus/ejb/trunk"
+ outputproperty="ejb.svn.revision">
+ <arg value="."/>
+ </exec>
+ <echo message="ControlHaus EJB control svn revision
#${ejb.svn.revision}" file="${beehive.home}/controlhaus/ejb/trunk/svn.rev"/>
+ </target>
<!-- JDBC Control svn targets -->
<target name="jdbc.svn.update" if="jdbc.exists">
@@ -140,6 +158,13 @@
<arg line="checkout http://svn.controlhaus.org/jdbc/trunk"/>
</exec>
</target>
+ <target name="jdbc.svn.revision.label">
+ <exec executable="svnversion"
dir="${beehive.home}/controlhaus/jdbc/trunk"
+ outputproperty="jdbc.svn.revision">
+ <arg value="."/>
+ </exec>
+ <echo message="ControlHaus JDBC control svn revision
#${jdbc.svn.revision}" file="${beehive.home}/controlhaus/jdbc/trunk/svn.rev"/>
+ </target>
<!-- JMS Control svn targets -->
<target name="jms.svn.update" if="jms.exists">
@@ -153,6 +178,13 @@
<arg line="checkout http://svn.controlhaus.org/jms/trunk"/>
</exec>
</target>
+ <target name="jms.svn.revision.label">
+ <exec executable="svnversion"
dir="${beehive.home}/controlhaus/jms/trunk"
+ outputproperty="jms.svn.revision">
+ <arg value="."/>
+ </exec>
+ <echo message="ControlHaus JMS control svn revision
#${jms.svn.revision}" file="${beehive.home}/controlhaus/jms/trunk/svn.rev"/>
+ </target>
<!-- Webservice Control svn targets -->
<target name="webservice.svn.update" if="webservice.exists">
@@ -166,9 +198,16 @@
<arg line="checkout http://svn.controlhaus.org/webservice/trunk"/>
</exec>
</target>
+ <target name="webservice.svn.revision.label">
+ <exec executable="svnversion"
dir="${beehive.home}/controlhaus/webservice/trunk"
+ outputproperty="webservice.svn.revision">
+ <arg value="."/>
+ </exec>
+ <echo message="ControlHaus WebService control svn revision
#${webservice.svn.revision}"
file="${beehive.home}/controlhaus/webservice/trunk/svn.rev"/>
+ </target>
- <!-- target for buliding libraries. required property: lib.dir -->
+ <!-- target for building libraries. required property: lib.dir -->
<target name="build.lib">
<copy todir="${lib.dir}/common" failOnError="true">
<fileset refid="commons-codec.fileset"/>
@@ -229,6 +268,9 @@
<include name="LICENSE.TXT"/>
<include name="NOTICE.txt"/>
</fileset>
+ <fileset dir="${beehive.home}/build">
+ <include name="svn.rev"/>
+ </fileset>
</copy>
</target>
@@ -252,6 +294,9 @@
<fileset dir="${beehive.home}">
<include name="LICENSE.TXT"/>
<include name="NOTICE.txt"/>
+ </fileset>
+ <fileset dir="${beehive.home}/build">
+ <include name="svn.rev"/>
</fileset>
<fileset file="docs/dist-docs/README.txt"/>
</copy>
