Consistent use of build_dir name in ports. NFC (#17855)

This used to represent a location where the source was copied to
but these days its just a build directory.

I'm planning some followups to avoid cleaning out this directory more
often than we need to.

Author: sbc100

tools/ports/__init__.py

@@ -125,15 +125,14 @@ def build_port(src_dir, output_path, build_dir, includes=[], flags=[], exclude_f
     for include in includes:
       cflags.append('-I' + include)
 
-    if build_dir:
-      if not os.path.exists(build_dir):
-        os.makedirs(build_dir)
-      build_dir = src_dir
     commands = []
     objects = []
     for src in srcs:
       relpath = os.path.relpath(src, src_dir)
       obj = os.path.join(build_dir, relpath) + '.o'
+      dirname = os.path.dirname(obj)
+      if not os.path.exists(dirname):
+        os.makedirs(dirname)
       commands.append([shared.EMCC, '-c', src, '-o', obj] + cflags)
       objects.append(obj)
 

tools/ports/bullet.py

@@ -22,7 +22,6 @@ def create(final):
     logging.info('building port: bullet')
 
     source_path = os.path.join(ports.get_dir(), 'bullet', 'Bullet-' + TAG)
-    dest_path = ports.clear_project_build('bullet')
     src_path = os.path.join(source_path, 'bullet', 'src')
 
     dest_include_path = ports.get_include_dir('bullet')
@@ -46,7 +45,8 @@ def create(final):
       '-std=gnu++14'
     ]
 
-    ports.build_port(src_path, final, dest_path, includes=includes, flags=flags, exclude_dirs=['MiniCL'])
+    build_dir = ports.clear_project_build('bullet')
+    ports.build_port(src_path, final, build_dir, includes=includes, flags=flags, exclude_dirs=['MiniCL'])
 
   return [shared.Cache.get_lib('libbullet.a', create)]
 

tools/ports/bzip2.py

@@ -25,8 +25,8 @@ def create(final):
       'blocksort.c', 'compress.c', 'decompress.c', 'huffman.c',
       'randtable.c', 'bzlib.c', 'crctable.c',
     ]
-    dest_path = ports.clear_project_build('bzip2')
-    ports.build_port(source_path, final, dest_path, srcs=srcs)
+    build_dir = ports.clear_project_build('bzip2')
+    ports.build_port(source_path, final, build_dir, srcs=srcs)
 
   return [shared.Cache.get_lib('libbz2.a', create, what='port')]
 

tools/ports/freetype.py

@@ -91,8 +91,8 @@ def create(final):
       '-pthread'
     ]
 
-    dest_path = ports.clear_project_build('freetype')
-    ports.build_port(source_path, final, dest_path, flags=flags, srcs=srcs)
+    build_dir = ports.clear_project_build('freetype')
+    ports.build_port(source_path, final, build_dir, flags=flags, srcs=srcs)
 
   return [shared.Cache.get_lib('libfreetype.a', create, what='port')]
 

tools/ports/giflib.py

@@ -20,9 +20,9 @@ def get(ports, settings, shared):
   def create(final):
     logging.info('building port: giflib')
     source_path = os.path.join(ports.get_dir(), 'giflib', f'giflib-{VERSION}')
-    dest_path = ports.clear_project_build('giflib')
     ports.install_headers(source_path)
-    ports.build_port(source_path, final, dest_path)
+    build_dir = ports.clear_project_build('giflib')
+    ports.build_port(source_path, final, build_dir)
 
   return [shared.Cache.get_lib('libgif.a', create, what='port')]
 

tools/ports/icu.py

@@ -29,12 +29,12 @@ def get(ports, settings, shared):
   url = 'https://github.com/unicode-org/icu/releases/download/%s/icu4c-%s-src.zip' % (TAG, VERSION)
   ports.fetch_project('icu', url, 'icu', sha512hash=HASH)
   icu_source_path = None
-  dest_path = None
+  build_dir = None
 
   def prepare_build():
-    nonlocal icu_source_path, dest_path
+    nonlocal icu_source_path, build_dir
     source_path = os.path.join(ports.get_dir(), 'icu', 'icu') # downloaded icu4c path
