From efcd048454a70317d7e6818ce4fd75966e67ba00 Mon Sep 17 00:00:00 2001 From: Sean Evoy Date: Fri, 25 Jun 2004 13:31:38 +0000 Subject: [PATCH] Check-in for bug 68485 - CoreException after creating a Managed C project --- .../internal/core/PluginResources.properties | 7 ++++--- .../makegen/gnu/GnuMakefileGenerator.java | 14 +++----------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties index 9dd1b9e1716..bb36c86ef52 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties @@ -48,9 +48,10 @@ MakefileGenerator.comment.source.list = All of the sources participating in the MakefileGenerator.comment.build.rule = Each subdirectory must supply rules for building sources it contributes MakefileGenerator.comment.module.make.includes = Include the makefiles for each source subdirectory MakefileGenerator.comment.module.dep.includes = Include automatically-generated dependency list: -MakefileGenerator.comment.autodeps = Automatically-generated dependency list: -MakefileGenerator.comment.header = Automatically-generated file. Do not edit! -MakefileGenerator.error.spaces = Cannot generate makefile for folder with spaces in name +MakefileGenerator.comment.autodeps=Automatically-generated dependency list: +MakefileGenerator.comment.header=Automatically-generated file. Do not edit! +MakefileGenerator.error.spaces=Cannot generate makefile for folder with spaces in name +MakefileGenerator.warning.no.source=Nothing to build for project {0} ManagedBuildInfo.message.job.init = Initializing path container for {0} ManagedBuildInfo.message.init.ok = Initializing path container succeeded for {0} \ No newline at end of file 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 9663ff5b5c3..3a1adb31f38 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 @@ -791,7 +791,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator { depFile.delete(true, new SubProgressMonitor(monitor, 1)); } catch (CoreException e) { // This had better be allowed during a build - ManagedBuilderCorePlugin.log(e); + } } } @@ -811,7 +811,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator { depFile.delete(true, new SubProgressMonitor(monitor, 1)); } catch (CoreException e) { // This had better be allowed during a build - ManagedBuilderCorePlugin.log(e); + } } } @@ -866,7 +866,6 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator { throw e; } catch (IOException e) { // Keep trying - ManagedBuilderCorePlugin.log(e); continue; } } @@ -1229,7 +1228,6 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator { firstLine = (String) deps.get(0); } catch (ArrayIndexOutOfBoundsException e) { // This makes no sense so bail - ManagedBuilderCorePlugin.log(e); return; } @@ -1522,7 +1520,6 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator { throw e; } catch (IOException e) { // This looks like a problem reading or writing the file - ManagedBuilderCorePlugin.log(e); continue; } } @@ -1541,12 +1538,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator { // Populate the makefile if any source files have been found in the project if (getSubdirList().isEmpty()) { - throw new CoreException(new Status( - IStatus.WARNING, - ManagedBuilderCorePlugin.getUniqueIdentifier(), - NO_SOURCE_FOLDERS, - new String(), - null)); + monitor.subTask(ManagedMakeMessages.getFormattedString("MakefileGenerator.warning.no.source", project.getName())); //$NON-NLS-1$ } // Create the top-level directory for the build output