Skip to content

Commit 14f670f

Browse files
author
jan
committed
menu->project->clean resulted in errors #1666
1 parent 955c14e commit 14f670f

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

io.sloeber.autoBuild/src/io/sloeber/autoBuild/api/AutoBuildBuilderExtension.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ public boolean invokeBuild(IBuilder builder, int kind, String targetName, IAuto
2020
return builder.getBuildRunner().invokeBuild(kind,targetName, autoData, markerGenerator, console, monitor);
2121
}
2222

23-
public boolean invokeClean(IBuilder builder,int kind, IAutoBuildConfigurationDescription autoData,
23+
public void invokeClean(IBuilder builder,int kind, IAutoBuildConfigurationDescription autoData,
2424
IMarkerGenerator markerGenerator, IConsole console,
2525
IProgressMonitor monitor) throws CoreException{
26-
return builder.getBuildRunner().invokeClean(kind, autoData, markerGenerator, console,
26+
builder.getBuildRunner().invokeClean(kind, autoData, markerGenerator, console,
2727
monitor);
2828
}
2929

io.sloeber.autoBuild/src/io/sloeber/autoBuild/api/IBuildRunner.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public boolean invokeBuild(int kind, String targetName, IAutoBuildConfiguration
5454
IMarkerGenerator markerGenerator, IConsole console,
5555
IProgressMonitor monitor) throws CoreException;
5656

57-
public boolean invokeClean(int kind, IAutoBuildConfigurationDescription autoData,
57+
public void invokeClean(int kind, IAutoBuildConfigurationDescription autoData,
5858
IMarkerGenerator markerGenerator, IConsole console,
5959
IProgressMonitor monitor) throws CoreException;
6060

io.sloeber.autoBuild/src/io/sloeber/autoBuild/extensionPoint/providers/BuildRunnerForMake.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,17 @@
6262
public class BuildRunnerForMake implements IBuildRunner {
6363

6464
@Override
65-
public boolean invokeClean(int kind, IAutoBuildConfigurationDescription autoData,
65+
public void invokeClean(int kind, IAutoBuildConfigurationDescription autoData,
6666
IMarkerGenerator markerGenerator, IConsole console, IProgressMonitor monitor) throws CoreException {
6767
IFolder buildRoot = autoData.getBuildFolder();
68+
if(!buildRoot.exists()) {
69+
return ;
70+
}
6871
//Do not delete the build folder as it may be in use with other processes (like discovery)
6972
for(IResource curMember:buildRoot.members()) {
7073
curMember.delete(true, monitor);
7174
}
7275
//buildRoot.create(true, true, monitor);
73-
return false;
7476
// for now I do not run make clean due to the fact rm -f is probably not on the system path
7577
//return invokeBuild(IncrementalProjectBuilder.CLEAN_BUILD, envp, autoData, markerGenerator, console, monitor);
7678
}

io.sloeber.autoBuild/src/io/sloeber/autoBuild/extensionPoint/providers/InternalBuildRunner.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,19 @@ private static void createFolder(IFolder folder, boolean force, boolean local, I
8484
}
8585

8686
@Override
87-
public boolean invokeClean(int kind, IAutoBuildConfigurationDescription autoData, IMarkerGenerator markerGenerator,
87+
public void invokeClean(int kind, IAutoBuildConfigurationDescription autoData, IMarkerGenerator markerGenerator,
8888
IConsole console, IProgressMonitor monitor) throws CoreException {
8989
IFolder buildRoot = autoData.getBuildFolder();
90+
if(!buildRoot.exists()) {
91+
return ;
92+
}
9093
//Do not delete the build folder as it may be in use with other processes (like discovery)
9194
for(IResource curMember:buildRoot.members()) {
9295
curMember.delete(true, monitor);
9396
}
9497
// buildRoot.delete(true, monitor);
9598
// buildRoot.create(true, true, monitor);
96-
return false;
99+
return ;
97100
}
98101

99102
@Override

io.sloeber.core/src/io/sloeber/core/builder/SloeberBuilderExtension.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ private static void generateExtensionMakeFile(IAutoBuildConfigurationDescription
108108
}
109109

110110
@Override
111-
public boolean invokeClean(IBuilder builder, int kind, IAutoBuildConfigurationDescription autoData,
111+
public void invokeClean(IBuilder builder, int kind, IAutoBuildConfigurationDescription autoData,
112112
IMarkerGenerator markerGenerator, IConsole console, IProgressMonitor monitor) throws CoreException {
113113
InoPreprocessor.deleteSloeberInoCPPFile(autoData, monitor);
114114
IFile file = autoData.getBuildFolder().getFile(AutoBuildConstants.MAKE_FILE_EXTENSION);
115115
if (file.exists()) {
116116
file.delete(true, monitor);
117117
}
118-
return super.invokeClean(builder, kind, autoData, markerGenerator, console, monitor);
118+
super.invokeClean(builder, kind, autoData, markerGenerator, console, monitor);
119119
}
120120

121121
public SloeberBuilderExtension() {

0 commit comments

Comments
 (0)