243376: do less resource copying. All on full build then non on incremental

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 6723462a5bf4a55fad317e62b1206aea4cb3b373..fd490009c5a9d44c7726feebbecdc207237b1deb 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -341,7 +341,12 @@ public class AjBuildManager implements IOutputClassFileNameProvider,IBinarySourc
             // have to tell state we succeeded or next is not incremental
             state.successfulCompile(buildConfig,batch);
 
-            copyResourcesToDestination();
+                       // For a full compile, copy resources to the destination
+                       // - they should not get deleted on incremental and AJDT
+                       // will handle changes to them that require a recopying
+            if (batch) {
+               copyResourcesToDestination();
+            }
             
             if (buildConfig.getOutxmlName() != null) {
                writeOutxmlFile();

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
index 4adf2bf42ebbeb9b5996ccba42505483bceb0228..284a6ad9035789db3e799b347f19f466b3692d31 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
@@ -761,7 +761,11 @@ public class AjState {
             }
                        
                        deleteClassFiles();
-                       deleteResources();
+                       // Do not delete resources on incremental build, AJDT will handle
+                       // copying updates to the output folder.  AspectJ only does a copy
+                       // of them on full build (see copyResourcesToDestination() call
+                       // in AjBuildManager)
+//                     deleteResources();
                        
                        addAffectedSourceFiles(thisTime,thisTime);
                } else {