Author: kentam
Date: Wed Mar 23 13:34:54 2005
New Revision: 158835
URL: http://svn.apache.org/viewcvs?view=rev&rev=158835
Log:
Work on BEEHIVE-29: Apache infrastructure for regular builds, serving
distributions -- allow Ant v1.7 to be used in the build.
Make svnversion calls optional.
Temporarily disable verification of archives until migration to GNU tar is
complete.
Contributed by Jim Cummings.
Modified:
incubator/beehive/trunk/beehive-imports.xml
incubator/beehive/trunk/distribution.xml
Modified: incubator/beehive/trunk/beehive-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehive-imports.xml?view=diff&r1=158834&r2=158835
==============================================================================
--- incubator/beehive/trunk/beehive-imports.xml (original)
+++ incubator/beehive/trunk/beehive-imports.xml Wed Mar 23 13:34:54 2005
@@ -328,7 +328,11 @@
<!--
======================================================================== -->
<condition property="ant.version.okay">
+ <or>
+ <!-- allow ant 1.7 for gump runs -->
<contains string="${ant.version}" substring="1.6"/>
+ <contains string="${ant.version}" substring="1.7"/>
+ </or>
</condition>
<fail unless="ant.version.okay">
Modified: incubator/beehive/trunk/distribution.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?view=diff&r1=158834&r2=158835
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Wed Mar 23 13:34:54 2005
@@ -173,7 +173,7 @@
</target>
<target name="ejb.svn.revision.label">
- <exec executable="svnversion"
dir="${beehive.home}/controlhaus/ejb/trunk"
+ <exec executable="svnversion"
dir="${beehive.home}/controlhaus/ejb/trunk" failifexecutionfails="false"
outputproperty="ejb.svn.revision">
<arg value="."/>
</exec>
@@ -195,7 +195,7 @@
</target>
<target name="jdbc.svn.revision.label">
- <exec executable="svnversion"
dir="${beehive.home}/controlhaus/jdbc/trunk"
+ <exec executable="svnversion"
dir="${beehive.home}/controlhaus/jdbc/trunk" failifexecutionfails="false"
outputproperty="jdbc.svn.revision">
<arg value="."/>
</exec>
@@ -217,7 +217,7 @@
</target>
<target name="jms.svn.revision.label">
- <exec executable="svnversion"
dir="${beehive.home}/controlhaus/jms/trunk"
+ <exec executable="svnversion"
dir="${beehive.home}/controlhaus/jms/trunk" failifexecutionfails="false"
outputproperty="jms.svn.revision">
<arg value="."/>
</exec>
@@ -239,7 +239,7 @@
</target>
<target name="webservice.svn.revision.label">
- <exec executable="svnversion"
dir="${beehive.home}/controlhaus/webservice/trunk"
+ <exec executable="svnversion"
dir="${beehive.home}/controlhaus/webservice/trunk" failifexecutionfails="false"
outputproperty="webservice.svn.revision">
<arg value="."/>
</exec>
@@ -583,7 +583,10 @@
-->
<!-- go ahead and always verify them after making them -->
+ <!-- skip verify for building archives until we remove MKS tar support
+ because of issues with MKS untarring it archives it makes
<antcall target="verify.dist.archives"/>
+ -->
</target>
<macrodef name="build-dist-readme">
