Remove some code duplication between the ports (#17513)

There was a bunch of redundant calls to `try_delete` and by having
`clear_project_build()` return the build directory we can avoid
recalculating the build directory.

Split out from #17512

Author: sbc100

tools/ports/__init__.py

@@ -266,7 +266,9 @@ def up_to_date():
   def clear_project_build(name):
     port = ports_by_name[name]
     port.clear(Ports, settings, shared)
-    shared.try_delete(os.path.join(Ports.get_build_dir(), name))
+    build_dir = os.path.join(Ports.get_build_dir(), name)
+    shared.try_delete(build_dir)
+    return build_dir
 
 
 def dependency_order(port_list):

tools/ports/boost_headers.py

@@ -5,7 +5,6 @@
 
 import logging
 import os
-import shutil
 
 TAG = '1.75.0'
 HASH = '8c38be1ebef1b8ada358ad6b7c9ec17f5e0a300e8085db3473a13e19712c95eeb3c3defacd3c53482eb96368987c4b022efa8da2aac2431a154e40153d3c3dcd'
@@ -21,17 +20,15 @@ def get(ports, settings, shared):
 
   def create(final):
     logging.info('building port: boost_headers')
-    ports.clear_project_build('boost_headers')
+    build_dir = ports.clear_project_build('boost_headers')
 
     # includes
     source_path_include = os.path.join(ports.get_dir(), 'boost_headers', 'boost')
-    dest_path_include = ports.get_include_dir('boost')
-    shared.try_delete(dest_path_include)
-    shutil.copytree(source_path_include, dest_path_include)
+    ports.install_header_dir(source_path_include, 'boost')
 
     # write out a dummy cpp file, to create an empty library
     # this is needed as emscripted ports expect this, even if it is not used
-    dummy_file = os.path.join(ports.get_build_dir(), 'boost_headers', 'dummy.cpp')
+    dummy_file = os.path.join(build_dir, 'dummy.cpp')
     shared.safe_ensure_dirs(os.path.dirname(dummy_file))
     with open(dummy_file, 'w') as f:
       f.write('static void dummy() {}')

tools/ports/bullet.py

@@ -22,9 +22,7 @@ def create(final):
     logging.info('building port: bullet')
 
     source_path = os.path.join(ports.get_dir(), 'bullet', 'Bullet-' + TAG)
-    dest_path = os.path.join(ports.get_build_dir(), 'bullet')
-
-    shutil.rmtree(dest_path, ignore_errors=True)
+    dest_path = ports.clear_project_build('bullet')
     shutil.copytree(source_path, dest_path)
     src_path = os.path.join(dest_path, 'bullet', 'src')
     src_path = os.path.join(dest_path, 'bullet', 'src')

tools/ports/bzip2.py

@@ -18,13 +18,8 @@ def get(ports, settings, shared):
   ports.fetch_project('bzip2', 'https://github.com/emscripten-ports/bzip2/archive/' + VERSION + '.zip', 'bzip2-' + VERSION, sha512hash=HASH)
 
   def create(final):
-    ports.clear_project_build('bzip2')
-
+    dest_path = ports.clear_project_build('bzip2')
     source_path = os.path.join(ports.get_dir(), 'bzip2', 'bzip2-' + VERSION)
-    dest_path = os.path.join(ports.get_build_dir(), 'bzip2')
-    shared.try_delete(dest_path)
-    os.makedirs(dest_path)
-    shutil.rmtree(dest_path, ignore_errors=True)
     shutil.copytree(source_path, dest_path)
 
     # build
@@ -35,7 +30,7 @@ def create(final):
     commands = []
     o_s = []
     for src in srcs:
-      o = os.path.join(ports.get_build_dir(), 'bzip2', src + '.o')
+      o = os.path.join(dest_path, shared.replace_suffix(src, '.o'))
       shared.safe_ensure_dirs(os.path.dirname(o))
       commands.append([shared.EMCC, '-c', os.path.join(dest_path, src), '-O2', '-o', o, '-I' + dest_path, '-w', ])
       o_s.append(o)

tools/ports/cocos2d.py

@@ -31,8 +31,7 @@ def create(final):
     cocos2dx_src = make_source_list(cocos2d_root, cocos2dx_root)
     cocos2dx_includes = make_includes(cocos2d_root)
 
-    cocos2d_build = os.path.join(ports.get_build_dir(), 'cocos2d')
-    shared.try_delete(os.path.join(cocos2d_build, 'samples'))
+    cocos2d_build = ports.clear_project_build('cocos2d')
     shutil.copytree(os.path.join(cocos2d_root, 'samples', 'Cpp'),
                     os.path.join(cocos2d_build, 'samples'))
 

tools/ports/freetype.py

@@ -19,13 +19,8 @@ def get(ports, settings, shared):
   ports.fetch_project('freetype', 'https://github.com/emscripten-ports/FreeType/archive/' + TAG + '.zip', 'FreeType-' + TAG, sha512hash=HASH)
 
   def create(final):
-    ports.clear_project_build('freetype')
-
+    dest_path = ports.clear_project_build('freetype')
     source_path = os.path.join(ports.get_dir(), 'freetype', 'FreeType-' + TAG)
-    dest_path = os.path.join(ports.get_build_dir(), 'freetype')
-    shared.try_delete(dest_path)
-    os.makedirs(dest_path)
-    shutil.rmtree(dest_path, ignore_errors=True)
     shutil.copytree(source_path, dest_path)
     Path(dest_path, 'include/ftconfig.h').write_text(ftconf_h)
 
@@ -85,7 +80,7 @@ def create(final):
     commands = []
     o_s = []
     for src in srcs:
-      o = os.path.join(ports.get_build_dir(), 'freetype', src + '.o')
+      o = os.path.join(dest_path, shared.replace_suffix(src, '.o'))
       shared.safe_ensure_dirs(os.path.dirname(o))
       commands.append([shared.EMCC, '-c', os.path.join(dest_path, src), '-o', o,
                        '-DFT2_BUILD_LIBRARY', '-O2',
@@ -103,8 +98,7 @@ def create(final):
       o_s.append(o)
 
     ports.run_commands(commands)
-    shared.try_delete(final)
-    shared.run_process([shared.LLVM_AR, 'rc', final] + o_s)
+    ports.create_lib(final, o_s)
 
     ports.install_header_dir(os.path.join(dest_path, 'include'),
                              target=os.path.join('freetype2', 'freetype'))

tools/ports/giflib.py

@@ -22,9 +22,7 @@ def create(final):
     logging.info('building port: giflib')
 
     source_path = os.path.join(ports.get_dir(), 'giflib', f'giflib-{VERSION}')
-    dest_path = os.path.join(ports.get_build_dir(), 'giflib')
-
-    shutil.rmtree(dest_path, ignore_errors=True)
+    dest_path = ports.clear_project_build('giflib')
     shutil.copytree(source_path, dest_path)
 
     ports.install_headers(dest_path)

tools/ports/harfbuzz.py

@@ -86,10 +86,9 @@ def get(ports, settings, shared):
 
   def create(final):
     logging.info('building port: harfbuzz')
-    ports.clear_project_build('harfbuzz')
+    build_path = ports.clear_project_build('harfbuzz')
 
     source_path = os.path.join(ports.get_dir(), 'harfbuzz', 'harfbuzz-' + VERSION)
-    build_path = os.path.join(ports.get_build_dir(), 'harfbuzz')
     freetype_include = ports.get_include_dir('freetype2/freetype')
     ports.install_headers(os.path.join(source_path, 'src'), target='harfbuzz')
 

tools/ports/icu.py

@@ -31,9 +31,8 @@ def get(ports, settings, shared):
 
   def prepare_build():
     source_path = os.path.join(ports.get_dir(), 'icu', 'icu') # downloaded icu4c path
-    dest_path = os.path.join(ports.get_build_dir(), 'icu') # icu build path
+    dest_path = ports.clear_project_build('icu') # icu build path
     logging.debug(f'preparing for icu build: {source_path} -> {dest_path}')
-    shutil.rmtree(dest_path, ignore_errors=True)
     shutil.copytree(source_path, dest_path)
 
   def build_lib(lib_output, lib_src, other_includes, build_flags):

tools/ports/libjpeg.py

@@ -26,9 +26,7 @@ def create(final):
     logging.info('building port: libjpeg')
 
     source_path = os.path.join(ports.get_dir(), 'libjpeg', 'jpeg-9c')
-    dest_path = os.path.join(ports.get_build_dir(), 'libjpeg')
-
-    shutil.rmtree(dest_path, ignore_errors=True)
+    dest_path = ports.clear_project_build('libjpeg')
     shutil.copytree(source_path, dest_path)
 
     Path(dest_path, 'jconfig.h').write_text(jconfig_h)