Author: ekoneil
Date: Sat Feb 19 07:42:50 2005
New Revision: 154409
URL: http://svn.apache.org/viewcvs?view=rev&rev=154409
Log:
Cleanup some targets associated with building a distribution.
- set the library distribution name. This was coming out as ${dist.lib.name}
- add a "build.dist.archives" target to /build.xml for easier chaining of Ant
targets
- change the name of the distribution output directory from build/jars/ to
build/dist/archives/. We don't produce JARs anyway. :)
BB: self
DRT: none. distribution build is successful.
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=154408&r2=154409
==============================================================================
--- incubator/beehive/trunk/build.xml (original)
+++ incubator/beehive/trunk/build.xml Sat Feb 19 07:42:50 2005
@@ -177,6 +177,17 @@
<ant antfile="distribution.xml" target="test.dist" inheritAll="false"/>
</target>
+ <target name="build.dist.archives">
+ <ant antfile="distribution.xml" target="build.dist.archives"
inheritAll="false"/>
+ </target>
+
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- Environment sanity check. Use this if you -->
+ <!-- experience problems running Beehive build -->
+ <!-- or tests. -->
+ <!-- -->
+ <!-- ============================================= -->
<target name="check.setup">
<echo>
java.home = ${java.home}
Modified: incubator/beehive/trunk/distribution.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?view=diff&r1=154408&r2=154409
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Sat Feb 19 07:42:50 2005
@@ -8,12 +8,16 @@
<import file="beehive-imports.xml"/>
<property name="dist.name.src" value="${dist.name}-src"/>
+ <property name="dist.lib.name" value="${dist.name}-lib"/>
<property name="beehive.user.dir" location="${beehive.home}/user"/>
<property name="dist.base.dir" location="${beehive.home}/build/dist"/>
- <property name="dist.docs.dir" location="${beehive.home}/build/dist-docs"/>
<property name="dist.dir" location="${dist.base.dir}/${dist.name}"/>
+
+ <property name="dist.docs.dir" location="${beehive.home}/build/dist-docs"/>
<property name="dist.lib.dir"
location="${dist.base.dir}/${dist.lib.name}"/>
+ <property name="dist.archives.dir" location="${dist.base.dir}/archives"/>
+ <property name="dist.tmp.dir" location="${beehive.home}/build/tmp-dist/"/>
<!-- ============================================= -->
<!-- -->
@@ -255,7 +259,7 @@
<!-- build the project templates in dist/ -->
<echo>Create the Beehive webapp template</echo>
- <copy todir="build/tmp-dist/${webapp.name}">
+ <copy todir="${dist.tmp.dir}/${webapp.name}">
<fileset dir="${beehive.home}/netui/build/dist/webapp">
<exclude name="WEB-INF/lib/*.jar"/>
<exclude name="WEB-INF/*.tld"/>
@@ -264,7 +268,7 @@
</copy>
<copy todir="${dist.dir}/samples/netui-blank">
- <fileset dir="build/tmp-dist/${webapp.name}"/>
+ <fileset dir="${dist.tmp.dir}/${webapp.name}"/>
</copy>
</target>
@@ -373,84 +377,84 @@
<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" includes="${dist.name}/**"
basedir="${dist.base.dir}"/>
+ <mkdir dir="${dist.archives.dir}"/>
+ <zip destfile="${dist.archives.dir}/${dist.name}.zip"
includes="${dist.name}/**" basedir="${dist.base.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"/>
- <tar destfile="build/jars/${dist.name}.tar.gz"
basedir="${dist.base.dir}" includes="${dist.name}/**" compression="gzip"/>
+ <mkdir dir="${dist.archives.dir}"/>
+ <tar destfile="${dist.archives.dir}/${dist.name}.tar.gz"
basedir="${dist.base.dir}" includes="${dist.name}/**" compression="gzip"/>
</target>
<target name="build.dist.lib.tgz" description="Builds a Beehive library
distribution tarball (.tar.gz)">
<fail unless="beehive.version" message="Could not build distribution
archive; beehive.version was not specified"/>
- <mkdir dir="build/jars"/>
- <tar destfile="build/jars/${dist.lib.name}.tar.gz"
basedir="${dist.base.dir}" includes="${dist.lib.name}/**" compression="gzip"/>
+ <mkdir dir="${dist.archives.dir}"/>
+ <tar destfile="${dist.archives.dir}/${dist.lib.name}.tar.gz"
basedir="${dist.base.dir}" includes="${dist.lib.name}/**" compression="gzip"/>
</target>
<target name="build.dist.lib.zip" description="Builds a Beehive library
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.lib.name}.zip"
includes="${dist.lib.name}/**" basedir="${dist.base.dir}"/>
+ <mkdir dir="${dist.archives.dir}"/>
+ <zip destfile="${dist.archives.dir}/${dist.lib.name}.zip"
includes="${dist.lib.name}/**" basedir="${dist.base.dir}"/>
</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
archive; beehive.version was not specified"/>
- <mkdir dir="build/jars"/>
- <jar destfile="build/jars/${dist.name}-docs.jar"
basedir="${dist.dir}/docs"/>
+ <mkdir dir="${dist.archives.dir}"/>
+ <jar destfile="${dist.archives.dir}/${dist.name}-docs.jar"
basedir="${dist.dir}/docs"/>
</target>
<target name="build.dist.docs.zip" description="Builds a Beehive
distribution docs zipfile">
- <property name="tmpdocsdir"
location="build/tmp-dist/${dist.name}-docs" />
+ <property name="tmpdocsdir"
location="${dist.tmp.dir}/${dist.name}-docs" />
<copy todir="${tmpdocsdir}">
<fileset dir="${dist.dir}/docs" />
</copy>
<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}-docs.zip"
basedir="build/tmp-dist" includes="${dist.name}-docs/**" />
+ <mkdir dir="${dist.archives.dir}"/>
+ <zip destfile="${dist.archives.dir}/${dist.name}-docs.zip"
basedir="${dist.tmp.dir}" includes="${dist.name}-docs/**" />
<delete dir="${tmpdocsdir}" />
</target>
<target name="build.dist.docs.tgz" description="Builds a Beehive
distribution docs tarball (.tar.gz)">
- <property name="tmpdocsdir"
location="build/tmp-dist/${dist.name}-docs" />
+ <property name="tmpdocsdir"
location="${dist.tmp.dir}/${dist.name}-docs" />
<copy todir="${tmpdocsdir}">
<fileset dir="${dist.dir}/docs" />
</copy>
<fail unless="beehive.version" message="Could not build distribution
archive; beehive.version was not specified"/>
- <mkdir dir="build/jars"/>
- <tar destfile="build/jars/${dist.name}-docs.tgz"
basedir="build/tmp-dist" includes="${dist.name}-docs/**" compression="gzip"/>
+ <mkdir dir="${dist.archives.dir}"/>
+ <tar destfile="${dist.archives.dir}/${dist.name}-docs.tgz"
basedir="${dist.tmp.dir}" includes="${dist.name}-docs/**" compression="gzip"/>
<delete dir="${tmpdocsdir}" />
</target>
<target name="build.livesite" description="Builds a zipfile of the current
live site.">
- <property name="tmpdocsdir"
location="build/tmp-dist/${dist.name}-docs" />
+ <property name="tmpdocsdir"
location="${dist.tmp.dir}/${dist.name}-docs" />
<copy todir="${tmpdocsdir}">
<fileset dir="${dist.dir}/docs" />
</copy>
<fail unless="beehive.version" message="Could not build distribution
archive; beehive.version was not specified"/>
- <mkdir dir="build/jars"/>
- <zip destfile="build/jars/site.zip"
basedir="build/tmp-dist/${dist.name}-docs/" />
+ <mkdir dir="${dist.archives.dir}"/>
+ <zip destfile="${dist.archives.dir}/site.zip"
basedir="${dist.tmp.dir}/${dist.name}-docs/" />
<delete dir="${tmpdocsdir}" />
</target>
<target name="clean.dist" description="Cleans a Beehive distribution
build">
- <delete dir="build/jars"/>
- <delete dir="build/dist"/>
- <delete dir="build/tmp-dist"/>
+ <delete dir="${dist.archives.dir}"/>
+ <delete dir="${dist.base.dir}"/>
+ <delete dir="${dist.tmp.dir}"/>
<delete dir="build/testDistArchives"/>
</target>
@@ -494,17 +498,6 @@
antfile="build.xml"
target="build.test.dist"
inheritall="false"/>
- </target>
-
- <!-- ============================================= -->
- <!-- -->
- <!-- Default usage target -->
- <!-- -->
- <!-- ============================================= -->
- <target name="usage" description="Print the usage for this build.xml">
- <java fork="no" classname="org.apache.tools.ant.Main">
- <arg line="-f distribution.xml -projecthelp"/>
- </java>
</target>
</project>
