Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IEP-1374 GH #1088: Launch in run mode does a redundant re-building even after build was triggered before that . #1107

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

IEP-1374 GH #1088: Launch in run mode does a redundant re-building even after build was triggered before that . #1107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d6a0c1
fix: fixed redundant build after opening sdkconfig
sigmaaa Jan 7, 2025
7671f4f
fix: change the ccache_enable status based on IDF_CCACHE_ENABLE variable
sigmaaa Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 5 additions & 131 deletions bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/IDFBuildConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.text.MessageFormat;
import java.time.Duration;
import java.time.Instant;
Expand All @@ -48,10 +45,8 @@
import org.eclipse.cdt.core.envvar.EnvironmentVariable;
import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ElementChangedEvent;
import org.eclipse.cdt.core.model.IBinary;
import org.eclipse.cdt.core.model.IBinaryContainer;
import org.eclipse.cdt.core.model.ICElementDelta;
import org.eclipse.cdt.core.model.ICModelMarker;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.resources.IConsole;
Expand All @@ -62,7 +57,6 @@
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
Expand All @@ -71,7 +65,6 @@
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchManager;
Expand Down Expand Up @@ -119,7 +112,6 @@ public class IDFBuildConfiguration extends CBuildConfiguration
* ErrorParserManager intermixes these streams making it impossible to parse for errors.<br>
* To work around that, we run cmake in advance with its dedicated working error parser.
*/
private boolean cmakeListsModified;
private ICMakeToolChainFile toolChainFile;
private String customBuildDir;
private IProgressMonitor monitor;
Expand Down Expand Up @@ -341,17 +333,7 @@ public IProject[] build(int kind, Map<String, String> args, IConsole console, IP
try
{
infoStream.write(String.format(Messages.CMakeBuildConfiguration_BuildingIn, buildDir.toString()));
boolean runCMake = cmakeListsModified;
if (!runCMake)
{
runCMake = generator.contentEquals(NINJA) ? !Files.exists(buildDir.resolve("build.ninja")) //$NON-NLS-1$
: !Files.exists(buildDir.resolve("CMakeFiles")); //$NON-NLS-1$
}

if (runCMake)
{
runCmakeCommand(console, monitor, project, generator, infoStream, buildDir);
}
runCmakeCommand(console, monitor, project, generator, infoStream, buildDir);
runCmakeBuildCommand(console, monitor, project, start, generator, infoStream, buildDir);
new ClangdConfigFileHandler().update(project);
new ClangFormatFileHandler(project).update();
Expand Down Expand Up @@ -501,9 +483,6 @@ private void runCmakeCommand(IConsole console, IProgressMonitor monitor, IProjec
deleteCMakeErrorMarkers(project);

infoStream.write(String.format(Messages.CMakeBuildConfiguration_Configuring, buildDir));
// clean output to make sure there is no content
// incompatible with current settings (cmake config would fail)
cleanBuildDirectory(buildDir);

List<String> command = new ArrayList<>();

Expand All @@ -517,10 +496,10 @@ private void runCmakeCommand(IConsole console, IProgressMonitor monitor, IProjec
}

command.add("-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"); //$NON-NLS-1$
if (isCCacheEnabled())
{
command.add("-DCCACHE_ENABLE=1"); //$NON-NLS-1$
}

IDFEnvironmentVariables envVariables = new IDFEnvironmentVariables();
String ccacheStatus = envVariables.getEnvValue(IDFEnvironmentVariables.IDF_CCACHE_ENABLE);
command.add("-DCCACHE_ENABLE=" + (ccacheStatus.isBlank() ? "0" : ccacheStatus)); //$NON-NLS-1$ //$NON-NLS-2$

if (launchtarget != null)
{
Expand Down Expand Up @@ -570,8 +549,6 @@ private void runCmakeCommand(IConsole console, IProgressMonitor monitor, IProjec
epm.setOutputStream(console.getOutputStream());
watchProcess(new IConsoleParser[] { epm }, monitor);
}

cmakeListsModified = false;
}

private boolean checkToolChainFile(IConsole console)
Expand Down Expand Up @@ -645,13 +622,6 @@ private boolean checkLaunchTarget(IConsole console)
return true;
}

private boolean isCCacheEnabled()
{
IEclipsePreferences node = IDFCorePreferenceConstants
.getPreferenceNode(IDFCorePreferenceConstants.CMAKE_CCACHE_STATUS, null);
return node.getBoolean(IDFCorePreferenceConstants.CMAKE_CCACHE_STATUS, true);
}

@Override
public IToolChain getToolChain() throws CoreException
{
Expand Down Expand Up @@ -731,102 +701,6 @@ public void clean(IConsole console, IProgressMonitor monitor) throws CoreExcepti
}
}

/**
* Recursively removes any files and directories found below the specified Path.
*/
private static void cleanDirectory(Path dir) throws IOException
{
SimpleFileVisitor<Path> deltor = new SimpleFileVisitor<>()
{
@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException
{
Files.delete(file);
return FileVisitResult.CONTINUE;
}

@Override
public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException
{
super.postVisitDirectory(dir, exc);
Files.delete(dir);
return FileVisitResult.CONTINUE;
}
};
Path[] files = Files.list(dir).toArray(Path[]::new);
for (Path file : files)
{
Files.walkFileTree(file, deltor);
}
}

private void cleanBuildDirectory(Path buildDir) throws IOException
{
if (!Files.exists(buildDir))
return;
if (Files.isDirectory(buildDir))
cleanDirectory(buildDir);
// TODO: not a directory should we do something?
}

/**
* Overwritten to detect whether one of the CMakeLists.txt files in the project was modified since the last build.
*/
@Override
public void elementChanged(ElementChangedEvent event)
{
super.elementChanged(event);
// Only respond to post change events
if (event.getType() != ElementChangedEvent.POST_CHANGE)
return;
if (!cmakeListsModified)
{
processElementDelta(event.getDelta());
}
}

/**
* Processes the delta in order to detect whether one of the CMakeLists.txt files in the project has been modified
* and saved by the user since the last build.
*
* @return <code>true</code> to continue with delta processing, otherwise <code>false</code>
*/
private boolean processElementDelta(ICElementDelta delta)
{
if (delta == null)
{
return true;
}

if (delta.getKind() == ICElementDelta.CHANGED && ((delta.getFlags() & ICElementDelta.F_CONTENT) != 0))
{
// check for modified CMakeLists.txt file
IResourceDelta[] resourceDeltas = delta.getResourceDeltas();
if (resourceDeltas != null)
{
cmakeListsModified = Stream.of(resourceDeltas).map(t -> t.getResource())
.filter(t -> t.getType() == IResource.FILE
&& !t.getFullPath().toOSString().contains(IDFConstants.BUILD_FOLDER))
.map(t -> t.getName()).anyMatch(t -> t.equals("CMakeLists.txt") || t.endsWith(".cmake")); //$NON-NLS-1$ //$NON-NLS-2$

}
if (cmakeListsModified)
{
return false;
}
}

// recurse...
for (ICElementDelta child : delta.getAffectedChildren())
{
if (!processElementDelta(child))
{
return false; // stop processing
}
}
return true;
}

/**
* Overwritten since we do not parse console output to get scanner information.
*/
Expand Down
Loading