Skip to content

Remove Windows 98 Fallback and allow debugging without modify the source #1146

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

Merged
merged 2 commits into from
Oct 14, 2025
Merged

Remove Windows 98 Fallback and allow debugging without modify the source #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
061ab96
Remove Windows 98 Fallback from spawner
laeubi Apr 24, 2025
8b22be8
Allow debugging without modify the source
laeubi Apr 24, 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
2 changes: 1 addition & 1 deletion core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.core.native;singleton:=true
Bundle-Version: 6.5.0.qualifier
Bundle-Version: 6.6.0.qualifier
Bundle-Activator: org.eclipse.cdt.internal.core.natives.CNativePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
2 changes: 1 addition & 1 deletion core/org.eclipse.cdt.core.native/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>

<version>6.5.0-SNAPSHOT</version>
<version>6.6.0-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.core.native</artifactId>
<packaging>eclipse-plugin</packaging>

Expand Down
19 changes: 7 additions & 12 deletions core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/ProcessFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
*/
public class ProcessFactory {

private static final boolean DEBUG = Boolean.getBoolean("org.eclipse.cdt.utils.spawner.debug"); //$NON-NLS-1$

static private ProcessFactory instance;
private boolean hasSpawner;
private Runtime runtime;
Expand Down Expand Up @@ -255,9 +257,9 @@ private StringBuilder debug() {
}

public Process start() throws IOException {
// Uncomment the next line, set a breakpoint in the last line of debug() method,
// when the breakpoint is triggered, inspect the sb variable to see detailed info on what is being launched.
// debug();
if (DEBUG) {
debug();
}
Process p;
if (hasSpawner) {
if (use_pty) {
Expand Down Expand Up @@ -285,17 +287,10 @@ public Process start() throws IOException {
}

private ProcessFactory() {
hasSpawner = false;
String OS = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
runtime = Runtime.getRuntime();
try {
// Spawner does not work for Windows 98 fallback
if (OS != null && OS.equals("windows 98")) { //$NON-NLS-1$
hasSpawner = false;
} else {
System.loadLibrary("spawner"); //$NON-NLS-1$
hasSpawner = true;
}
System.loadLibrary("spawner"); //$NON-NLS-1$
hasSpawner = true;
} catch (SecurityException e) {
e.printStackTrace();
} catch (UnsatisfiedLinkError e) {
Expand Down
Loading