Author: kentam
Date: Wed Mar 23 12:25:28 2005
New Revision: 158828
URL: http://svn.apache.org/viewcvs?view=rev&rev=158828
Log:
Tweak distribution name specifically for beta-distribution.
Build GNU-tar compat archives (this change will be integrated back into the
trunk).
Modified:
incubator/beehive/branches/v1/beta/beehive-imports.xml
incubator/beehive/branches/v1/beta/distribution.xml
Modified: incubator/beehive/branches/v1/beta/beehive-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/beehive-imports.xml?view=diff&r1=158827&r2=158828
==============================================================================
--- incubator/beehive/branches/v1/beta/beehive-imports.xml (original)
+++ incubator/beehive/branches/v1/beta/beehive-imports.xml Wed Mar 23 12:25:28
2005
@@ -28,7 +28,7 @@
<property name="ant.dir" location="${os.ANT_HOME}"/>
<property name="forrest.dir" location="${os.FORREST_HOME}"/>
- <property name="beehive.version" value="svn-snapshot"/>
+ <property name="beehive.version" value="beta"/>
<property name="dist.base.name" value="apache-beehive-incubating-"/>
<property name="dist.name" value="${dist.base.name}${beehive.version}"/>
Modified: incubator/beehive/branches/v1/beta/distribution.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/distribution.xml?view=diff&r1=158827&r2=158828
==============================================================================
--- incubator/beehive/branches/v1/beta/distribution.xml (original)
+++ incubator/beehive/branches/v1/beta/distribution.xml Wed Mar 23 12:25:28 2005
@@ -487,12 +487,6 @@
-->
</target>
- <target name="identify_os">
- <condition property="isWindows">
- <os family="windows"/>
- </condition>
- </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"/>
@@ -500,45 +494,17 @@
<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)" depends="identify_os">
+ <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="${dist.archives.dir}"/>
- <!-- the <tar> task has a bug under Windows, so we special-case it to
call out to an external tar program -->
- <antcall target="build.dist.tgz.windows"/>
- <antcall target="build.dist.tgz.non_windows"/>
- </target>
-
- <target name="build.dist.tgz.windows" if="isWindows">
- <exec executable="tar" dir="${dist.base.dir}">
- <arg value="-cvzf"/>
- <arg value="${dist.archives.dir}/${dist.name}.tar.gz"/>
- <arg value="${dist.name}"/>
- </exec>
- </target>
-
- <target name="build.dist.tgz.non_windows" unless="isWindows">
<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)" depends="identify_os">
+ <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="${dist.archives.dir}"/>
- <!-- the <tar> task has a bug under Windows, so we special-case it to
call out to an external tar program -->
- <antcall target="build.dist.lib.tgz.windows"/>
- <antcall target="build.dist.lib.tgz.non_windows"/>
- </target>
-
- <target name="build.dist.lib.tgz.windows" if="isWindows">
- <exec executable="tar" dir="${dist.base.dir}">
- <arg value="-cvzf"/>
- <arg value="${dist.archives.dir}/${dist.lib.name}.tar.gz"/>
- <arg value="${dist.lib.name}"/>
- </exec>
- </target>
-
- <target name="build.dist.lib.tgz.non_windows" unless="isWindows">
<tar destfile="${dist.archives.dir}/${dist.lib.name}.tar.gz"
basedir="${dist.base.dir}" includes="${dist.lib.name}/**" compression="gzip"/>
</target>
@@ -570,7 +536,7 @@
<delete dir="${tmpdocsdir}" />
</target>
- <target name="build.dist.docs.tgz" description="Builds a Beehive
distribution docs tarball (.tar.gz)" depends="identify_os">
+ <target name="build.dist.docs.tgz" description="Builds a Beehive
distribution docs tarball (.tar.gz)">
<property name="tmpdocsdir"
location="${dist.tmp.dir}/${dist.name}-docs" />
<copy todir="${tmpdocsdir}">
<fileset dir="${dist.dir}/docs" />
@@ -580,24 +546,10 @@
<mkdir dir="${dist.archives.dir}"/>
- <!-- the <tar> task has a bug under Windows, so we special-case it to
call out to an external tar program -->
- <antcall target="build.dist.docs.tgz.windows"/>
- <antcall target="build.dist.docs.tgz.non_windows"/>
+ <tar destfile="${dist.archives.dir}/${dist.name}-docs.tar.gz"
basedir="${dist.tmp.dir}" includes="${dist.name}-docs/**" compression="gzip"/>
<delete dir="${tmpdocsdir}" />
</target>
-
- <target name="build.dist.docs.tgz.windows" if="isWindows">
- <exec executable="tar" dir="${dist.tmp.dir}">
- <arg value="-cvzf"/>
- <arg value="${dist.archives.dir}/${dist.name}-docs.tar.gz"/>
- <arg value="${dist.name}-docs"/>
- </exec>
- </target>
-
- <target name="build.dist.docs.tgz.non_windows" unless="isWindows">
- <tar destfile="${dist.archives.dir}/${dist.name}-docs.tar.gz"
basedir="${dist.tmp.dir}" includes="${dist.name}-docs/**" compression="gzip"/>
- </target>
<target name="build.livesite" description="Builds a zipfile of the current
live site.">
<property name="tmpdocsdir"
location="${dist.tmp.dir}/${dist.name}-docs" />
