mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 09:25:31 +02:00
Code Issues Wiki Activity

Fix for an NPE that was occurring after a dependency makefile update

Browse source
This commit is contained in:
Sean Evoy 2004-05-28 04:22:10 +00:00
parent cf2a2a38e8
commit 6dc35eb0c0
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
View file

@ -316,7 +316,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
* echo -n '<relative_path>/<name>.d <relative_path>/' >> <relative_path>/<name>.d && \
* <tool> -P -MM -MG <flags> $< >> <relative_path>/<name>.d
* @echo 'Finished building: $<'
* @echo
* @echo ' '
*
* Note that the macros all come from the build model and are
* resolved to a real command before writing to the module
@ -327,7 +327,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
* echo -n 'source1/foo.d source1/' >> source1/foo.d && \
* g++ -P -MM -MG -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers $< >> source1/foo.d
* @echo 'Finished building: $<'
* @echo
* @echo ' '
*
* @param relativePath
* @param buffer
@ -368,6 +368,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
// Say goodbye to the nice user
buffer.append(NEWLINE);
buffer.append(TAB + AT + ECHO + WHITESPACE + SINGLE_QUOTE + MESSAGE_FINISH_FILE + WHITESPACE + IN_MACRO + SINGLE_QUOTE + NEWLINE);
buffer.append(TAB + AT + ECHO + WHITESPACE + SINGLE_QUOTE + WHITESPACE + SINGLE_QUOTE + NEWLINE + NEWLINE);
}
@ -1142,7 +1143,11 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
}
// Put the generated comments in
outBuffer = addDefaultHeader();
if (!firstLine.startsWith(COMMENT_SYMBOL)) {
outBuffer = addDefaultHeader();
} else {
outBuffer = new StringBuffer();
}
// Some echo implementations misbehave and put the -n and newline in the output
if (firstLine.startsWith("-n")) {