mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-05 16:56:04 +02:00
Code Issues Wiki Activity

Fix for 87407: Scanner Discovery doesn't work if an encountered path contains spaces.

Browse source
This commit is contained in:
Vladimir Hirsl 2005-07-15 19:30:33 +00:00
parent 5507b484dd
commit 346e8f27c9
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CCommandDSC.java
View file

@ -101,7 +101,7 @@ public class CCommandDSC {
* Returns a command where -imacros and -include options have been removed * Returns a command where -imacros and -include options have been removed
* @return * @return
*/ */
public String getSCDRunnableCommand() { public String getSCDRunnableCommand(boolean quoteIncludePaths) {
String commandAsString = new String(); String commandAsString = new String();
for (Iterator i = compilerCommand.iterator(); i.hasNext(); ) { for (Iterator i = compilerCommand.iterator(); i.hasNext(); ) {
KVStringPair optionPair = (KVStringPair)i.next(); KVStringPair optionPair = (KVStringPair)i.next();
@ -113,8 +113,16 @@ public class CCommandDSC {
if (optionPair.getKey().equals(SCDOptionsEnum.IMACROS_FILE.toString()) || if (optionPair.getKey().equals(SCDOptionsEnum.IMACROS_FILE.toString()) ||
optionPair.getKey().equals(SCDOptionsEnum.INCLUDE_FILE.toString())) optionPair.getKey().equals(SCDOptionsEnum.INCLUDE_FILE.toString()))
continue; continue;
commandAsString += optionPair.getKey() + SINGLE_SPACE + if (quoteIncludePaths) {
optionPair.getValue() + SINGLE_SPACE; if (optionPair.getKey().equals(SCDOptionsEnum.INCLUDE.toString())) {
commandAsString += optionPair.getKey() + SINGLE_SPACE +
"\"" + optionPair.getValue() + "\"" + SINGLE_SPACE; //$NON-NLS-1$//$NON-NLS-2$
}
}
else {
commandAsString += optionPair.getKey() + SINGLE_SPACE +
optionPair.getValue() + SINGLE_SPACE;
}
} }
} }
return commandAsString.trim(); return commandAsString.trim();

2
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCDMakefileGenerator.java
View file

@ -84,7 +84,7 @@ public class SCDMakefileGenerator extends DefaultRunSIProvider {
buffer.append(':'); buffer.append(':');
buffer.append(ENDL); buffer.append(ENDL);
buffer.append("\t@echo begin generating scanner info for $@"+ENDL+"\t"); //$NON-NLS-1$ //$NON-NLS-2$ buffer.append("\t@echo begin generating scanner info for $@"+ENDL+"\t"); //$NON-NLS-1$ //$NON-NLS-2$
buffer.append(cmd.getSCDRunnableCommand()); buffer.append(cmd.getSCDRunnableCommand(true)); // quoteIncludePaths
buffer.append(" -E -P -v -dD "); //$NON-NLS-1$ buffer.append(" -E -P -v -dD "); //$NON-NLS-1$
buffer.append(cmd.appliesToCPPFileType() ? "specs.cpp" : "specs.c"); //$NON-NLS-1$ //$NON-NLS-2$ buffer.append(cmd.appliesToCPPFileType() ? "specs.cpp" : "specs.c"); //$NON-NLS-1$ //$NON-NLS-2$
buffer.append(ENDL); buffer.append(ENDL);