Use common include directory for all ports

We already use a common "lib" directory to install al the libs.  This
change simply installs headers in the same common "sysroot".

This makes the ports install more like normall "make install" scripts
would.

The only port I didn't include here was cocos2d because it seemed a
little overwhelming.

Author: sbc100

embuilder.py

@@ -18,9 +18,7 @@
 from tools import shared
 from tools.system_libs import Library
 
-C_BARE = '''
-        int main() {}
-      '''
+C_BARE = 'int main() {}'
 
 SYSTEM_LIBRARIES = Library.get_all_variations()
 SYSTEM_TASKS = list(SYSTEM_LIBRARIES.keys())
@@ -125,8 +123,8 @@ def build(src, result_libs, args=[]):
       shared.exit_with_error('not seeing that requested library %s has been built because file %s does not exist' % (lib, shared.Cache.get_path(lib)))
 
 
-def build_port(port_name, lib_name, params):
-  build(C_BARE, [lib_name] if lib_name else [], params)
+def build_port(port_name, lib_name, params, extra_source=''):
+  build(extra_source + '\n' + C_BARE, [lib_name] if lib_name else [], params)
 
 
 def main():
@@ -215,7 +213,7 @@ def main():
     elif what == 'native_optimizer':
       build(C_BARE, ['optimizer.2.exe'], ['-O2', '-s', 'WASM=0'])
     elif what == 'icu':
-      build_port('icu', libname('libicuuc'), ['-s', 'USE_ICU=1'])
+      build_port('icu', libname('libicuuc'), ['-s', 'USE_ICU=1'], '#include "unicode/ustring.h"')
     elif what == 'zlib':
       build_port('zlib', 'libz.a', ['-s', 'USE_ZLIB=1'])
     elif what == 'bzip2':

tools/ports/boost_headers.py

@@ -25,21 +25,25 @@ def create():
 
     # includes
     source_path_include = os.path.join(ports.get_dir(), 'boost_headers', 'boost')
-    dest_path_include = os.path.join(ports.get_build_dir(), 'boost_headers', 'boost')
+    dest_path_include = os.path.join(ports.get_include_dir(), 'boost')
+    shared.try_delete(dest_path_include)
     shutil.copytree(source_path_include, dest_path_include)
 
     # 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
-    open(os.path.join(ports.get_build_dir(), 'boost_headers', 'dummy.cpp'), 'w').write('static void dummy() {}')
+    dummy_file = os.path.join(ports.get_build_dir(), 'boost_headers', 'dummy.cpp')
+    shared.safe_ensure_dirs(os.path.dirname(dummy_file))
+    with open(dummy_file, 'w') as f:
+      f.write('static void dummy() {}')
 
     commands = []
     o_s = []
-    o = os.path.join(ports.get_build_dir(), 'boost_headers', 'dummy.cpp.o')
-    command = [shared.PYTHON, shared.EMCC, '-c', os.path.join(ports.get_build_dir(), 'boost_headers', 'dummy.cpp'), '-o', o]
+    obj = dummy_file + '.o'
+    command = [shared.PYTHON, shared.EMCC, '-c', dummy_file, '-o', obj]
     commands.append(command)
     ports.run_commands(commands)
     final = os.path.join(ports.get_build_dir(), 'boost_headers', libname)
-    o_s.append(o)
+    o_s.append(obj)
     ports.create_lib(final, o_s)
     return final
 
@@ -53,7 +57,7 @@ def clear(ports, shared):
 def process_args(ports, args, settings, shared):
   if settings.USE_BOOST_HEADERS == 1:
     get(ports, settings, shared)
-    args += ['-Xclang', '-isystem' + os.path.join(ports.get_build_dir(), 'boost_headers'), '-DBOOST_ALL_NO_LIB']
+    args += ['-DBOOST_ALL_NO_LIB']
   return args
 
 

tools/ports/bullet.py

@@ -26,8 +26,20 @@ def create():
 
     shutil.rmtree(dest_path, ignore_errors=True)
     shutil.copytree(source_path, dest_path)
-
     src_path = os.path.join(dest_path, 'bullet', 'src')
