From bc48508cee84012b68b6955bb88a6e0dc203ad09 Mon Sep 17 00:00:00 2001
From: Leo Treggiari <leo.treggiari@intel.com>
Date: Fri, 20 May 2005 02:35:16 +0000
Subject: [PATCH] Additional test for mulitple input and output

---
 .../plugin.xml                                |   8 ++-
 .../test30Projects/test30_1/test30_1.zip      | Bin 0 -> 4259 bytes
 .../testplugin/TestLinkerNameProvider.java    |  63 ++++++++++++++++++
 .../tests/ManagedProject30MakefileTests.java  |  14 ++++
 4 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/test30_1.zip
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/TestLinkerNameProvider.java

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
index 66ca2019afb..81059ecd059 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
@@ -1859,6 +1859,7 @@
          <outputType
 			outputs=""
             buildVariable="EXECUTABLES"
+            nameProvider="org.eclipse.cdt.managedbuilder.testplugin.TestLinkerNameProvider"
             id="cdt.managedbuild.tool.testgnu30.c.linker.output">
          </outputType>
       </tool>
@@ -3119,7 +3120,7 @@
          <configuration
                name="TheConfig"
                id="test30_1.gnu.so.config"
-               artifactExtension="so.1.2.3"
+               artifactExtension="so.4.5.6"
                cleanCommand="rm -rf"
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser">
                <toolChain
@@ -3127,7 +3128,7 @@
                       osList="all"
                       name="ToolChain for test30_1"
                       scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
-                      targetTool="cdt.managedbuild.tool30.deploy.x.c"
+                      targetTool="test30_1.gnu.so.deploy"
                       secondaryOutputs="test30_1.gnu.so.cjpeg.output"
                       id="test30_1.gnu.so.toolchain">
 		          <targetPlatform
@@ -3201,6 +3202,7 @@
 			      		name="Strip object file"
 			      		command="strip"
 			            outputFlag="-o"
+			            commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}"
 			      		id="test30_1.gnu.so.strip">
 					 <optionCategory
 						  name="Misc"
@@ -3213,6 +3215,7 @@
 						  id="test30_1.gnu.so.strip.misc.other"
 						  valueType="string">
 					 </option>
+					 <!--  The following buildVariable should be ignored because a pattern rule is generated -->
 			         <inputType
 			            id="test30_1.gnu.so.strip.input"
 			            buildVariable="OBJS"
@@ -3229,6 +3232,7 @@
 			      		name="Convert to jpeg"
 			      		command="cjpeg"
 			            outputFlag="-outfile"
+			            commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}"
 			      		id="test30_1.gnu.so.cjpeg">
 					 <optionCategory
 						  name="Misc"
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/test30_1.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/test30_1.zip
new file mode 100644
index 0000000000000000000000000000000000000000..f9abb0d88f1c276aaff7c65b6ea41861ff165aea
GIT binary patch
literal 4259
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
D6^bUS

literal 0
HcmV?d00001

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/TestLinkerNameProvider.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/TestLinkerNameProvider.java
new file mode 100644
index 00000000000..157b28e467a
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/TestLinkerNameProvider.java
@@ -0,0 +1,63 @@
+/**********************************************************************
+ * Copyright (c) 2005 Intel Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors: 
+ * Intel Corporation - Initial API and implementation
+ **********************************************************************/
+
+package org.eclipse.cdt.managedbuilder.testplugin;
+
+import org.eclipse.cdt.managedbuilder.core.IManagedOutputNameProvider;
+import org.eclipse.cdt.managedbuilder.core.ITool;
+import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator;
+
+public class TestLinkerNameProvider implements IManagedOutputNameProvider {
+
+	public IPath[] getOutputNames(ITool tool, IPath[] primaryInputNames) {
+		IPath[] name = new IPath[1];
+		boolean isSO = false;
+		IOption optShared = tool.getOptionBySuperClassId("gnu.c.link.option30.shared");	//$NON-NLS-1$
+		if (optShared != null) {
+			try {
+				isSO = optShared.getBooleanValue();
+			} catch (Exception e) {}
+		}
+		if (isSO) {
+			String soName = "";	//$NON-NLS-1$
+			IOption optSOName = tool.getOptionBySuperClassId("gnu.c.link.option30.soname");	//$NON-NLS-1$
+			if (optSOName != null) {
+				try {
+					soName = optSOName.getStringValue();
+				} catch (Exception e) {}
+			}
+			if (soName != null && soName.length() > 0) {
+				name[0] = Path.fromOSString(soName);
+			} else {
+				name[0] = Path.fromOSString(primaryInputNames[0].removeFileExtension().addFileExtension("so").lastSegment());	//$NON-NLS-1$
+			}
+			return name;
+		} 
+		String fileName = "default";	//$NON-NLS-1$
+		if (primaryInputNames != null && primaryInputNames.length > 0) {
+			fileName = primaryInputNames[0].removeFileExtension().toString();
+			if (fileName.startsWith("$(") && fileName.endsWith(")")) {	//$NON-NLS-1$ //$NON-NLS-2$
+				fileName = fileName.substring(2,fileName.length()-1);
+			}
+		}
+		String[] exts = tool.getPrimaryOutputType().getOutputExtensions();
+		if (exts != null && exts[0].length() > 0) {
+			fileName += IManagedBuilderMakefileGenerator.DOT + exts[0];
+		}
+		name[0] = Path.fromOSString(fileName);
+		name[0] = name[0].removeFirstSegments(name[0].segmentCount() - 1);
+		return name;
+	}
+
+}
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject30MakefileTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject30MakefileTests.java
index a526a6ab288..62773bba7e7 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject30MakefileTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject30MakefileTests.java
@@ -56,6 +56,7 @@ public class ManagedProject30MakefileTests extends TestCase {
 		//        rather than an MBS functionality issue
 		//suite.addTest(new ManagedProject30MakefileTests("test30LinkedFolder"));
 		suite.addTest(new ManagedProject30MakefileTests("test30CopyandDeploy"));
+		suite.addTest(new ManagedProject30MakefileTests("test30_1"));
 		
 		return suite;
 	}
@@ -321,4 +322,17 @@ public class ManagedProject30MakefileTests extends TestCase {
 		IProject[] projects = createProjects("copyandDeploy", null, null, true);
 		buildProjects(projects, makefiles);
 	}
+
+	/* (non-Javadoc)
+	 * tests 3.0 style tool integration with pre and post process steps added to typical compile & link
+	 */
+	public void test30_1(){
+		IPath[] makefiles = {
+				 Path.fromOSString("makefile"), 
+				 Path.fromOSString("objects.mk"), 
+				 Path.fromOSString("sources.mk"), 
+				 Path.fromOSString("subdir.mk")};
+		IProject[] projects = createProjects("test30_1", null, null, true);
+		buildProjects(projects, makefiles);
+	}
 }