From f6db199fe71b7f83acff66e6ee2913dc81113a84 Mon Sep 17 00:00:00 2001 From: Sean Evoy Date: Wed, 26 May 2004 15:24:01 +0000 Subject: [PATCH] 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. --- .../internal/core/GeneratedMakefileBuilder.java | 3 ++- .../cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java index a55c46ad86f..36594b3ea74 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java @@ -204,7 +204,8 @@ public class GeneratedMakefileBuilder extends ACBuilder { if (topBuildDir != null) { invokeMake(true, topBuildDir, info, monitor); } else { - monitor.done(); + statusMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, getProject().getName()); //$NON-NLS-1$ + monitor.subTask(statusMsg); return; } monitor.worked(1); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java index 94dfe627192..b807627b518 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java @@ -1086,7 +1086,10 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator { * @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator#getTopBuildDir() */ public IPath getBuildWorkingDir() { - return topBuildDir.removeFirstSegments(1); + if (topBuildDir != null) { + return topBuildDir.removeFirstSegments(1); + } + return null; } /**