Author: kentam
Date: Tue Oct 26 21:32:45 2004
New Revision: 55669
Modified:
incubator/beehive/trunk/beehive.properties
incubator/beehive/trunk/build.xml
Log:
Tune distribution build:
1) Produce both .zip and .tar.gz archives
2) Distributions are now named using the scheme
"apache-beehive-incubating-alpha-${beehive.version}"
3) Distro structure is contained in a top-level dir with the same name.
4) Including license and IP notice.
build.dist.jar is gone.
Relevant targets are now:
build.dist.zip: builds the zip distro
build.dist.tgz: builds the tgz distro
build.dist.archives: builds both zip & tgz distros
Modified: incubator/beehive/trunk/beehive.properties
==============================================================================
--- incubator/beehive/trunk/beehive.properties (original)
+++ incubator/beehive/trunk/beehive.properties Tue Oct 26 21:32:45 2004
@@ -55,6 +55,9 @@
#
# Properties related to building a Beehive distribution.
#
-dist.dir=${beehive.dir}/build/dist
+dist.base.dir=${beehive.dir}/build/dist
+dist.base.name=apache-beehive-incubating-alpha-
+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
-dist.name=apache-beehive
Modified: incubator/beehive/trunk/build.xml
==============================================================================
--- incubator/beehive/trunk/build.xml (original)
+++ incubator/beehive/trunk/build.xml Tue Oct 26 21:32:45 2004
@@ -14,6 +14,7 @@
<property name="ant.installer"
location="${beehive.external.dir}/ant/apache-ant-1.6.2-bin.zip"/>
<property name="jsr173.installer"
location="${beehive.external.dir}/xmlbeans/jsr173_api.jar"/>
+
<target name="bootstrap" depends="ensure.proxysettings"
description="Install external dependencies to the installed/ directory">
<antcall target="install.deps"/>
<ant dir="test/ant" antfile="runTomcat.xml" target="reset.config"/>
@@ -313,6 +314,13 @@
</filterset>
</copy>
+ <copy todir="${dist.dir}" failOnError="true">
+ <fileset dir="${os.BEEHIVE_HOME}">
+ <include name="LICENSE.TXT"/>
+ <include name="NOTICE.txt"/>
+ </fileset>
+ </copy>
+
<property name="webapp.name" value="netui-blank"/>
<!-- build the project templates in dist/ -->
@@ -326,7 +334,7 @@
</fileset>
</copy>
- <copy todir="build/dist/samples/netui-blank">
+ <copy todir="${dist.dir}/samples/netui-blank">
<fileset dir="build/tmp-dist/${webapp.name}"/>
</copy>
</target>
@@ -366,18 +374,34 @@
</copy>
</target>
- <target name="build.dist.jar" depends="build.dist" description="Builds a
Beehive distribution JAR">
-<!-- <fail unless="beehive.version" message="Could not build
distribution JARs; beehive.version was not specified"/> -->
+ <target name="build.dist.archives" description="Builds all Beehive
distribution archives (.zip, .tar.gz, etc)">
+ <fail unless="beehive.version" message="Could not build distribution
archives; beehive.version property not specified!"/>
+ <antcall target="build.dist.zip"/>
+ <antcall target="build.dist.tgz"/>
+ <!--
+ <antcall target="build.dist.docs.jar"/>
+ -->
+ </target>
+
+ <target name="build.dist.zip" description="Builds a Beehive distribution
zipfile">
+<!-- <fail unless="beehive.version" message="Could not build
distribution archive; beehive.version was not specified"/> -->
+
+ <mkdir dir="build/jars"/>
+ <zip destfile="build/jars/${dist.name}.zip" basedir="${dist.dir}"/>
+ </target>
+
+ <target name="build.dist.tgz" description="Builds a Beehive distribution
tarball (.tar.gz)">
+<!-- <fail unless="beehive.version" message="Could not build
distribution archive; beehive.version was not specified"/> -->
<mkdir dir="build/jars"/>
- <jar destfile="build/jars/${dist.name}-${beehive.version}.jar"
basedir="${dist.dir}"/>
+ <tar destfile="build/jars/${dist.name}.tar.gz" basedir="${dist.dir}"
compression="gzip"/>
</target>
<target name="build.dist.docs.jar" depends="build.dist"
description="Builds a Beehive distribution docs JAR">
-<!-- <fail unless="beehive.version" message="Could not build
distribution JARs; beehive.version was not specified"/> -->
+<!-- <fail unless="beehive.version" message="Could not build
distribution archive; beehive.version was not specified"/> -->
<mkdir dir="build/jars"/>
- <jar destfile="build/jars/${dist.name}-${beehive.version}-docs.jar"
basedir="${dist.docs.dir}"/>
+ <jar destfile="build/jars/${dist.name}-docs.jar"
basedir="${dist.docs.dir}"/>
</target>
<target name="clean.dist">