+    src_path = os.path.join(dest_path, 'bullet', 'src')
+
+    dest_include_path = os.path.join(ports.get_include_dir(), 'bullet')
+    for base, dirs, files in os.walk(src_path):
+      for f in files:
+        if os.path.splitext(f)[1] != '.h':
+          continue
+        fullpath = os.path.join(base, f)
+        relpath = os.path.relpath(fullpath, src_path)
+        target = os.path.join(dest_include_path, relpath)
+        shared.safe_ensure_dirs(os.path.dirname(target))
+        shutil.copyfile(fullpath, target)
+
     includes = []
     for root, dirs, files in os.walk(src_path, topdown=False):
       for dir in dirs:
@@ -47,7 +59,7 @@ def clear(ports, shared):
 def process_args(ports, args, settings, shared):
   if settings.USE_BULLET == 1:
     get(ports, settings, shared)
-    args += ['-Xclang', '-isystem' + os.path.join(shared.Cache.get_path('ports-builds'), 'bullet', 'bullet', 'src')]
+    args += ['-I' + os.path.join(ports.get_include_dir(), 'bullet')]
   return args
 
 

tools/ports/bzip2.py

@@ -43,6 +43,7 @@ def create():
 
     final = os.path.join(ports.get_build_dir(), 'bzip2', 'libbz2.a')
     ports.create_lib(final, o_s)
+    ports.install_headers(source_path)
     return final
 
   return [shared.Cache.get('libbz2.a', create, what='port')]
@@ -55,7 +56,6 @@ def clear(ports, shared):
 def process_args(ports, args, settings, shared):
   if settings.USE_BZIP2 == 1:
     get(ports, settings, shared)
-    args += ['-Xclang', '-isystem' + os.path.join(shared.Cache.get_path('ports-builds'), 'bzip2')]
   return args
 
 

tools/ports/freetype.py

@@ -103,8 +103,10 @@ def create():
     ports.run_commands(commands)
     final = os.path.join(ports.get_build_dir(), 'freetype', 'libfreetype.a')
     shared.try_delete(final)
-    Popen([shared.LLVM_AR, 'rc', final] + o_s).communicate()
-    assert os.path.exists(final)
+    shared.run_process([shared.LLVM_AR, 'rc', final] + o_s)
+
+    ports.install_header_dir(os.path.join(dest_path, 'include'),
+                             target=os.path.join('freetype2', 'freetype'))
     return final
 
   return [shared.Cache.get('libfreetype.a', create, what='port')]
@@ -117,7 +119,8 @@ def clear(ports, shared):
 def process_args(ports, args, settings, shared):
   if settings.USE_FREETYPE == 1:
     get(ports, settings, shared)
-    args += ['-Xclang', '-isystem' + os.path.join(shared.Cache.get_path('ports-builds'), 'freetype/include')]
+    args += ['-I' + os.path.join(ports.get_include_dir(), 'freetype2', 'freetype')]
+
   return args
 
 

tools/ports/harfbuzz.py

@@ -24,9 +24,8 @@ def create():
     source_path = os.path.join(ports.get_dir(), 'harfbuzz', 'harfbuzz-' + TAG)
     dest_path = os.path.join(ports.get_build_dir(), 'harfbuzz')
 