-    dest_path = ports.clear_project_build('icu') # icu build path
+    build_dir = ports.clear_project_build('icu') # icu build path
     icu_source_path = os.path.join(source_path, 'source')
 
   def build_lib(lib_output, lib_src, other_includes, build_flags):
@@ -59,7 +59,7 @@ def build_lib(lib_output, lib_src, other_includes, build_flags):
     if settings.USE_PTHREADS:
       additional_build_flags.append('-pthread')
 
-    ports.build_port(lib_src, lib_output, dest_path, includes=other_includes, flags=build_flags + additional_build_flags)
+    ports.build_port(lib_src, lib_output, build_dir, includes=other_includes, flags=build_flags + additional_build_flags)
 
   # creator for libicu_common
   def create_libicu_common(lib_output):

tools/ports/libjpeg.py

@@ -24,15 +24,15 @@ def get(ports, settings, shared):
   def create(final):
     logging.info('building port: libjpeg')
     source_path = os.path.join(ports.get_dir(), 'libjpeg', 'jpeg-9c')
-    dest_path = ports.clear_project_build('libjpeg')
     Path(source_path, 'jconfig.h').write_text(jconfig_h)
     ports.install_headers(source_path)
     excludes = [
       'ansi2knr.c', 'cjpeg.c', 'ckconfig.c', 'djpeg.c', 'example.c',
       'jmemansi.c', 'jmemdos.c', 'jmemmac.c', 'jmemname.c',
       'jpegtran.c', 'rdjpgcom.c', 'wrjpgcom.c',
     ]
-    ports.build_port(source_path, final, dest_path, exclude_files=excludes)
+    build_dir = ports.clear_project_build('libjpeg')
+    ports.build_port(source_path, final, build_dir, exclude_files=excludes)
 
   return [shared.Cache.get_lib('libjpeg.a', create, what='port')]
 

tools/ports/mpg123.py

@@ -75,8 +75,8 @@ def create(final):
       os.path.join(compat_path, 'compat_str.c'),
     ]
 
-    dest_path = ports.clear_project_build('mpg123')
-    ports.build_port(source_path, final, dest_path, flags=flags, srcs=srcs)
+    build_dir = ports.clear_project_build('mpg123')
+    ports.build_port(source_path, final, build_dir, flags=flags, srcs=srcs)
 
   return [shared.Cache.get_lib('libmpg123.a', create, what='port')]
 

tools/ports/ogg.py

@@ -24,8 +24,8 @@ def create(final):
     source_path = os.path.join(ports.get_dir(), 'ogg', 'Ogg-' + TAG)
     Path(source_path, 'include', 'ogg', 'config_types.h').write_text(config_types_h)
     ports.install_header_dir(os.path.join(source_path, 'include', 'ogg'), 'ogg')
-    dest_path = ports.clear_project_build('ogg')
-    ports.build_port(os.path.join(source_path, 'src'), final, dest_path)
+    build_dir = ports.clear_project_build('ogg')
+    ports.build_port(os.path.join(source_path, 'src'), final, build_dir)
 
   return [shared.Cache.get_lib('libogg.a', create)]
 

tools/ports/sdl2_gfx.py

@@ -24,8 +24,8 @@ def get(ports, settings, shared):
   def create(final):
     logging.info('building port: sdl2_gfx')
     source_path = os.path.join(ports.get_dir(), 'sdl2_gfx', 'sdl2_gfx-' + TAG)
-    dest_path = ports.clear_project_build('sdl2_gfx')
-    ports.build_port(source_path, final, dest_path, includes=[dest_path], exclude_dirs=['test'], flags=['-sUSE_SDL=2'])
+    build_dir = ports.clear_project_build('sdl2_gfx')
+    ports.build_port(source_path, final, build_dir, exclude_dirs=['test'], flags=['-sUSE_SDL=2'])
     ports.install_headers(source_path, target='SDL2')
 
   return [shared.Cache.get_lib('libSDL2_gfx.a', create)]