build: -T macro before whitespace

- on windows, add double quotes for the entire string

Author: ilg-ul

ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/LikerScriptCommandGenerator.java

@@ -11,10 +11,12 @@
 
 package ilg.gnuarmeclipse.managedbuild.cross;
 
+import org.eclipse.cdt.core.cdtvariables.CdtVariableException;
 import org.eclipse.cdt.managedbuilder.core.BuildException;
 import org.eclipse.cdt.managedbuilder.core.IOption;
 import org.eclipse.cdt.managedbuilder.core.IOptionCommandGenerator;
 import org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator;
+import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver;
 import org.eclipse.cdt.utils.cdtvariables.IVariableSubstitutor;
 
 public class LikerScriptCommandGenerator implements IOptionCommandGenerator {
@@ -23,17 +25,20 @@ public class LikerScriptCommandGenerator implements IOptionCommandGenerator {
 	public String generateCommand(IOption option,
 			IVariableSubstitutor macroSubstitutor) {
 
-		String command = null;
+		StringBuffer command = new StringBuffer();
 		try {
 			int valueType = option.getValueType();
 
 			if (valueType == IOption.STRING) {
 				// for compatibility with projects created with previous
 				// versions, keep accepting single strings
-				command = "-T "
-						+ GnuMakefileGenerator
-								.escapeWhitespaces(GnuMakefileGenerator
-										.ensureUnquoted(option.getStringValue()));
+
+				String value = option.getStringValue();
+				value = CdtVariableResolver.resolveToString(value,
+						macroSubstitutor);
+
+				command.append("-T ");
+				command.append(Utils.escapeWhitespaces(value));
 			} else if (valueType == IOption.STRING_LIST) {
 				for (String value : option.getStringListValue()) {
 
@@ -42,25 +47,24 @@ public String generateCommand(IOption option,
 					}
 
 					if (value.length() > 0) {
-						if (command == null)
-							command = "";
 
-						command += "-T "
-								+ GnuMakefileGenerator
-										.escapeWhitespaces(GnuMakefileGenerator
-												.ensureUnquoted(value)) + " ";
+						value = CdtVariableResolver.resolveToString(value,
+								macroSubstitutor);
+						command.append("-T ");
+						command.append(Utils.escapeWhitespaces(value));
+						command.append(" ");
 					}
 				}
-			}			
+			}
 		} catch (BuildException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
+		} catch (CdtVariableException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
 		}
-		
-		if (command != null)
-			command = command.trim();
-		
-		return command;
+
+		return command.toString().trim();
 	}
 
 }

ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/Utils.java

@@ -29,12 +29,20 @@ public class Utils {
 			+ ".staticLib";
 
 	private static final String PROPERTY_OS_NAME = "os.name"; //$NON-NLS-1$
+	public static final String PROPERTY_OS_VALUE_WINDOWS = "windows";//$NON-NLS-1$
+	public static final String PROPERTY_OS_VALUE_LINUX = "linux";//$NON-NLS-1$
+	public static final String PROPERTY_OS_VALUE_MACOSX = "macosx";//$NON-NLS-1$
 
 	public static boolean isPlatform(String sPlatform) {
 		return (System.getProperty(PROPERTY_OS_NAME).toLowerCase()
 				.startsWith(sPlatform));
 	}
 
+	static public boolean isWindows() {
+		return System.getProperty(PROPERTY_OS_NAME).toLowerCase()
+				.startsWith(PROPERTY_OS_VALUE_WINDOWS);
+	}
+
 	/**
 	 * Extracts a resource info from a build object. If no resource info can be
 	 * found, it returns null.
@@ -100,4 +108,29 @@ public static IOption forceOptionRewrite(IConfiguration config,
 		return config.setOption(toolchain, newOption, value);
 	}
 
+	static public String escapeWhitespaces(String path) {
+		path = path.trim();
+		// Escape the spaces in the path/filename if it has any
+		String[] segments = path.split("\\s"); //$NON-NLS-1$
+		if (segments.length > 1) {
+			if (isWindows()) {
+				if (path.startsWith("\"") || path.startsWith("'"))
+					return path;
+					
+				return "\"" + path + "\"";
+			} else {
+				StringBuffer escapedPath = new StringBuffer();
+				for (int index = 0; index < segments.length; ++index) {
+					escapedPath.append(segments[index]);
+					if (index + 1 < segments.length) {
+						escapedPath.append("\\ "); //$NON-NLS-1$
+					}
+				}
+				return escapedPath.toString().trim();
+			}
+		} else {
+			return path;
+		}
+	}
+
 }