DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Wed Feb  2 02:31:38 2005
New Revision: 1693

Modified:
   development/main/home/build.xml
Log:
Add an update target and some improved handling of the clean and dist targets.

Modified: development/main/home/build.xml
==============================================================================
--- development/main/home/build.xml     (original)
+++ development/main/home/build.xml     Wed Feb  2 02:31:38 2005
@@ -19,27 +19,40 @@
 -->
 
 
-<project name="dpml-home" default="install" basedir=".">
+<project name="dpml-home" default="dist" basedir=".">
 
   <property file="build.properties"/>
   <import file="${transit.home}/standard.xml"/>
+  <property name="bundle" value="${basedir}/target/bundle"/>
 
-  <target name="bundle" depends="init">
+  <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>
+
+  <target name="bundle" depends="init,install.check">
 
     <delete dir="${basedir}/target/bundle"/>
 
-    <property name="work" value="${basedir}/target/bundle"/>
-    <mkdir dir="${work}/cache"/>
+    <mkdir dir="${bundle}/cache"/>
 
     <!-- create the transit configuration directory -->
-    <property name="root" value="${work}/transit"/>
+    <property name="root" value="${bundle}/transit"/>
     <echo>Adding Transit application properties to ${root}</echo>
     <mkdir dir="${root}"/>
     <copy todir="${root}">
       <fileset dir="${basedir}/transit/handler/target/setup"/>
     </copy>
     <!-- include the util package -->
-    <property name="local" value="${work}/local/${project.version}"/>
+    <property name="local" value="${bundle}/local/${project.version}"/>
     <echo>Creating local repository ${local}</echo>
     <mkdir dir="${local}/dpml/util"/>
     <copy todir="${local}/dpml/util">
@@ -58,7 +71,7 @@
       <fileset dir="${basedir}/transit/plugin/target/deliverables"/>
     </copy>
     <!-- create the bin directory -->
-    <property name="bin" value="${work}/bin"/>
+    <property name="bin" value="${bundle}/bin"/>
     <echo>Adding scripts from ${bin}</echo>
     <mkdir dir="${bin}"/>
     <copy todir="${bin}">
@@ -66,7 +79,7 @@
     </copy>
     <!-- create the api doc directory -->
     <!--
-    <property name="api" value="${work}/docs/api"/>
+    <property name="api" value="${bundle}/docs/api"/>
     <echo>Adding api documentation to ${api}</echo>
     <mkdir dir="${api}"/>
     <copy todir="${api}">
@@ -77,7 +90,7 @@
     </copy>
     -->
     <!-- create the README and LICENSE files-->
-    <copy todir="${work}" filtering="true">
+    <copy todir="${bundle}" filtering="true">
       <fileset dir="${basedir}">
         <include name="README.TXT"/>
         <include name="LICENSE.TXT"/>
@@ -91,11 +104,11 @@
     <property name="dist" location="${basedir}/target/dist"/>
     <mkdir dir="${dist}"/>
     <zip destfile="${dist}/${project.name}-${project.version}.zip" 
whenempty="create">
-      <zipfileset dir="${work}/bin" prefix="bin">
+      <zipfileset dir="${bundle}/bin" prefix="bin">
         <include name="*.*"/>
         <include name="security.policy"/>
       </zipfileset>
-      <zipfileset dir="${work}">
+      <zipfileset dir="${bundle}">
         <include name="**/*"/>
         <exclude name="bin/**"/>
       </zipfileset>
@@ -103,15 +116,15 @@
     <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="${work}/bin" prefix="bin">
+      <tarfileset dir="${bundle}/bin" prefix="bin">
         <include name="security.policy"/>
         <include name="*.bat"/>
       </tarfileset>
-      <tarfileset dir="${work}/bin" prefix="bin" mode="755">
+      <tarfileset dir="${bundle}/bin" prefix="bin" mode="755">
         <include name="*.sh"/>
         <include name="transit"/>
       </tarfileset>
-      <tarfileset dir="${work}">
+      <tarfileset dir="${bundle}">
         <include name="**/*"/>
         <exclude name="bin/**"/>
       </tarfileset>
@@ -132,6 +145,25 @@
     <ant dir="transit" inheritall="false"/>
   </target>
 
+  <target name="update.setup">
+    <available file="${bundle}" property="bundle.available"/>
+  </target>
+
+  <target name="update.check" depends="update.setup" 
unless="bundle.available">
+    <ant target="dist"/>
+  </target>
+
+  <target name="update" depends="update.check, init">
+    <echo>
+#----------------------------------------------------------------------------------
+# Updating local installation. ${dpml.home}
+#----------------------------------------------------------------------------------
+    </echo>
+    <copy todir="${dpml.home}">
+      <fileset dir="${bundle}"/>
+    </copy>
+  </target>
+
   <target name="clean">
     <delete includeemptydirs="true">
       <fileset dir=".">