From 5f43e1dbcb92d9dfd9e585bb66229d7070a9e111 Mon Sep 17 00:00:00 2001
From: Leo Treggiari <leo.treggiari@intel.com>
Date: Fri, 16 Sep 2005 14:09:09 +0000
Subject: [PATCH] Fix for bug 104515 - converter support for 2.0 projects

---
 .../test20/Test20.zip                         | Bin 0 -> 3258 bytes
 .../test21/Test21.zip                         | Bin 0 -> 2866 bytes
 .../tests/ManagedProject30MakefileTests.java  |   2 +-
 .../core/tests/MultiVersionSupportTests.java  | 178 ++++++++++++++++++
 .../core/tests/ProjectConverter20.java        |  30 +++
 .../core/tests/ProjectConverter21.java        |  30 +++
 .../managedbuilder/internal/core/Builder.java |   2 +-
 .../managedbuilder/internal/core/Tool.java    |   2 +-
 .../internal/core/ToolChain.java              |   4 +-
 .../UpdateManagedProject20.java               |  15 +-
 10 files changed, 257 insertions(+), 6 deletions(-)
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/toolChainConversionProjects/test20/Test20.zip
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/toolChainConversionProjects/test21/Test21.zip
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ProjectConverter20.java
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ProjectConverter21.java

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/toolChainConversionProjects/test20/Test20.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/toolChainConversionProjects/test20/Test20.zip
new file mode 100644
index 0000000000000000000000000000000000000000..d6ee8e4b197593a3accdf1282f208c9014b45a2a
GIT binary patch
literal 3258
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
I{ciF903-A)zW@LL

