From 31841a2ffec0cb85446074e401a2fabc3374e23a Mon Sep 17 00:00:00 2001
From: Mikhail Sennikovsky <mikhail.sennikovskiy@gmail.com>
Date: Fri, 8 Jun 2007 10:24:42 +0000
Subject: [PATCH] 1. Tool anouncement message fixes 2. Target tool calculation
 fixes 2. test fixes

---
 .../plugin.xml                                |  30 ++++----
 .../resources/oldTypeProjects/1.2/test12.zip  | Bin 3126 -> 4266 bytes
 .../copyandDeploy/copyandDeploy.zip           | Bin 4546 -> 6710 bytes
 .../inputTypeOption/inputTypeOption.zip       | Bin 5273 -> 7763 bytes
 .../core/tests/BasicTestCase.java             |  43 +++++++++++
 .../tests/ToolChainModificationTests.java     |  27 +++++++
 .../internal/core/FolderInfo.java             |  70 ++++++++++++++----
 .../managedbuilder/internal/core/Tool.java    |  19 +++--
 .../makegen/gnu/GnuMakefileGenerator.java     |  14 ++++
 9 files changed, 167 insertions(+), 36 deletions(-)
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BasicTestCase.java
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ToolChainModificationTests.java

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
index d6790ff715a..7d990cc98b3 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
@@ -6708,7 +6708,7 @@
       </managedBuildRevision>
       <tool
             natureFilter="cnature"
-            name="%ToolName.linker.gnu.c"
+            name="Test 4.0 ToolName.linker.gnu.c"
             outputFlag="-o"
 		  isSystem="true"
             command="gcc"
@@ -6727,12 +6727,12 @@
          
          <optionCategory
                owner="test.four.dot.zero.cdt.managedbuild.tool.gnu.c.linker"
-               name="%OptionCategory.General"
+               name="Test 4.0 OptionCategory.General"
                id="test.gnu.c.link.category.general">
          </optionCategory>
          <option
                defaultValue="false"
-               name="%Option.Posix.Linker.NoStartFiles"
+               name="Test 4.0 Option.Posix.Linker.NoStartFiles"
                category="test.gnu.c.link.category.general"
                command="-nostartfiles"
                id="test.gnu.c.link.option.nostart"
@@ -6740,7 +6740,7 @@
          </option>
          <option
                defaultValue="false"
-               name="%Option.Posix.Linker.NoDefLibs"
+               name="Test 4.0 Option.Posix.Linker.NoDefLibs"
                category="test.gnu.c.link.category.general"
                command="-nodefaultlibs"
                id="test.gnu.c.link.option.nodeflibs"
@@ -6748,7 +6748,7 @@
          </option>
          <option
                defaultValue="false"
-               name="%Option.Posix.Linker.NoStdLibs"
+               name="Test 4.0 Option.Posix.Linker.NoStdLibs"
                category="test.gnu.c.link.category.general"
                command="-nostdlib"
                id="test.gnu.c.link.option.nostdlibs"
@@ -6756,7 +6756,7 @@
          </option>
          <option
                defaultValue="false"
-               name="%Option.Posix.Linker.Strip"
+               name="Test 4.0 Option.Posix.Linker.Strip"
                category="test.gnu.c.link.category.general"
                command="-s"
                id="test.gnu.c.link.option.strip"
@@ -6764,7 +6764,7 @@
          </option>
          <option
                defaultValue="false"
-               name="%Option.Posix.Linker.Static"
+               name="Test 4.0 Option.Posix.Linker.Static"
                category="test.gnu.c.link.category.general"
                command="-static"
                id="test.gnu.c.link.option.noshared"
@@ -6772,11 +6772,11 @@
          </option>
          <optionCategory
                owner="test.four.dot.zero.cdt.managedbuild.tool.gnu.c.linker"
-               name="%OptionCategory.Libs"
+               name="Test 4.0 OptionCategory.Libs"
                id="test.gnu.c.link.category.libs">
          </optionCategory>
          <option
-               name="%Option.Posix.Libs"
+               name="Test 4.0 Option.Posix.Libs"
                category="test.gnu.c.link.category.libs"
                command="-l"
                id="test.gnu.c.link.option.libs"
@@ -6784,7 +6784,7 @@
                valueType="libs">
          </option>
          <option
-               name="%Option.Posix.Libsearch"
+               name="Test 4.0 Option.Posix.Libsearch"
                category="test.gnu.c.link.category.libs"
                command="-L"
                id="test.gnu.c.link.option.paths"
@@ -6793,17 +6793,17 @@
          </option>
          <optionCategory
                owner="test.four.dot.zero.cdt.managedbuild.tool.gnu.c.linker"
-               name="%OptionCategory.Misc"
+               name="Test 4.0 OptionCategory.Misc"
                id="test.gnu.c.link.category.other">
          </optionCategory>
          <option
