Core Build project without binaries.

Do not check for binaries in the project directory if the user defined a binary in the Main tab. This supports the case where the user disables auto build and selects a binary outside the project directory. Otherwise the binaries check would stop the launch with the message that no binaries are found in the project.
ewaterlander · Dec 11, 2024 · fa239d4 · fa239d4
1 parent f259d60
commit fa239d4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.debug.core; singleton:=true
-Bundle-Version: 8.8.800.qualifier
+Bundle-Version: 8.8.900.qualifier
 Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/...e.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java b/...e.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java
@@ -127,12 +127,20 @@ protected IBinary getBinary(ICBuildConfiguration buildConfig) throws CoreExcepti
 	}
 
 	/**
+	 * Returns the full path to the binary.
+	 *
 	 * @since 8.8
+	 * @param configuration
+	 * @param buildConfig
+	 * @return
+	 * @throws CoreException
 	 */
-	protected String getProgramPath(ILaunchConfiguration configuration, IBinary exeFile) throws CoreException {
+	protected String getProgramPath(ILaunchConfiguration configuration, ICBuildConfiguration buildConfig)
+			throws CoreException {
 		String programName = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, ""); //$NON-NLS-1$
 
 		if (programName.isBlank()) {
+			IBinary exeFile = getBinary(buildConfig);
 			return Paths.get(exeFile.getLocationURI()).toString();
 		} else {
 			IPath path = new Path(

diff --git a/....core/src/org/eclipse/cdt/debug/internal/core/launch/CoreBuildLocalRunLaunchDelegate.java b/....core/src/org/eclipse/cdt/debug/internal/core/launch/CoreBuildLocalRunLaunchDelegate.java
@@ -19,13 +19,13 @@
 import java.util.Map;
 
 import org.eclipse.cdt.core.build.ICBuildConfiguration;
-import org.eclipse.cdt.core.model.IBinary;
 import org.eclipse.cdt.debug.core.CDebugCorePlugin;
 import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.debug.core.launch.CoreBuildLaunchConfigDelegate;
 import org.eclipse.cdt.debug.internal.core.InternalDebugCoreMessages;
 import org.eclipse.cdt.utils.CommandLineUtil;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -44,7 +44,7 @@ public void launch(ILaunchConfiguration configuration, String mode, ILaunch laun
 			throws CoreException {
 		ILaunchTarget target = ((ITargetedLaunch) launch).getLaunchTarget();
 		ICBuildConfiguration buildConfig = getBuildConfiguration(configuration, mode, target, monitor);
-		IBinary exeFile = getBinary(buildConfig);
+		String programPath = getProgramPath(configuration, buildConfig);
 
 		try {
 			String args = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
@@ -54,7 +54,7 @@ public void launch(ILaunchConfiguration configuration, String mode, ILaunch laun
 
 			String[] arguments = CommandLineUtil.argumentsToArray(args);
 			List<String> command = new ArrayList<>(1 + arguments.length);
-			command.add(getProgramPath(configuration, exeFile));
+			command.add(programPath);
 			command.addAll(Arrays.asList(arguments));
 
 			ProcessBuilder builder = new ProcessBuilder(command);
@@ -77,7 +77,7 @@ public void launch(ILaunchConfiguration configuration, String mode, ILaunch laun
 
 			buildConfig.setBuildEnvironment(environment);
 			Process process = builder.start();
-			DebugPlugin.newProcess(launch, process, exeFile.getPath().lastSegment());
+			DebugPlugin.newProcess(launch, process, IPath.fromOSString(programPath).lastSegment());
 		} catch (IOException e) {
 			throw new CoreException(new Status(IStatus.ERROR, CDebugCorePlugin.PLUGIN_ID,
 					InternalDebugCoreMessages.CoreBuildLocalRunLaunchDelegate_ErrorLaunching, e));

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.cdt.dsf.gdb;singleton:=true
-Bundle-Version: 7.1.400.qualifier
+Bundle-Version: 7.1.500.qualifier
 Bundle-Activator: org.eclipse.cdt.dsf.gdb.internal.GdbPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,

diff --git a/...gdb/src/org/eclipse/cdt/dsf/gdb/internal/launching/CoreBuildLocalDebugLaunchDelegate.java b/...gdb/src/org/eclipse/cdt/dsf/gdb/internal/launching/CoreBuildLocalDebugLaunchDelegate.java
@@ -16,7 +16,6 @@
 import java.util.concurrent.ExecutionException;
 
 import org.eclipse.cdt.core.build.ICBuildConfiguration;
-import org.eclipse.cdt.core.model.IBinary;
 import org.eclipse.cdt.debug.core.launch.CoreBuildLaunchConfigDelegate;
 import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor;
 import org.eclipse.cdt.dsf.concurrent.ImmediateExecutor;
@@ -81,8 +80,7 @@ public void launch(ILaunchConfiguration configuration, String mode, ILaunch laun
 
 		String gdbVersion = gdbLaunch.getGDBVersion();
 
-		IBinary exeFile = getBinary(buildConfig);
-		gdbLaunch.setProgramPath(getProgramPath(configuration, exeFile));
+		gdbLaunch.setProgramPath(getProgramPath(configuration, buildConfig));
 
 		gdbLaunch.setServiceFactory(new GdbDebugServicesFactory(gdbVersion, configuration));