From 78b73a7e3d80190058154aad3cf4fc709638fcf0 Mon Sep 17 00:00:00 2001
From: Joseph Brill <48932340+jcbrill@users.noreply.github.com>
Date: Wed, 11 Oct 2023 13:00:30 -0400
Subject: [PATCH] Change the module imports from relative imports to top-level
 absolute imports for the Microsoft tools.

Moving any of the Microsoft tools that used relative imports to the scons site tools folder would fail on import (i.e., the relative import paths become invalid when the tools are moved).
---
 CHANGES.txt          | 5 +++++
 RELEASE.txt          | 5 +++++
 SCons/Tool/midl.py   | 2 +-
 SCons/Tool/mslib.py  | 5 ++++-
 SCons/Tool/mslink.py | 7 +++++--
 SCons/Tool/mssdk.py  | 6 ++++--
 SCons/Tool/msvc.py   | 9 +++++++--
 SCons/Tool/msvs.py   | 5 ++++-
 8 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a55c532496..ff7ef50621 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -42,6 +42,11 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       registry query that returns a path that does not exist.  Multiple invocation
       paths were not prepared to handle the MissingConfiguration exception.  The
       MissingConfiguration exception type was removed.
+    - The MSCommon module import was changed from a relative import to a top-level
+      absolute import in the following Microsoft tools: midl, mslib, mslink, mssdk, msvc,
+      msvs. Moving any of these tools that used relative imports to the scons site tools
+      folder would fail on import (i.e., the relative import paths become invalid when
+      moved).
 
   From Vitaly Cheptsov:
     - Fix race condition in `Mkdir` which can happen when two `SConscript`
diff --git a/RELEASE.txt b/RELEASE.txt
index 12bb3cacb6..764cc40932 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -120,6 +120,11 @@ IMPROVEMENTS
 ------------
 
 - Now tries to find mingw if it comes from Chocolatey install of msys2.
+- MSVC: Module imports were changed from a relative import to a top-level
+  absolute import in the following Microsoft tools: midl, mslib, mslink, mssdk, msvc,
+  msvs. Moving any of these tools that used relative imports to the scons site tools
+  folder would fail on import (i.e., the relative import paths become invalid when
+  moved).
 
 PACKAGING
 ---------
diff --git a/SCons/Tool/midl.py b/SCons/Tool/midl.py
index 0c640f5092..2ae3f73d06 100644
--- a/SCons/Tool/midl.py
+++ b/SCons/Tool/midl.py
@@ -37,7 +37,7 @@
 import SCons.Scanner.IDL
 import SCons.Util
 
-from .MSCommon import msvc_setup_env_tool
+from SCons.Tool.MSCommon import msvc_setup_env_tool
 
 tool_name = 'midl'
 
diff --git a/SCons/Tool/mslib.py b/SCons/Tool/mslib.py
index 6e15a808fa..bdce135f81 100644
--- a/SCons/Tool/mslib.py
+++ b/SCons/Tool/mslib.py
@@ -41,7 +41,10 @@
 import SCons.Tool.msvc
 import SCons.Util
 
-from .MSCommon import msvc_setup_env_tool, msvc_setup_env_once
+from SCons.Tool.MSCommon import (
+    msvc_setup_env_tool,
+    msvc_setup_env_once,
+)
 
 tool_name = 'mslib'
 
diff --git a/SCons/Tool/mslink.py b/SCons/Tool/mslink.py
index 1e5b71ae10..74ceaa8572 100644
--- a/SCons/Tool/mslink.py
+++ b/SCons/Tool/mslink.py
@@ -43,8 +43,11 @@
 import SCons.Tool.msvs
 import SCons.Util
 
-from .MSCommon import msvc_setup_env_once, msvc_setup_env_tool
-from .MSCommon.common import get_pch_node
+from SCons.Tool.MSCommon import (
+    msvc_setup_env_once,
+    msvc_setup_env_tool,
+)
+from SCons.Tool.MSCommon.common import get_pch_node
 
 tool_name = 'mslink'
 
diff --git a/SCons/Tool/mssdk.py b/SCons/Tool/mssdk.py
index 0151eff2b8..ef272c033d 100644
--- a/SCons/Tool/mssdk.py
+++ b/SCons/Tool/mssdk.py
@@ -33,8 +33,10 @@
 selection method.
 """
 
-from .MSCommon import mssdk_exists, \
-                     mssdk_setup_env
+from SCons.Tool.MSCommon import (
+    mssdk_exists,
+    mssdk_setup_env,
+)
 
 def generate(env) -> None:
     """Add construction variables for an MS SDK to an Environment."""
diff --git a/SCons/Tool/msvc.py b/SCons/Tool/msvc.py
index 33a67d0f4f..6afa171c97 100644
--- a/SCons/Tool/msvc.py
+++ b/SCons/Tool/msvc.py
@@ -44,8 +44,13 @@
 import SCons.Warnings
 import SCons.Scanner.RC
 
-from .MSCommon import msvc_setup_env_tool, msvc_setup_env_once, msvc_version_to_maj_min, msvc_find_vswhere
-from .MSCommon.common import get_pch_node
+from SCons.Tool.MSCommon import (
+    msvc_setup_env_tool,
+    msvc_setup_env_once,
+    msvc_version_to_maj_min,
+    msvc_find_vswhere,
+)
+from SCons.Tool.MSCommon.common import get_pch_node
 
 tool_name = 'msvc'
 
diff --git a/SCons/Tool/msvs.py b/SCons/Tool/msvs.py
index 153b84ecd6..16e422dace 100644
--- a/SCons/Tool/msvs.py
+++ b/SCons/Tool/msvs.py
@@ -45,7 +45,10 @@
 import SCons.Warnings
 from SCons.Defaults import processDefines
 from SCons.compat import PICKLE_PROTOCOL
-from .MSCommon import msvc_setup_env_tool, msvc_setup_env_once
+from SCons.Tool.MSCommon import (
+    msvc_setup_env_tool,
+    msvc_setup_env_once,
+)
 
 tool_name = 'msvs'