svn commit: r158607 - incubator/beehive/trunk/distribution.xml

[ek...@apache.org]

Author: ekoneil
Date: Tue Mar 22 06:51:48 2005
New Revision: 158607

URL: http://svn.apache.org/viewcvs?view=rev&rev=158607
Log:
Fix the distribution.xml file so that the isWindows property can be set without having to run two targets.

It's not available implicitly throughout the build file.

BB: self
Test: distribution building works.


Modified:
    incubator/beehive/trunk/distribution.xml

Modified: incubator/beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?view=diff&r1=158606&r2=158607
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Tue Mar 22 06:51:48 2005
@@ -38,6 +38,10 @@
     <property name="dist.readme.toplvl.trailer" location="${beehive.home}/docs/dist-docs/toplvl-readme-trailer.txt"/>
     <property name="controlhaus.rev.file" location="${dist.dir}/lib/controls/controlhaus.rev"/>
 
+    <!-- identify whether the current OS is win32 -->
+    <condition property="isWindows">
+        <os family="windows"/>
+    </condition>
 
     <!-- ============================================= -->
     <!--                                               -->
@@ -629,12 +633,6 @@
         </sequential>
     </macrodef>
 
-    <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"/>
 
@@ -644,7 +642,7 @@
                        excludes="${dist.name}/docs/*.txt,${dist.name}/docs/*.TXT" 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}"/>
@@ -668,7 +666,7 @@
              excludes="${dist.name}/docs/*.txt,${dist.name}/docs/*.TXT" 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}"/>
@@ -718,7 +716,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.docs.name}" />
         <copy todir="${tmpdocsdir}">
            <fileset dir="${dist.dir}/docs" />
@@ -748,7 +746,7 @@
         <tar destfile="${dist.archives.dir}/${dist.docs.name}.tar.gz" basedir="${dist.tmp.dir}" includes="${dist.docs.name}/**" compression="gzip"/>
     </target>
 
-    <target name="build.dist.src.tgz" description="Builds a Beehive source distribution tarball (.tar.gz)" depends="identify_os">
+    <target name="build.dist.src.tgz" description="Builds a Beehive source distribution tarball (.tar.gz)">
         <fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
 
         <mkdir dir="${dist.archives.dir}"/>
@@ -778,7 +776,7 @@
     </target>
 
     <!-- prereq: you must have built the archives with build.dist.archives already -->
-    <target name="verify.dist.archives" depends="identify_os" description="Verifies all Beehive distribution archives (.zip, .tar.gz, src, etc)">
+    <target name="verify.dist.archives" description="Verifies all Beehive distribution archives (.zip, .tar.gz, src, etc)">
         <verify-archive filebase="${dist.name}"/>
         <verify-archive filebase="${dist.lib.name}"/>
         <verify-archive filebase="${dist.docs.name}"/>