Use utils.py directly rather than imported via shared.py. NFC (#25727)

Author: sbc100

emcc.py

@@ -124,7 +124,7 @@ def make_relative(filename):
 
   root = unsuffixed_basename(name)
   with tarfile.open(name, 'w') as reproduce_file:
-    reproduce_file.add(shared.path_from_root('emscripten-version.txt'), os.path.join(root, 'version.txt'))
+    reproduce_file.add(utils.path_from_root('emscripten-version.txt'), os.path.join(root, 'version.txt'))
 
     with shared.get_temp_files().get_file(suffix='.tar') as rsp_name:
       with open(rsp_name, 'w') as rsp:

test/benchmark/benchmark_sse.py

@@ -21,8 +21,8 @@
 from common import EMRUN, test_file
 
 from tools.config import V8_ENGINE
-from tools.shared import CLANG_CXX, EMCC, WINDOWS
-from tools.utils import run_process
+from tools.shared import CLANG_CXX, EMCC
+from tools.utils import WINDOWS, run_process
 
 # System info
 system_info = subprocess.check_output([EMRUN, '--system_info'], stderr=subprocess.STDOUT, text=True)

test/common.py

@@ -41,11 +41,12 @@
 from tools import building, config, feature_matrix, shared, utils
 from tools.feature_matrix import UNSUPPORTED, Feature, min_browser_versions
 from tools.settings import COMPILE_TIME_SETTINGS
-from tools.shared import DEBUG, EMCC, EMXX, get_canonical_temp_dir, path_from_root
+from tools.shared import DEBUG, EMCC, EMXX, get_canonical_temp_dir
 from tools.utils import (
   WINDOWS,
   exit_with_error,
   memoize,
+  path_from_root,
   read_binary,
   read_file,
   write_binary,
@@ -257,7 +258,7 @@ def open_url_args(url):
 EMMAKE = utils.bat_suffix(path_from_root('emmake'))
 EMCMAKE = utils.bat_suffix(path_from_root('emcmake'))
 EMCONFIGURE = utils.bat_suffix(path_from_root('emconfigure'))
-EMRUN = utils.bat_suffix(shared.path_from_root('emrun'))
+EMRUN = utils.bat_suffix(utils.path_from_root('emrun'))
 WASM_DIS = os.path.join(building.get_binaryen_bin(), 'wasm-dis')
 LLVM_OBJDUMP = shared.llvm_tool_path('llvm-objdump')
 PYTHON = sys.executable

test/test_browser.py

@@ -65,8 +65,8 @@
 
 from tools import ports, shared
 from tools.feature_matrix import Feature
-from tools.shared import DEBUG, EMCC, FILE_PACKAGER, PIPE, WINDOWS
-from tools.utils import delete_dir
+from tools.shared import DEBUG, EMCC, FILE_PACKAGER, PIPE
+from tools.utils import WINDOWS, delete_dir
 
 
 def make_test_chunked_synchronous_xhr_server(support_byte_ranges, data, port):

test/test_interactive.py

@@ -13,7 +13,7 @@
 from common import BrowserCore, create_file, test_file
 from decorators import also_with_minimal_runtime, parameterized
 
-from tools.shared import WINDOWS
+from tools.utils import WINDOWS
 
 
 class interactive(BrowserCore):

test/test_sanity.py

@@ -807,7 +807,7 @@ def test_bootstrap(self):
     self.assert_fail([EMCC, test_file('hello_world.c')], expected)
 
     # Running bootstrap.py should fix that
-    bootstrap = shared.bat_suffix(shared.path_from_root('bootstrap'))
+    bootstrap = shared.bat_suffix(path_from_root('bootstrap'))
     self.run_process([bootstrap])
 
     # Now the compiler should work again
@@ -828,4 +828,4 @@ def test_bootstrap_without_em_config(self):
     env['PATH'] = os.pathsep.join(new_path)
 
     # Running bootstrap.py should not fail
-    self.run_process([shared.bat_suffix(shared.path_from_root('bootstrap'))], env=env)
+    self.run_process([shared.bat_suffix(path_from_root('bootstrap'))], env=env)

test/test_sockets.py

@@ -28,8 +28,8 @@
 )
 
 from tools import config
-from tools.shared import CLANG_CC, EMCC, path_from_root
-from tools.utils import run_process
+from tools.shared import CLANG_CC, EMCC
+from tools.utils import path_from_root, run_process
 
 npm_checked = False
 

tools/link.py

@@ -45,9 +45,10 @@
   settings,
   user_settings,
 )
