DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Wed Feb  2 05:14:28 2005
New Revision: 1696

Modified:
   development/main/home/build.xml
Log:
make the build procedure a little more reliable

Modified: development/main/home/build.xml
==============================================================================
--- development/main/home/build.xml     (original)
+++ development/main/home/build.xml     Wed Feb  2 05:14:28 2005
@@ -19,26 +19,44 @@
 -->
 
 
-<project name="dpml-home" default="dist" basedir=".">
+<project name="dpml-home" default="install" basedir=".">
 
   <property file="build.properties"/>
   <import file="${transit.home}/standard.xml"/>
   <property name="bundle" value="${basedir}/target/bundle"/>
 
-  <target name="install.setup">
-    <available file="transit/target/deliverables/modules" 
property="install.available"/>
-  </target>
-
-  <target name="install.check" depends="install.setup" 
unless="install.available">
-    <!--
-    <echo>Cannot create the bundle without an install build.</echo>
-    <echo>Use the 'install' target to build the required components.</echo>
-    <fail message="Use 'ant install'"/>
-    -->
-    <ant target="install"/>
+  <target name="install" depends="standard.install,bundle">
+    <property name="dist" location="${basedir}/target/dist"/>
+    <mkdir dir="${dist}"/>
+    <zip destfile="${dist}/${project.name}-${project.version}.zip" 
whenempty="create">
+      <zipfileset dir="${bundle}/bin" prefix="bin">
+        <include name="*.*"/>
+        <include name="security.policy"/>
+      </zipfileset>
+      <zipfileset dir="${bundle}">
+        <include name="**/*"/>
+        <exclude name="bin/**"/>
+      </zipfileset>
+    </zip>
+    <checksum fileext=".md5" 
file="${dist}/${project.name}-${project.version}.zip"/>
+    <tar destfile="${dist}/${project.name}-${project.version}.tar.gz" 
compression="gzip" longfile="gnu">
+      <tarfileset dir="${bundle}/bin" prefix="bin">
+        <include name="security.policy"/>
+        <include name="*.bat"/>
+      </tarfileset>
+      <tarfileset dir="${bundle}/bin" prefix="bin" mode="755">
+        <include name="*.sh"/>
+        <include name="transit"/>
+      </tarfileset>
+      <tarfileset dir="${bundle}">
+        <include name="**/*"/>
+        <exclude name="bin/**"/>
+      </tarfileset>
+    </tar>
+    <checksum fileext=".md5" 
file="${dist}/${project.name}-${project.version}.tar.gz"/>
   </target>
 
-  <target name="bundle" depends="init,install.check">
+  <target name="bundle" depends="install.children">
 
     <delete dir="${basedir}/target/bundle"/>
 
@@ -99,41 +117,7 @@
     </copy>
   </target>
 
-  <target name="dist" depends="bundle">
-
-    <property name="dist" location="${basedir}/target/dist"/>
-    <mkdir dir="${dist}"/>
-    <zip destfile="${dist}/${project.name}-${project.version}.zip" 
whenempty="create">
-      <zipfileset dir="${bundle}/bin" prefix="bin">
-        <include name="*.*"/>
-        <include name="security.policy"/>
-      </zipfileset>
-      <zipfileset dir="${bundle}">
-        <include name="**/*"/>
-        <exclude name="bin/**"/>
-      </zipfileset>
-    </zip>
-    <checksum fileext=".md5" 
file="${dist}/${project.name}-${project.version}.zip"/>
-
-    <tar destfile="${dist}/${project.name}-${project.version}.tar.gz" 
compression="gzip" longfile="gnu">
-      <tarfileset dir="${bundle}/bin" prefix="bin">
-        <include name="security.policy"/>
-        <include name="*.bat"/>
-      </tarfileset>
-      <tarfileset dir="${bundle}/bin" prefix="bin" mode="755">
-        <include name="*.sh"/>
-        <include name="transit"/>
-      </tarfileset>
-      <tarfileset dir="${bundle}">
-        <include name="**/*"/>
-        <exclude name="bin/**"/>
-      </tarfileset>
-    </tar>
-    <checksum fileext=".md5" 
file="${dist}/${project.name}-${project.version}.tar.gz"/>
-
-  </target>
-
-  <target name="install" depends="standard.install">
+  <target name="install.children">
     <ant dir="transit/handler" inheritall="false"/>
     <ant dir="transit/tools" inheritall="false"/>
     <ant dir="util/exception" inheritall="false"/>