-               name="%Option.Posix.Linker.Flags"
+               name="Test 4.0 Option.Posix.Linker.Flags"
                category="test.gnu.c.link.category.other"
                valueType="string"
                id="test.gnu.c.link.option.ldflags">
          </option>
          <option
-               name="%Option.Posix.Linker.XLinker"
+               name="Test 4.0 Option.Posix.Linker.XLinker"
                category="test.gnu.c.link.category.other"
                command="-Xlinker ${VALUE}"
                valueType="stringList"
@@ -8348,7 +8348,7 @@
                      archList="all"
                      osList="win32"
                      name="Test 4.0 ToolChainName.Cygwin"
-                     targetTool="test.four.dot.zero.cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base;cdt.managedbuild.tool.gnu.c.linker.cygwin.base;cdt.managedbuild.tool.gnu.archiver"
+                     targetTool="test.four.dot.zero.cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base;test.four.dot.zero.cdt.managedbuild.tool.gnu.c.linker.cygwin.base;test.four.dot.zero.cdt.managedbuild.tool.gnu.archiver"
                      isSystem="true"
                      id="test.four.dot.zero.cdt.managedbuild.toolchain.gnu.cygwin.base">
                   <targetPlatform
@@ -8809,7 +8809,7 @@
               </toolChain>                                                                                				                    
          </configuration>         
       </projectType>                              
-   	              
+     
    </extension>
    
    
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/test12.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/test12.zip
index 6e6cfd4790421f9a54403530d805a440dac99c27..5a2b76083636303d19d1b6144539c448b7333615 100644
GIT binary patch
literal 4266
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
LL5-1L27vzn^C(Xy

delta 2160
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

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/copyandDeploy.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/copyandDeploy.zip
index 2959549df372bad020bb0ed52bfbbb00a54e32de..9b2ff5965e01601952c6f091b6e8bc32524ba8f4 100644
GIT binary patch
literal 6710
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
Q00a0g2UGMU8{yag0SX4t!~g&Q

literal 4546
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
G;C}!nde~P0

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/inputTypeOption/inputTypeOption.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/inputTypeOption/inputTypeOption.zip
index 0c446e90ecb8220923016559871828cfd6723eb9..ee3fc818777e3979c83a01fa6d6cf46de2bc0203 100644
GIT binary patch
literal 7763
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
NR0B!zFD~%ge*kx|dO!dG

delta 3531
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
IAvW6VKbg2h3jhEB

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BasicTestCase.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BasicTestCase.java
new file mode 100644
index 00000000000..81736dfadd2
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BasicTestCase.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Intel Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Intel Corporation - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.managedbuilder.core.tests;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+
+public class BasicTestCase extends TestCase {
+	private List fProjList = new LinkedList();
+	
+	protected void addProject(IProject project){
+		fProjList.add(project);
+	}
+
+	protected void setUp() throws Exception {
+		super.setUp();
+	}
+
+	protected void tearDown() throws Exception {
+		for(Iterator iter = fProjList.iterator(); iter.hasNext();){
+			IProject proj = (IProject)iter.next();
+			try {
+				proj.delete(true, null);
+			} catch (CoreException e){
+			}
+		}
+		super.tearDown();
+	}
+}
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ToolChainModificationTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ToolChainModificationTests.java
new file mode 100644
index 00000000000..20457a22b5f
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ToolChainModificationTests.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Intel Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Intel Corporation - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.managedbuilder.core.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class ToolChainModificationTests extends BasicTestCase {
+	
+	public static Test suite() {
+		TestSuite suite = new TestSuite(ToolChainModificationTests.class);
+		
+		return suite;
+	}
+
+//	public void testChangeToolChain(){
+//		
+//	}
+}
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
index cf3924d9d09..2d7d047a90d 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
@@ -41,6 +41,7 @@ import org.eclipse.cdt.managedbuilder.core.IManagedConfigElement;
 import org.eclipse.cdt.managedbuilder.core.IManagedProject;
 import org.eclipse.cdt.managedbuilder.core.IModificationStatus;
 import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.cdt.managedbuilder.core.IOutputType;
 import org.eclipse.cdt.managedbuilder.core.IResourceInfo;
 import org.eclipse.cdt.managedbuilder.core.ITargetPlatform;
 import org.eclipse.cdt.managedbuilder.core.ITool;
@@ -1095,12 +1096,12 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
 			toolChain.addTool((Tool)added[i]);
 		}
 		
-		adjustTargetTools(removed, getTools());
+		adjustTargetTools(removed, added);
 		
 		toolChain.propertiesChanged();
 	}
 	
