Author: ekoneil
Date: Thu Oct 28 16:55:02 2004
New Revision: 55912
Modified:
incubator/beehive/branches/v1/alpha/beehive.properties
incubator/beehive/branches/v1/alpha/build.xml
Log:
Fixes:
- set a default value for beehive.version in beehive.properties. This will set
the name of the built distribution to:
apache-beehive-incubating-1.0-alpha-snapshot
instead of:
apache-beehive-incubating-alpha-${beehive.version}
This value can be overridden as needed on the command line as:
ant build.dist -Dbeehive.version=foo
Since this line has branched, it seems reasonable to set the value in the
beehive.properties file.
- fix the "build.dist test.dist" sequence. This is broken when the
.zip/.tar.gz files aren't created because the output of the test run is written
to jars/
BB: self
Test: build.dist test.dist passes
Modified: incubator/beehive/branches/v1/alpha/beehive.properties
==============================================================================
--- incubator/beehive/branches/v1/alpha/beehive.properties (original)
+++ incubator/beehive/branches/v1/alpha/beehive.properties Thu Oct 28
16:55:02 2004
@@ -55,8 +55,14 @@
# Properties related to building a Beehive distribution.
#
dist.base.dir=${beehive.dir}/build/dist
-dist.base.name=apache-beehive-incubating-alpha-
+dist.base.name=apache-beehive-incubating-
dist.name=${dist.base.name}${beehive.version}
dist.name.src=${dist.name}-src
dist.dir=${dist.base.dir}/${dist.name}
-dist.docs.dir=${beehive.dir}/build/dist-docs
\ No newline at end of file
+dist.docs.dir=${beehive.dir}/build/dist-docs
+
+#
+# This is the version used when rolling the distribution; in order to
+# specify a different value, pass -Dbeehive.version on the command line.
+#
+beehive.version=1.0-alpha-snapshot
\ No newline at end of file
Modified: incubator/beehive/branches/v1/alpha/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/build.xml Thu Oct 28 16:55:02 2004
@@ -395,6 +395,8 @@
</target>
<target name="test.dist" description="Tests a Beehive distribution">
+ <property name="distroStdout.file"
location="${beehive.dir}/build/testDistro.output"/>
+
<unzip src="${tomcat.installer}" dest="${dist.dir}"/>
<exec executable="cmd" dir="${dist.dir}" newenvironment="true"
os="Windows XP,Windows 2000" outputproperty="testDistro.output">
<arg line="/c ${os.BEEHIVE_HOME}/test/testDistro.cmd"/>
@@ -406,7 +408,8 @@
</condition>
</fail>
<echo message="${testDistro.output}"/>
- <echo message="${testDistro.output}"
file="build/jars/testDistro.output"/>
+
+ <echo message="${testDistro.output}" file="${distroStdout.file}"/>
</target>
<!-- ============================================= -->
