DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Sat Feb  5 04:39:17 2005
New Revision: 1720

Modified:
   development/main/magic/core/src/main/net/dpml/magic/tasks/PrepareTask.java
Log:
Remove redundant duplication of files from etc to target/build/etc (non main, 
test and deliverables files are already copied to target/*.

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  
Sat Feb  5 04:39:17 2005
@@ -46,7 +46,7 @@
     private static final String ETC_FILTERED_EXCLUDES_KEY =
       "project.prepare.etc.filtered.excludes";
     private static final String ETC_FILTERED_EXCLUDES_VALUE =
-      "**/*.exe,**/*.jar*,**/*.dll,**/*.gif,**/*.jpeg,**/*.jpg";
+      "**/*.exe,**/*.jar*,**/*.dll,**/*.gif,**/*.jpeg,**/*.jpg,**/*.ico";
 
     public void init() throws BuildException
     {
@@ -118,14 +118,6 @@
             }
         }
 
-        if( etc.exists() )
-        {
-            final String includes = project.getProperty( 
ETC_FILTERED_INCLUDES_KEY );
-            final String excludes = project.getProperty( 
ETC_FILTERED_EXCLUDES_KEY );
-            copy( etc, buildEtcDir, true, includes, excludes );
-            copy( etc, buildEtcDir, false, excludes, "" );
-        }
-
         //
         // if there is a etc/deliverable directory, then copy the
         // content to the target/deliverables directory
@@ -144,9 +136,12 @@
 
         if( etc.exists() )
         {
-            copy( etc, target, true, "**/*", 
"main/**,test/**,deliverables/**" );
+            final String includes = project.getProperty( 
ETC_FILTERED_INCLUDES_KEY );
+            final String excludes = project.getProperty( 
ETC_FILTERED_EXCLUDES_KEY );
+            final String standard = "main/**,test/**,deliverables/**,";
+            copy( etc, target, true, includes, standard + excludes );
+            copy( etc, target, false, excludes, standard );
         }
-
     }
 
     private void prepareSrcMain()
@@ -195,20 +190,18 @@
        final File src, final File destination, final boolean filtering, 
final String includes, final String excludes )
     {
         mkDir( destination );
-
         final Copy copy = (Copy) getProject().createTask( "copy" );
         copy.setTaskName( getTaskName() );
         copy.setTodir( destination );
         copy.setFiltering( filtering );
         copy.setOverwrite( false );
         copy.setPreserveLastModified( true );
-
+        copy.setVerbose( true );
         final FileSet fileset = new FileSet();
         fileset.setDir( src );
         fileset.setIncludes( includes );
         fileset.setExcludes( excludes );
         copy.addFileset( fileset );
-
         copy.init();
         copy.execute();
     }