literal 0
HcmV?d00001

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/toolChainConversionProjects/test21/Test21.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/toolChainConversionProjects/test21/Test21.zip
new file mode 100644
index 0000000000000000000000000000000000000000..c7977ccf9a2c2a0843a177276c3d03d14b1845bd
GIT binary patch
literal 2866
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
Z68zk-L`%^Xf=4UCw>emXF2Ml?_#b97Wi<c*

literal 0
HcmV?d00001

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java
index dd26b516e94..15632862633 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java
@@ -567,7 +567,7 @@ public class ManagedProject30MakefileTests extends TestCase {
 				 Path.fromOSString("objects.mk"), 
 				 Path.fromOSString("sources.mk"), 
 				 Path.fromOSString("module/subdir.mk"),
-				 Path.fromOSString("sources/subdir.mk")};
+				 Path.fromOSString("Sources/subdir.mk")};
 		IProject[] projects = createProjects("CDTFortranTest2", null, null, true);
 		buildProjects(projects, makefiles);
 	}
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/MultiVersionSupportTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/MultiVersionSupportTests.java
index 500f14c8140..c261c01d206 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/MultiVersionSupportTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/MultiVersionSupportTests.java
@@ -12,6 +12,14 @@
 package org.eclipse.cdt.managedbuilder.core.tests;
 
 
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Map;
 
 import junit.framework.Test;
@@ -31,16 +39,24 @@ import org.eclipse.cdt.managedbuilder.core.ITool;
 import org.eclipse.cdt.managedbuilder.core.IToolChain;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
 import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.cdt.managedbuilder.projectconverter.UpdateManagedProjectManager;
+import org.eclipse.cdt.managedbuilder.testplugin.CTestPlugin;
+import org.eclipse.cdt.managedbuilder.testplugin.ManagedBuildTestHelper;
 
 import org.eclipse.core.resources.IProject;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceDescription;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.ui.dialogs.IOverwriteQuery;
 
 
 public class MultiVersionSupportTests extends TestCase {
@@ -62,6 +78,8 @@ public class MultiVersionSupportTests extends TestCase {
 		suite.addTest(new MultiVersionSupportTests("testConfigurationDescription"));	//$NON-NLS-1$
 		suite.addTest(new MultiVersionSupportTests("testVersionInfo"));	//$NON-NLS-1$
 		suite.addTest(new MultiVersionSupportTests("testVersionsSupportedAttribute"));	//$NON-NLS-1$
+		suite.addTest(new MultiVersionSupportTests("testToolChainConversion_CDT20")); //$NON-NLS-1$
+		suite.addTest(new MultiVersionSupportTests("testToolChainConversion_CDT21")); //$NON-NLS-1$
 
 		//$JUnit-END$
 		return suite;
@@ -374,4 +392,164 @@ public class MultiVersionSupportTests extends TestCase {
 		cfgs = mproj.getConfigurations();
 		assertNotNull(cfgs);		
 	}
+	
+	public void testToolChainConversion_CDT20() throws Exception {
+		// Pass CDT version as '2.0', and 'true' to update Project
+		doTestProjectUpdate("2.0", true);	//$NON-NLS-1$
+		
+		String tmpDir = System.getProperty("java.io.tmpdir");	//$NON-NLS-1$	
+		
+		File inputFile = new File(tmpDir + "/converterOutput20.txt");	//$NON-NLS-1$
+		try {
+			assertTrue(inputFile.exists());
+			
+			String expectedContent = "Converter for CDT 2.0 Project is invoked";	//$NON-NLS-1$
+			
+			BufferedReader data = new BufferedReader(new FileReader(inputFile));
+			String actualContent;
+			
+			if ((actualContent = data.readLine()) != null) {
+				assertEquals(actualContent,expectedContent);
+			}			
+			
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();			
+		}
+	}
+	
+	public void testToolChainConversion_CDT21() throws Exception {
+		// Pass CDT version as '2.1', and 'true' to update Project
+		doTestProjectUpdate("2.1", true);	//$NON-NLS-1$
+		
+		String tmpDir = System.getProperty("java.io.tmpdir");	//$NON-NLS-1$	
+		
+		File inputFile = new File(tmpDir + "/converterOutput21.txt");	//$NON-NLS-1$
+		try {
+			assertTrue(inputFile.exists());
+			
+			String expectedContent = "Converter for CDT 2.1 Project is invoked";	//$NON-NLS-1$
+			
+			BufferedReader data = new BufferedReader(new FileReader(inputFile));
+			String actualContent;
+			
+			if ((actualContent = data.readLine()) != null) {
+				assertEquals(actualContent,expectedContent);
+			}			
+			
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();			
+		}
+	}
+	
+	
+	
+	private IProject getCDT_TestProject(String cdtVersion) {
+
+		IProject project = null;
+		File file = null;
+		
+		if (cdtVersion.equalsIgnoreCase("2.0")) {	//$NON-NLS-1$
+			file = CTestPlugin.getFileInPlugin(new Path(
+					"resources/toolChainConversionProjects/test20"));	//$NON-NLS-1$
+		} else if (cdtVersion.equals("2.1")) {	//$NON-NLS-1$
+			file = CTestPlugin.getFileInPlugin(new Path(
+			"resources/toolChainConversionProjects/test21"));	//$NON-NLS-1$
+		}
+
+		if (file == null) {
+			fail("Test project directory " + file.getName()	//$NON-NLS-1$
+					+ " is missing.");	//$NON-NLS-1$
+			return null;
+		}
+
+		File projectZips[] = file.listFiles(new FileFilter() {
+			public boolean accept(File pathname) {
+				if (pathname.isDirectory())
+					return false;
+				return true;
+			}
+		});
+
+		ArrayList projectList = new ArrayList(projectZips.length);
+		assertEquals(projectZips.length, 1);
+
+		try {
+			String projectName = projectZips[0].getName();
+			if (!projectName.endsWith(".zip"))
+				fail("No projects found in test 'toolChainConversionProjects' project directory "	//$NON-NLS-1$
+						+ file.getName()
+						+ ".  The .zip file may be missing or corrupt.");	//$NON-NLS-1$
+
+			projectName = projectName.substring(0, projectName.length()
+					- ".zip".length());	//$NON-NLS-1$
+			if (projectName.length() == 0)
+				fail("No projects found in test 'toolChainConversionProjects' project directory "	//$NON-NLS-1$
+						+ file.getName()
+						+ ".  The .zip file may be missing or corrupt.");	//$NON-NLS-1$
+			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+		// Path path = (Path) root.getLocation();
+			IPath location = new Path( root.getLocation().toString() );
+			project = ManagedBuildTestHelper.createProject(
+					projectName, projectZips[0], null, null);
+			if (project != null)
+				projectList.add(project);
+		} catch (Exception e) {
+			System.out.println("Exception Occured.");	//$NON-NLS-1$
+		}
+
+		if (projectList.size() == 0) {
+			fail("No projects found in test project directory "		//$NON-NLS-1$
+					+ file.getName()
+					+ ".  The .zip file may be missing or corrupt.");	//$NON-NLS-1$
+			return null;
+		}
+		return project;
+	}
+	
+	private void doTestProjectUpdate(String cdtVersion, boolean updateProject) {
+		IOverwriteQuery queryALL = new IOverwriteQuery(){
+			public String queryOverwrite(String file) {
+				return ALL;
+			}};
+		IOverwriteQuery queryNOALL = new IOverwriteQuery(){
+			public String queryOverwrite(String file) {
+				return NO_ALL;
+			}};
+		
+		UpdateManagedProjectManager.setUpdateProjectQuery(updateProject ? queryALL : queryNOALL);
+
+		final IProject project = getCDT_TestProject(cdtVersion);
+		if (project == null)
+			return;
+
+		// the project conversion occurs the first time
+		// ManagedBuildManager.getBuildInfo gets called
+		// If requires it also invokes converters for the project.
+		IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+
+		// check whether the managed build info is converted
+		boolean isCompatible = UpdateManagedProjectManager
+				.isCompatibleProject(info);
+		assertTrue(isCompatible);
+
+		if (isCompatible) {
+			// check for correct update
+			if (!updateProject) {
+				// TODO: if the user has chosen not to update the
+				// project the
+				// .cdtbuild file should not change
+			} else {
+				// Make sure that we have a valid project
+				if (info == null || info.getManagedProject() == null
+						|| info.getManagedProject().isValid() == false) {
+					fail("the project \"" + project.getName()	//$NON-NLS-1$
+							+ "\" was not properly converted");	//$NON-NLS-1$
+				}
+			}
+		}
+		ManagedBuildTestHelper.removeProject(project.getName());
+	}
+	
 }
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ProjectConverter20.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ProjectConverter20.java
new file mode 100644
index 00000000000..b8417809312
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ProjectConverter20.java
@@ -0,0 +1,30 @@
+package org.eclipse.cdt.managedbuilder.core.tests;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import org.eclipse.cdt.managedbuilder.core.IBuildObject;
+import org.eclipse.cdt.managedbuilder.core.IConvertManagedBuildObject;
+
+public class ProjectConverter20 implements IConvertManagedBuildObject {
+
+	public IBuildObject convert(IBuildObject buildObj, String fromId,
+			String toId, boolean isConfirmed) {
+		
+		String tmpDir = System.getProperty("java.io.tmpdir");	//$NON-NLS-1$
+		
+		File outputFile = new File(tmpDir + "/converterOutput20.txt");	//$NON-NLS-1$
+		try {
+			FileWriter out = new FileWriter(outputFile);			
+			out.write("Converter for CDT 2.0 Project is invoked");	//$NON-NLS-1$
+			out.close();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+		//	e.printStackTrace();
+			System.out.println("Exception raised.");	//$NON-NLS-1$
+		}
+		return buildObj;
+	}
+
+}
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ProjectConverter21.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ProjectConverter21.java
new file mode 100644
index 00000000000..2e87e470443
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ProjectConverter21.java
@@ -0,0 +1,30 @@
+package org.eclipse.cdt.managedbuilder.core.tests;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import org.eclipse.cdt.managedbuilder.core.IBuildObject;
+import org.eclipse.cdt.managedbuilder.core.IConvertManagedBuildObject;
+
+public class ProjectConverter21 implements IConvertManagedBuildObject {
+
+	public IBuildObject convert(IBuildObject buildObj, String fromId,
+			String toId, boolean isConfirmed) {
+
+		String tmpDir = System.getProperty("java.io.tmpdir");	//$NON-NLS-1$	
+		
+		File outputFile = new File(tmpDir + "/converterOutput21.txt");	//$NON-NLS-1$
+		try {
+			FileWriter out = new FileWriter(outputFile);			
+			out.write("Converter for CDT 2.1 Project is invoked");	//$NON-NLS-1$
+			out.close();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+		//	e.printStackTrace();
+			System.out.println("Exception raised.");	//$NON-NLS-1$
+		}
+		return buildObj;
+	}
+
+}
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java
index 8457e42e83d..7e67debf426 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java
@@ -792,7 +792,7 @@ public class Builder extends BuildObject implements IBuilder {
 	 * converters and stores them.
 	 */
 
-	private void checkForMigrationSupport() {
+	public void checkForMigrationSupport() {
 
 		String tmpId = null;
 		boolean isExists = false;
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 a191d116f48..47a146ca2ef 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
@@ -2442,7 +2442,7 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory {
 	 * converters and stores them.
 	 */
 
-	private void checkForMigrationSupport() {
+	public void checkForMigrationSupport() {
 
 		boolean isExists = false;
 	
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
index bc6f9877958..694560c7cc5 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
@@ -1475,7 +1475,7 @@ public class ToolChain extends HoldsOptions implements IToolChain {
 	 * converters and adds them to the list.
 	 */
 
-	private void checkForMigrationSupport() {
+	public void checkForMigrationSupport() {
 
 		String tmpId = null;
 		boolean isExists = false;
@@ -1507,7 +1507,7 @@ public class ToolChain extends HoldsOptions implements IToolChain {
 			// toolChain version is supported
 
 			String baseId = ManagedBuildManager.getIdFromIdAndVersion(superClassId);
-			String version = ManagedBuildManager.getVersionFromIdAndVersion(superClassId);
+			String version = getVersionFromId().toString();
 
 			IToolChain[] toolChainElements = (IToolChain[]) subMap.values().toArray();
 			
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java
index 597572c2abd..8c337c4c2d2 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java
@@ -34,7 +34,10 @@ import org.eclipse.cdt.managedbuilder.core.IToolChain;
 import org.eclipse.cdt.managedbuilder.core.IToolReference;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.cdt.managedbuilder.internal.core.Builder;
 import org.eclipse.cdt.managedbuilder.internal.core.ManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.internal.core.Tool;
+import org.eclipse.cdt.managedbuilder.internal.core.ToolChain;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspace;
@@ -216,7 +219,8 @@ class UpdateManagedProject20 {
 		// Convert the tool references
 		
 		IToolChain toolChain = newConfig.getToolChain();
-		
+		((ToolChain)toolChain).checkForMigrationSupport();
+
 		if(targetEl.hasAttribute(ITarget.OS_LIST)){
 			String oses = targetEl.getAttribute(ITarget.OS_LIST);
 			String osList[] = oses.split(","); //$NON-NLS-1$
@@ -271,6 +275,12 @@ class UpdateManagedProject20 {
 			builder.setArguments(makeArguments);
 		}
 
+//		 by now if a builder is going to be created, it will have been
+		Builder builder = (Builder)toolChain.getBuilder();
+		if (! builder.isExtensionElement()) {
+			builder.checkForMigrationSupport();
+		}
+
 		NodeList toolRefNodes = oldConfig.getElementsByTagName(IConfigurationV2.TOOLREF_ELEMENT_NAME);
 		for (int refIndex = 0; refIndex < toolRefNodes.getLength(); ++refIndex) {
 			try{
@@ -334,6 +344,9 @@ class UpdateManagedProject20 {
 					ConverterMessages.getFormattedString("UpdateManagedProject20.5",toolId), null)); //$NON-NLS-1$
 		}
 			
+		// Check for migration support 
+		((Tool)tool).checkForMigrationSupport();
+		
 		//the tool found, proceed with conversion ...
 
 		if(oldToolRef.hasAttribute(IToolReference.COMMAND))