From df7907c7bd24a6fcafffd18aada3b44e3bf7a731 Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Sun, 9 Oct 2011 14:07:15 -0400
Subject: [PATCH] bug 360283:  Discovery command does not work if workspace
 name has spaces

---
 build/org.eclipse.cdt.make.core/plugin.xml             | 2 +-
 build/org.eclipse.cdt.managedbuilder.core/plugin.xml   | 6 +++---
 xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.xml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/org.eclipse.cdt.make.core/plugin.xml b/build/org.eclipse.cdt.make.core/plugin.xml
index 03f6d45a78a..36067e63368 100644
--- a/build/org.eclipse.cdt.make.core/plugin.xml
+++ b/build/org.eclipse.cdt.make.core/plugin.xml
@@ -122,7 +122,7 @@
       <scannerInfoProvider providerId="specsFile">
          <run
                command="gcc"
-               arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"
+               arguments="-E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;"
                class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
          <scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
       </scannerInfoProvider>
diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
index 532aee8a5f0..a34109351c3 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
@@ -86,7 +86,7 @@
       </buildOutputProvider>
       <scannerInfoProvider providerId="specsFile">
          <run
-               arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"
+               arguments="-E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;"
                command="gcc"
                class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
          <scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
@@ -105,7 +105,7 @@
       </buildOutputProvider>
       <scannerInfoProvider providerId="specsFile">
          <run
-               arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp"
+               arguments="-E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;"
                command="g++"
                class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
          <scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
@@ -124,7 +124,7 @@
       </buildOutputProvider>
       <scannerInfoProvider providerId="specsFile">
          <run
-               arguments="-E -P -v -dD ${plugin_state_location}/specs.c"
+               arguments="-E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;"
                command="gcc"
                class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
          <scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.xml b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.xml
index 37b503d103b..0ffec99f949 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.xml
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.xml
@@ -28,7 +28,7 @@
 			<!-- The compiler command used will be always a C compiler command -->
 			<!-- The output for C or C++ projects will be different as the ScannerInfoProvider substitute the ${specs_file} variable below with a dummy "c" file or "cpp" file -->
 			<run
-					arguments="-E -v ${plugin_state_location}/${specs_file}"
+					arguments="-E -v &quot;${plugin_state_location}/${specs_file}&quot;"
 					command="${XL_compilerRoot}/xlc"
 					class="org.eclipse.cdt.make.xlc.core.scannerconfig.XlCSpecsRunSIProvider">
 			</run>
@@ -65,7 +65,7 @@
 			<!-- The compiler command used will be always a C compiler command -->
 			<!-- The output for C or C++ projects will be different as the ScannerInfoProvider substitute the ${specs_file} variable below with a dummy "c" file or "cpp" file -->
 			<run
-					arguments="-E -v ${plugin_state_location}/${specs_file}"
+					arguments="-E -v &quot;${plugin_state_location}/${specs_file}&quot;"
 					command="${XL_compilerRoot}/xlC"
 					class="org.eclipse.cdt.make.xlc.core.scannerconfig.XlCSpecsRunSIProvider">
 			</run>