DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Sun Feb  6 05:51:31 2005
New Revision: 1739

Modified:
   development/main/home/build.xml
   development/main/home/standard.xml
   development/main/home/transit/build.xml
   development/main/home/util/build.xml
   development/main/magic/core/src/main/net/dpml/magic/tasks/PrepareTask.java
Log:
Fix prepare task (was not replicating etc/test and etc/main), laso fixed some 
issues with the transit standard template and top-level build file.

Modified: development/main/home/build.xml
==============================================================================
--- development/main/home/build.xml     (original)
+++ development/main/home/build.xml     Sun Feb  6 05:51:31 2005
@@ -29,6 +29,7 @@
   <target name="install" depends="standard.install,bundle">
     <property name="dist" location="${basedir}/target/dist"/>
     <mkdir dir="${dist}"/>
+    <echo message="Generating ZIP dist"/>
     <zip destfile="${dist}/${project.name}-${project.version}.zip" 
whenempty="create">
       <zipfileset dir="${bundle}/bin" prefix="bin">
         <include name="*.*"/>
@@ -40,6 +41,7 @@
       </zipfileset>
     </zip>
     <checksum fileext=".md5" 
file="${dist}/${project.name}-${project.version}.zip"/>
+    <echo message="Generating TAR dist"/>
     <tar destfile="${dist}/${project.name}-${project.version}.tar.gz" 
compression="gzip" longfile="gnu">
       <tarfileset dir="${bundle}/bin" prefix="bin">
         <include name="security.policy"/>
@@ -60,6 +62,8 @@
 
   <target name="dist.asc" if="gpg.declared">
     <echo message="Generating ASC"/>
+    <delete file="${dist}/${project.name}-${project.version}.zip.asc"/>
+    <delete file="${dist}/${project.name}-${project.version}.tar.gz.asc"/>
     <exec executable="${project.gpg.exe}">
       <arg value="-a"/>
       <arg value="-b"/>

Modified: development/main/home/standard.xml
==============================================================================
--- development/main/home/standard.xml  (original)
+++ development/main/home/standard.xml  Sun Feb  6 05:51:31 2005
@@ -285,7 +285,6 @@
 
   <target name="package" depends="package.setup" 
if="target.classes.available">
     <antcall target="jar"/>
-    <antcall target="jar.asc"/>
   </target>
 
   <target name="jar" depends="build">
@@ -305,10 +304,12 @@
        </manifest>
     </jar>
     <checksum fileext=".md5" 
file="${target.deliverables.jars.dir}/${project.filename}"/>
+    <antcall target="jar.asc"/>
   </target>
 
   <target name="jar.asc" if="gpg.declared">
     <echo message="Generating ASC"/>
+    <delete file="${target.deliverables.jars.dir}/${project.filename}.asc"/>
     <exec executable="${project.gpg.exe}">
       <arg value="-a"/>
       <arg value="-b"/>

Modified: development/main/home/transit/build.xml
==============================================================================
--- development/main/home/transit/build.xml     (original)
+++ development/main/home/transit/build.xml     Sun Feb  6 05:51:31 2005
@@ -40,6 +40,7 @@
 
   <target name="module.asc" if="gpg.declared">
     <echo message="Generating ASC"/>
+    <delete file="${module.file}.asc"/>
     <exec executable="${project.gpg.exe}">
       <arg value="-a"/>
       <arg value="-b"/>

Modified: development/main/home/util/build.xml
==============================================================================
--- development/main/home/util/build.xml        (original)
+++ development/main/home/util/build.xml        Sun Feb  6 05:51:31 2005
@@ -40,6 +40,7 @@
 
   <target name="module.asc" if="gpg.declared">
     <echo message="Generating ASC"/>
+    <delete file="${module.file}.asc"/>
     <exec executable="${project.gpg.exe}">
       <arg value="-a"/>
       <arg value="-b"/>

Modified: 
development/main/magic/core/src/main/net/dpml/magic/tasks/PrepareTask.java
==============================================================================
--- 
development/main/magic/core/src/main/net/dpml/magic/tasks/PrepareTask.java  
(original)
+++ 
development/main/magic/core/src/main/net/dpml/magic/tasks/PrepareTask.java  
Sun Feb  6 05:51:31 2005
@@ -89,7 +89,6 @@
         final File src = getContext().getSrcDirectory();
         final File etc = getContext().getEtcDirectory();
         final File build = getContext().getBuildDirectory();
-        final File buildEtcDir = new File( build, "etc" );
 
         if( src.exists() )
         {
@@ -118,26 +117,53 @@
             }
         }
 
-        //
-        // if there is a etc/deliverable directory, then copy the
-        // content to the target/deliverables directory
-        //
-
-        final File extra = new File( buildEtcDir, "deliverables" );
-        if( extra.exists() )
-        {
-            final File deliverables = 
getContext().getDeliverablesDirectory();
-            copy( extra, deliverables, false, "**/*", "" );
-        }
-
-        //
-        // copy any other etc directories directly to the target directory
-        //
-
         if( etc.exists() )
         {
             final String includes = project.getProperty( 
ETC_FILTERED_INCLUDES_KEY );
             final String excludes = project.getProperty( 
ETC_FILTERED_EXCLUDES_KEY );
+
+            //
+            // copy ${etc}/test content to ${target}/build/etc/test
+            //
+
+            final File buildEtcDir = new File( build, "etc" );
+            final File etcTest = new File( etc, "test" );
+            if( etcTest.exists() )
+            {
+                final File buildEtcTestDir = new File( buildEtcDir, "test" );
+                copy( etcTest, buildEtcTestDir, true, includes, excludes );
+                copy( etcTest, buildEtcTestDir, false, excludes, "" );
+            }
+
+            //
+            // copy ${etc}/main content to ${target}/build/main
+            //
+
+            final File buildMainDir = new File( build, "main" );
+            final File etcMain = new File( etc, "main" );
+            if( etcMain.exists() )
+            {
+                copy( etcMain, buildMainDir, true, includes, excludes );
+                copy( etcMain, buildMainDir, false, excludes, "" );
+            }
+
+            //
+            // copy ${etc}/deliverables directory to ${target}/deliverables
+            //
+
+            final File etcDeliverables = new File( etc, "deliverables" );
+            if( etcDeliverables.exists() )
+            {
+                final File deliverables = 
getContext().getDeliverablesDirectory();
+                copy( etcDeliverables, deliverables, true, includes, 
excludes );
+                copy( etcDeliverables, deliverables, false, excludes, "" );
+            }
+
+            //
+            //  ${etc}/* directories (excluding test, main and deliverables) 
+            // directly to the target directory
+            //
+
             final String standard = "main/**,test/**,deliverables/**,";
             copy( etc, target, true, includes, standard + excludes );
             copy( etc, target, false, excludes, standard );