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

Fix for bug64085 -- NPE on New managed project creation. Getting the working directory for an empty project was a no-no, and one of the changes I made introduced the possibility of this happening during autobuild.

Browse source
This commit is contained in:
Sean Evoy 2004-05-26 15:24:01 +00:00
parent 24b52e838e
commit f6db199fe7
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java
View file

@ -204,7 +204,8 @@ public class GeneratedMakefileBuilder extends ACBuilder {
if (topBuildDir != null) { if (topBuildDir != null) {
invokeMake(true, topBuildDir, info, monitor); invokeMake(true, topBuildDir, info, monitor);
} else { } else {
monitor.done(); statusMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, getProject().getName()); //$NON-NLS-1$
monitor.subTask(statusMsg);
return; return;
} }
monitor.worked(1); monitor.worked(1);

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

@ -1086,7 +1086,10 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
* @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator#getTopBuildDir() * @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator#getTopBuildDir()
*/ */
public IPath getBuildWorkingDir() { public IPath getBuildWorkingDir() {
return topBuildDir.removeFirstSegments(1); if (topBuildDir != null) {
return topBuildDir.removeFirstSegments(1);
}
return null;
} }
/** /**