-from .shared import DEBUG, DYLIB_EXTENSIONS, WINDOWS, do_replace, in_temp
+from .shared import DEBUG, DYLIB_EXTENSIONS, do_replace, in_temp
 from .toolchain_profiler import ToolchainProfiler
 from .utils import (
+  WINDOWS,
   delete_file,
   exit_with_error,
   get_file_suffix,
@@ -2131,7 +2132,7 @@ def phase_source_transforms(options):
   global final_js
   safe_copy(final_js, final_js + '.tr.js')
   final_js += '.tr.js'
-  posix = not shared.WINDOWS
+  posix = not WINDOWS
   logger.debug('applying transform: %s', options.js_transform)
   shared.check_call(remove_quotes(shlex.split(options.js_transform, posix=posix) + [os.path.abspath(final_js)]))
   save_intermediate('transformed')

tools/ports/__init__.py

@@ -189,7 +189,7 @@ class Ports:
   @staticmethod
   def get_include_dir(*parts):
     dirname = cache.get_include_dir(*parts)
-    shared.safe_ensure_dirs(dirname)
+    utils.safe_ensure_dirs(dirname)
     return dirname
 
   @staticmethod
@@ -215,7 +215,7 @@ def install_headers(src_dir, pattern='*.h', target=None):
     assert os.path.exists(dest)
     if target:
       dest = os.path.join(dest, target)
-      shared.safe_ensure_dirs(dest)
+      utils.safe_ensure_dirs(dest)
     matches = glob.glob(os.path.join(src_dir, pattern))
     assert matches, f'no headers found to install in {src_dir}'
     for f in matches:
@@ -275,7 +275,7 @@ def build_port(src_dir, output_path, port_name, includes=[], flags=[], cxxflags=
   @staticmethod
   def get_dir(*parts):
     dirname = os.path.join(config.PORTS, *parts)
-    shared.safe_ensure_dirs(dirname)
+    utils.safe_ensure_dirs(dirname)
     return dirname
 
   @staticmethod
@@ -373,7 +373,7 @@ def retrieve():
 
     def unpack():
       logger.info(f'unpacking port: {name}')
-      shared.safe_ensure_dirs(fullname)
+      utils.safe_ensure_dirs(fullname)
       shutil.unpack_archive(filename=fullpath, extract_dir=fullname)
       utils.write_file(marker, url + '\n')
 

tools/shared.py

@@ -44,13 +44,11 @@
 from . import cache, config, diagnostics, filelock, tempfiles, utils
 from .settings import settings
 from .utils import (
-  WINDOWS,
   bat_suffix,
   exit_with_error,
   memoize,
   path_from_root,
   safe_ensure_dirs,
-  set_version_globals,
 )
 
 DEBUG_SAVE = DEBUG or int(os.environ.get('EMCC_DEBUG_SAVE', '0'))
@@ -213,7 +211,7 @@ def run_js_tool(filename, jsargs=[], node_args=[], **kw):  # noqa: B006
 
 
 def get_npm_cmd(name, missing_ok=False):
-  if WINDOWS:
+  if utils.WINDOWS:
     cmd = [path_from_root('node_modules/.bin', name + '.cmd')]
   else:
     cmd = config.NODE_JS + [path_from_root('node_modules/.bin', name)]
@@ -626,7 +624,7 @@ def get_llvm_target():
 
 
 def init():
-  set_version_globals()
+  utils.set_version_globals()
   setup_temp_dirs()