-    freetype_dir = os.path.join(ports.get_build_dir(), 'freetype')
-    freetype_lib = os.path.join(freetype_dir, 'libfreetype.a')
-    freetype_include = os.path.join(freetype_dir, 'include')
+    freetype_lib = shared.Cache.get_path('libfreetype.a')
+    freetype_include = os.path.join(ports.get_include_dir(), 'freetype2', 'freetype')
     freetype_include_dirs = freetype_include + ';' + os.path.join(freetype_include, 'config')
 
     configure_args = [
@@ -45,6 +44,9 @@ def create():
 
     shared.Building.configure(configure_args)
     shared.Building.make(['make', '-j%d' % shared.Building.get_num_cores(), '-C' + dest_path, 'install'])
+
+    ports.install_header_dir(os.path.join(dest_path, 'include', 'harfbuzz'))
+
     return os.path.join(dest_path, 'libharfbuzz.a')
 
   return [shared.Cache.get('libharfbuzz' + ('-mt' if settings.USE_PTHREADS else '') + '.a', create, what='port')]
@@ -62,7 +64,7 @@ def process_dependencies(settings):
 def process_args(ports, args, settings, shared):
   if settings.USE_HARFBUZZ == 1:
     get(ports, settings, shared)
-    args += ['-Xclang', '-isystem' + os.path.join(ports.get_build_dir(), 'harfbuzz', 'include', 'harfbuzz')]
+    args += ['-I' + os.path.join(ports.get_build_dir(), 'harfbuzz', 'include', 'harfbuzz')]
   return args
 
 

tools/ports/icu.py

@@ -29,6 +29,8 @@ def create():
 
     final = os.path.join(dest_path, libname)
     ports.build_port(os.path.join(dest_path, 'icu4c', 'source', 'common'), final, [os.path.join(dest_path, 'icu4c', 'source', 'common')], ['--std=c++11', '-DU_COMMON_IMPLEMENTATION=1'])
+
+    ports.install_header_dir(os.path.join(dest_path, 'icu4c', 'source', 'common', 'unicode'))
     return final
 
   return [shared.Cache.get(libname, create)]
@@ -41,7 +43,6 @@ def clear(ports, shared):
 def process_args(ports, args, settings, shared):
   if settings.USE_ICU == 1:
     get(ports, settings, shared)
-    args += ['-Xclang', '-isystem' + os.path.join(shared.Cache.get_path('ports-builds'), 'icu', 'icu4c', 'source', 'common')]
   return args
 
 

tools/ports/libjpeg.py

@@ -29,6 +29,7 @@ def create():
     shutil.copytree(source_path, dest_path)
 
     open(os.path.join(dest_path, 'jconfig.h'), 'w').write(jconfig_h)
+    ports.install_headers(dest_path)
 
     final = os.path.join(ports.get_build_dir(), 'libjpeg', libname)
     ports.build_port(
@@ -51,7 +52,6 @@ def clear(ports, shared):
 def process_args(ports, args, settings, shared):
   if settings.USE_LIBJPEG == 1:
     get(ports, settings, shared)
-    args += ['-Xclang', '-isystem' + os.path.join(shared.Cache.get_path('ports-builds'), 'libjpeg')]
   return args
 
 

tools/ports/libpng.py

@@ -29,6 +29,7 @@ def create():
     shutil.copytree(source_path, dest_path)
 
     open(os.path.join(dest_path, 'pnglibconf.h'), 'w').write(pnglibconf_h)
+    ports.install_headers(dest_path)
 
     final = os.path.join(ports.get_build_dir(), 'libpng', libname)
     ports.build_port(dest_path, final, flags=['-s', 'USE_ZLIB=1'], exclude_files=['pngtest'], exclude_dirs=['scripts', 'contrib'])
@@ -49,7 +50,6 @@ def process_dependencies(settings):
 def process_args(ports, args, settings, shared):
   if settings.USE_LIBPNG == 1:
     get(ports, settings, shared)
-    args += ['-Xclang', '-isystem' + os.path.join(shared.Cache.get_path('ports-builds'), 'libpng')]
   return args
 
 

tools/ports/ogg.py

@@ -30,8 +30,12 @@ def create():
 
     open(os.path.join(dest_path, 'include', 'ogg', 'config_types.h'), 'w').write(config_types_h)
 
+    header_dir = os.path.join(ports.get_include_dir(), 'ogg')
+    shutil.rmtree(header_dir, ignore_errors=True)
+    shutil.copytree(os.path.join(dest_path, 'include', 'ogg'), header_dir)
+
     final = os.path.join(dest_path, libname)
-    ports.build_port(os.path.join(dest_path, 'src'), final, [os.path.join(dest_path, 'include')])
+    ports.build_port(os.path.join(dest_path, 'src'), final)
     return final
 
   return [shared.Cache.get(libname, create)]
@@ -44,7 +48,6 @@ def clear(ports, shared):
 def process_args(ports, args, settings, shared):
   if settings.USE_OGG == 1:
     get(ports, settings, shared)
-    args += ['-Xclang', '-isystem' + os.path.join(shared.Cache.get_path('ports-builds'), 'ogg', 'include')]
   return args