Simplify ports by having ports.get_dir take subdirectory arguments. NFC (#22451)

Author: sbc100

tools/ports/__init__.py

@@ -221,8 +221,8 @@ def build_port(src_dir, output_path, port_name, includes=[], flags=[], cxxflags=
     return output_path
 
   @staticmethod
-  def get_dir():
-    dirname = config.PORTS
+  def get_dir(*parts):
+    dirname = os.path.join(config.PORTS, *parts)
     shared.safe_ensure_dirs(dirname)
     return dirname
 
@@ -240,7 +240,7 @@ def get_build_dir():
   @staticmethod
   def fetch_project(name, url, sha512hash=None):
     # To compute the sha512 hash, run `curl URL | sha512sum`.
-    fullname = os.path.join(Ports.get_dir(), name)
+    fullname = Ports.get_dir(name)
 
     if name not in Ports.name_cache: # only mention each port once in log
       logger.debug(f'including port: {name}')

tools/ports/boost_headers.py

@@ -20,7 +20,7 @@ def get(ports, settings, shared):
 
   def create(final):
     # includes
-    source_path = os.path.join(ports.get_dir(), 'boost_headers')
+    source_path = ports.get_dir('boost_headers')
     source_path_include = os.path.join(source_path, 'boost')
     ports.install_header_dir(source_path_include, 'boost')
 

tools/ports/bullet.py

@@ -18,7 +18,7 @@ def get(ports, settings, shared):
   ports.fetch_project('bullet', f'https://github.com/emscripten-ports/bullet/archive/{TAG}.zip', sha512hash=HASH)
 
   def create(final):
-    source_path = os.path.join(ports.get_dir(), 'bullet', 'Bullet-' + TAG)
+    source_path = ports.get_dir('bullet', 'Bullet-' + TAG)
     src_path = os.path.join(source_path, 'bullet', 'src')
 
     dest_include_path = ports.get_include_dir('bullet')

tools/ports/bzip2.py

@@ -3,8 +3,6 @@
 # University of Illinois/NCSA Open Source License.  Both these licenses can be
 # found in the LICENSE file.
 
-import os
-
 VERSION = '1.0.6'
 HASH = '512cbfde5144067f677496452f3335e9368fd5d7564899cb49e77847b9ae7dca598218276637cbf5ec524523be1e8ace4ad36a148ef7f4badf3f6d5a002a4bb2'
 
@@ -17,7 +15,7 @@ def get(ports, settings, shared):
   ports.fetch_project('bzip2', f'https://github.com/emscripten-ports/bzip2/archive/{VERSION}.zip', sha512hash=HASH)
 
   def create(final):
-    source_path = os.path.join(ports.get_dir(), 'bzip2', 'bzip2-' + VERSION)
+    source_path = ports.get_dir('bzip2', 'bzip2-' + VERSION)
     ports.install_headers(source_path)
 
     # build

tools/ports/cocos2d.py

@@ -23,7 +23,7 @@ def get(ports, settings, shared):
   def create(final):
     diagnostics.warning('experimental', 'cocos2d: library is experimental, do not expect that it will work out of the box')
 
-    cocos2d_src = os.path.join(ports.get_dir(), 'cocos2d')
+    cocos2d_src = ports.get_dir('cocos2d')
     cocos2d_root = os.path.join(cocos2d_src, 'Cocos2d-' + TAG)
     cocos2dx_root = os.path.join(cocos2d_root, 'cocos2dx')
 

tools/ports/freetype.py

@@ -27,7 +27,7 @@ def get(ports, settings, shared):
   ports.fetch_project('freetype', f'https://github.com/emscripten-ports/FreeType/archive/{TAG}.zip', sha512hash=HASH)
 
   def create(final):
-    source_path = os.path.join(ports.get_dir(), 'freetype', 'FreeType-' + TAG)
+    source_path = ports.get_dir('freetype', 'FreeType-' + TAG)
     ports.write_file(os.path.join(source_path, 'include/ftconfig.h'), ftconf_h)
     ports.install_header_dir(os.path.join(source_path, 'include'),
                              target=os.path.join('freetype2'))

tools/ports/giflib.py

@@ -3,8 +3,6 @@
 # University of Illinois/NCSA Open Source License.  Both these licenses can be
 # found in the LICENSE file.
 
-import os
-
 VERSION = '5.2.1'
 HASH = '4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736'
 
@@ -17,7 +15,7 @@ def get(ports, settings, shared):
   ports.fetch_project('giflib', f'https://storage.googleapis.com/webassembly/emscripten-ports/giflib-{VERSION}.tar.gz', sha512hash=HASH)
 
   def create(final):
-    source_path = os.path.join(ports.get_dir(), 'giflib', f'giflib-{VERSION}')
+    source_path = ports.get_dir('giflib', f'giflib-{VERSION}')
     ports.install_headers(source_path)
     exclude_files = [
       'giffix.c', 'gifecho.c', 'giffilter.c', 'gifcolor.c', 'gifecho.c', 'gifinto.c',

tools/ports/harfbuzz.py

@@ -82,7 +82,7 @@ def get(ports, settings, shared):
   ports.fetch_project('harfbuzz', f'https://github.com/harfbuzz/harfbuzz/releases/download/{VERSION}/harfbuzz-{VERSION}.tar.xz', sha512hash=HASH)
 
   def create(final):
-    source_path = os.path.join(ports.get_dir(), 'harfbuzz', 'harfbuzz-' + VERSION)
+    source_path = ports.get_dir('harfbuzz', 'harfbuzz-' + VERSION)
     freetype_include = ports.get_include_dir('freetype2')
     ports.install_headers(os.path.join(source_path, 'src'), target='harfbuzz')
 

tools/ports/icu.py

@@ -31,7 +31,7 @@ def get(ports, settings, shared):
 
   def prepare_build():
     nonlocal icu_source_path
-    source_path = os.path.join(ports.get_dir(), 'icu', 'icu') # downloaded icu4c path
+    source_path = ports.get_dir('icu', 'icu') # downloaded icu4c path
     icu_source_path = os.path.join(source_path, 'source')
 
   def build_lib(lib_output, lib_src, other_includes, build_flags):

tools/ports/libjpeg.py

@@ -20,7 +20,7 @@ def get(ports, settings, shared):
   ports.fetch_project('libjpeg', f'https://storage.googleapis.com/webassembly/emscripten-ports/jpegsrc.v{VERSION}.tar.gz', sha512hash=HASH)
 
   def create(final):
-    source_path = os.path.join(ports.get_dir(), 'libjpeg', f'jpeg-{VERSION}')
+    source_path = ports.get_dir('libjpeg', f'jpeg-{VERSION}')
     ports.write_file(os.path.join(source_path, 'jconfig.h'), jconfig_h)
     ports.install_headers(source_path)
     excludes = [