From e15dd019f9f5765e3aa8e8f7a6fca8eb701af7ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Thu, 24 Apr 2025 10:19:01 +0200
Subject: [PATCH] Remove Windows 98 Fallback and allow debugging without modify
 the source

Currently there is a specific branch to "fallback" for WIndows 98, this
does not seem to have any relevance today.

Also currently one needs to modify and recompile the source to enable
debugging, this is replaced by a system property that can be set.
---
 .../cdt/utils/spawner/ProcessFactory.java     | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/ProcessFactory.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/ProcessFactory.java
index addd040267a..ace68a99271 100644
--- a/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/ProcessFactory.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/ProcessFactory.java
@@ -36,6 +36,8 @@ import org.eclipse.core.runtime.Platform;
  */
 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;
@@ -255,9 +257,9 @@ public class ProcessFactory {
 		}
 
 		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) {
@@ -285,17 +287,10 @@ public class ProcessFactory {
 	}
 
 	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) {