-	private void adjustTargetTools(ITool removed[], ITool allTools[]){
+	private void adjustTargetTools(ITool removed[], ITool added[]){
 		if(!isRoot())
 			return;
 		
@@ -1110,21 +1111,29 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
 		set.addAll(Arrays.asList(ids));
 		
 		for(int i = 0; i < removed.length; i++){
-			ITool target = getTargetTool(removed[i]);
+			Object[] tInfo = getTargetTool(removed[i]);
 			
-			if(target == null)
+			if(tInfo == null)
 				continue;
-			
-			List list = BuildSettingsUtil.calcDependentTools(allTools, target, null);
+
+			ITool target = (ITool)tInfo[0];
+			String tId = (String)tInfo[1];
+
+			List list = BuildSettingsUtil.calcDependentTools(added, target, null);
 			if(list.size() != 0)
 				continue;
 			
-			ITool newTargetTool = findCompatibleTargetTool(target, allTools);
-			if(newTargetTool != null){
-				set.remove(target.getId());
-				set.add(newTargetTool.getId());
-				targetToolsModified = true;
-			}
+			ITool newTargetTool = findCompatibleTargetTool(target, added);
+			if(newTargetTool == null)
+				continue;
+			
+			newTargetTool = ManagedBuildManager.getExtensionTool(newTargetTool);
+			if(newTargetTool == null)
+				continue;
+
+			set.remove(tId);
+			set.add(newTargetTool.getId());
+			targetToolsModified = true;
 		}
 		
 		if(targetToolsModified){
@@ -1149,10 +1158,43 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
 				break;
 		}
 		
+		if(compatibleTool == null){
+			//try to match build output variable
+			Set set = getToolOutputVars(tool);
+			for(int i = 0; i < allTools.length; i++){
+				IOutputType types[] = allTools[i].getOutputTypes();
+				for(int k = 0; k < types.length; k++){
+					String var = types[k].getBuildVariable();
+					if(var != null && set.contains(var)){
+						compatibleTool = allTools[i];
+						break;
+					}
+					
+				}
+
+				if(compatibleTool != null)
+					break;
+			}
+		}
+		
 		return compatibleTool;
 	}
 	
-	private ITool getTargetTool(ITool tool){
+	private Set getToolOutputVars(ITool tool){
+		Set set = new HashSet();
+		
+		IOutputType types[] = tool.getOutputTypes();
+		for(int k = 0; k < types.length; k++){
+			String var = types[k].getBuildVariable();
+			if(var != null)
+				set.add(var);
+			
+		}
+		
+		return set;
+	}
+	
+	private Object[] getTargetTool(ITool tool){
 		String [] ids = toolChain.getTargetToolList();
 		
 		for(int i = 0; i < ids.length; i++){
@@ -1163,7 +1205,7 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
 					break;
 			}
 			if(target != null)
-				return target;
+				return new Object[]{target, id};
 				
 		}
 		return null;
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
index 1edd1c1c93b..eb7aa0100da 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
@@ -2119,15 +2119,20 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
 	 * @see org.eclipse.cdt.core.build.managed.ITool#getAnnouncement()
 	 */
 	public String getAnnouncement() {
+		String an = getAnnouncementAttribute();
+		if(an == null){
+			an = ManagedMakeMessages.getResourceString(DEFAULT_ANNOUNCEMENT_PREFIX) +
+						WHITESPACE + getName();  // + "(" + getId() + ")";  
+		}
+		return an;
+	}
+	
+	public String getAnnouncementAttribute() {
 		if (announcement == null) {
 			if (getSuperClass() != null) {
-				return getSuperClass().getAnnouncement();
-			} else {
-				//  Generate the default announcement string for the Tool
-				String defaultAnnouncement = ManagedMakeMessages.getResourceString(DEFAULT_ANNOUNCEMENT_PREFIX) +
-					WHITESPACE + getName();  // + "(" + getId() + ")";  
-				return defaultAnnouncement;
-			}
+				return ((Tool)getSuperClass()).getAnnouncementAttribute();
+			} 
+			return null;
 		}
 		return announcement;
 	}
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
index 3cdc3ce79c2..4ab96a7d177 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
@@ -2046,9 +2046,23 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
 					addToBuildVar(buildVarToRuleStringMap, ext, varName, relativePath, sourceLocation, generatedSource);
 			}
 		}
+
 		ToolInfoHolder h = getToolInfo(rcInfo.getPath());
 		ITool buildTools[] = h.buildTools;
 		
+//		if(tool == null){
+//			for (int j=0; j<buildTools.length; j++) {
+//				if (buildTools[j].buildsFileType(ext)) {
+//					if (tool == null) {
+//						tool = buildTools[j];
+//					}
+//					addToBuildVar(buildVarToRuleStringMap, ext, varName, relativePath, sourceLocation, generatedSource);
+//					break;
+//				}
+//			}
+//		}
+//		
+//		if(tool == null && rcInfo.getPath().segmentCount() != 0){
 		if(tool == null){
 			h = getToolInfo(Path.EMPTY);
 			buildTools = h.buildTools;