From a6fab4bed748fea62286e19586e4a01968b84709 Mon Sep 17 00:00:00 2001
From: Chris Webster <cjw@ucar.edu>
Date: Mon, 25 Nov 2024 13:28:24 -0800
Subject: [PATCH] Remove obsolete Windows items.

---
 eol_scons/tools/boost.py   | 8 ++++----
 eol_scons/tools/gitinfo.py | 3 ---
 eol_scons/tools/nidas.py   | 2 +-
 eol_scons/tools/qt5.py     | 6 ------
 eol_scons/tools/svninfo.py | 5 -----
 5 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/eol_scons/tools/boost.py b/eol_scons/tools/boost.py
index ce844b0..cfa3d82 100644
--- a/eol_scons/tools/boost.py
+++ b/eol_scons/tools/boost.py
@@ -93,10 +93,9 @@ def generate(env):
     # env.Append(DEPLOY_SHARED_LIBS=['boost_date_time'])
     # env.Append(DEPLOY_SHARED_LIBS=['boost_serialization'])
     if 'BOOST_LIBRARY_SUFFIX' not in env:
-        if env['PLATFORM'] == 'win32':
-            env['BOOST_LIBRARY_SUFFIX'] = '-vc71-mt-gd-1_33_1'
-        else:
-            env['BOOST_LIBRARY_SUFFIX'] = ''
+        # We don't have any platform specific suffix at this time.
+        env['BOOST_LIBRARY_SUFFIX'] = ''
+
     if 'BOOST_DIR' in env:
         bdir = env['BOOST_DIR']
         if bdir and bdir != "/usr" and bdir != "":
@@ -105,6 +104,7 @@ def generate(env):
             env.Append(CPPPATH=[os.path.join(bdir)])
             env.AppendUnique(LIBPATH=[os.path.join(bdir, "lib")])
             env.AppendUnique(RPATH=[os.path.join(bdir, "lib")])
+
     # Override the _LIBFLAGS variable so we can append the suffix for
     # boost libraries.
     if '_boost_save_libflags' not in env:
diff --git a/eol_scons/tools/gitinfo.py b/eol_scons/tools/gitinfo.py
index de26f5a..0081db9 100644
--- a/eol_scons/tools/gitinfo.py
+++ b/eol_scons/tools/gitinfo.py
@@ -245,9 +245,6 @@ def generate(env):
         emitter=gitinfo_emitter_value)
     env['BUILDERS']['GitInfo'] = gitinfobuilder
     env['GIT'] = "git"
-    if env['PLATFORM'] == 'win32':
-        gitbin = r'c:\Tools\git\bin'
-        env.PrependENVPath('PATH', gitbin)
 
     env.AddMethod(LoadGitInfo, "LoadGitInfo")
     env.LoadGitInfo('#')
diff --git a/eol_scons/tools/nidas.py b/eol_scons/tools/nidas.py
index 08b7fd0..e798a0c 100644
--- a/eol_scons/tools/nidas.py
+++ b/eol_scons/tools/nidas.py
@@ -272,7 +272,7 @@ def _addOptions(env, inside=False):
 def generate(env):
     # It is not (yet) possible to build against NIDAS on anything
     # except Linux, so don't even give anyone the option.
-    if sys.platform == 'win32' or sys.platform == 'darwin':
+    if sys.platform == 'cygwin' or sys.platform == 'win32' or sys.platform == 'darwin':
         env.EnableNIDAS = (lambda: 0)
         return
 
diff --git a/eol_scons/tools/qt5.py b/eol_scons/tools/qt5.py
index 850d81b..8cafd9d 100644
--- a/eol_scons/tools/qt5.py
+++ b/eol_scons/tools/qt5.py
@@ -402,12 +402,6 @@ def generate(env):
         pass
     elif ('QT5DIR' in os.environ):
         env['QT5DIR'] = os.environ['QT5DIR']
-    elif (env['PLATFORM'] == 'win32'):
-        print("""
-For Windows, QT5DIR must be set on the command line or in the environment.
-E.g.:
-  scons QT5DIR='/c/QtSDK/Desktop/Qt/4.7.4/mingw'
-""")
     elif checkPkgConfig(env):
         env['QT5DIR'] = USE_PKG_CONFIG
     else:
diff --git a/eol_scons/tools/svninfo.py b/eol_scons/tools/svninfo.py
index 03f8283..af3f38f 100644
--- a/eol_scons/tools/svninfo.py
+++ b/eol_scons/tools/svninfo.py
@@ -293,11 +293,6 @@ def generate(env):
     env['BUILDERS']['SvnInfo'] = svninfobuilder
     env['SVN'] = "svn"
     env['SVNVERSION'] = "svnversion"
-    # Use the default location for the subversion Windows installer.
-    if env['PLATFORM'] == 'win32':
-        svnbin=r'c:\Tools\svn\bin'
-        env['SVN'] = os.path.join(svnbin, "svn")
-        env['SVNVERSION'] = os.path.join(svnbin, "svnversion")
 
     env.AddMethod(LoadSvnInfo, "LoadSvnInfo")
     env.LoadSvnInfo('#')