From: aclement <aclement>
Date: Thu, 14 Aug 2008 20:36:52 +0000 (+0000)
Subject: 243376: do less resource copying.  All on full build then non on incremental
X-Git-Tag: V162DEV_M1~133
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1cde15355781203652912df3345a21f6457e8f54;p=aspectj.git

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 6723462a5..fd490009c 100644
--- 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 4adf2bf42..284a6ad90 100644
--- 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 {