Merge branch 'v0.6.0' into v0.7.0

nix/build-all.py

@@ -28,6 +28,9 @@
 #   if building with USE_OCCT additionally:                                   #
 #     * freetype * glx.h                                                      #
 #                                                                             #
+#   if building with -shared                                                  #
+#     * libgl1-mesa-dev libxext-dev libxmu-dev libxmu-headers libxi-dev       #
+#                                                                             #
 #     on debian 7.8 these can be obtained with:                               #
 #          $ apt-get install git gcc g++ autoconf bison bzip2                 #
 #            libfreetype6-dev mesa-common-dev                                 #
@@ -71,7 +74,6 @@ BOOST_VERSION="1.69.0"
 PCRE_VERSION="8.39"
 LIBXML_VERSION="2.9.3"
 CMAKE_VERSION="3.4.1"
-ICU_VERSION="56.1"
 SWIG_VERSION="3.0.12"
 GMP_VERSION="6.1.2"
 MPFR_VERSION="3.1.5"
@@ -184,7 +186,7 @@ cecho(""" - How many compiler processes may be run in parallel.
 """)
 
 dependency_tree = {
-    'IfcParse': ('icu',  'boost',  'libxml2'),
+    'IfcParse': ('boost',  'libxml2'),
     'IfcGeom': ('IfcParse',  'occ',  'cgal', 'voxel'),
     'IfcConvert': ('IfcGeom',  'OpenCOLLADA'),
     'OpenCOLLADA': ('libxml2',  'pcre'),
@@ -192,7 +194,6 @@ dependency_tree = {
     'IfcOpenShell-Python': ('python',  'swig',  'IfcGeom'),
     'voxel': ('occ',),
     'swig': ('pcre',),
-    'icu': (),
     'boost': (),
     'libxml2': (),
     'python': (),
@@ -208,8 +209,19 @@ def v(dep):
      for x in v(d):
        yield x
 
-if len(sys.argv[1:]):
-    targets = set(sum((list(v(target)) for target in sys.argv[1:]), []))
+tgts = [s for s in sys.argv[1:] if not s.startswith("-")]
+flags = set(s for s in sys.argv[1:] if s.startswith("-"))
+
+BUILD_STATIC = not "-shared" in flags
+ENABLE_FLAG = "--enable-static" if BUILD_STATIC else "--enable-shared"
+DISABLE_FLAG = "--disable-shared" if BUILD_STATIC else "--disable-static"
+LINK_TYPE = "static" if BUILD_STATIC else "shared"
+LINK_TYPE_UCFIRST = LINK_TYPE[0].upper() + LINK_TYPE[1:]
+LIBRARY_EXT = "a" if BUILD_STATIC else "so"
+PIC = "-fPIC" if BUILD_STATIC else ""
+
+if len(tgts):
+    targets = set(sum((list(v(target)) for target in tgts), []))
 else:
     targets = set(dependency_tree.keys())
 
@@ -272,7 +284,6 @@ def run(cmds, cwd=None):
     return stdout.strip()
 
 BOOST_VERSION_UNDERSCORE=BOOST_VERSION.replace(".", "_")
-ICU_VERSION_UNDERSCORE=ICU_VERSION.replace(".", "_")
 CMAKE_VERSION_2=CMAKE_VERSION[:CMAKE_VERSION.rindex('.')]
 
 OCE_LOCATION="https://github.com/tpaviot/oce/archive/OCE-%s.tar.gz" % (OCE_VERSION,)
@@ -302,12 +313,6 @@ def run_cmake(arg1, cmake_args, cmake_dir=None, cwd=None):
     cmake_path= os.path.join(DEPS_DIR, "install", "cmake-%s" % (CMAKE_VERSION,), "bin", "cmake")
     run([cmake_path, P]+cmake_args+["-DCMAKE_BUILD_TYPE=%s" % (BUILD_CFG,)], cwd=cwd)
 
-def run_icu(arg1, icu_args, cwd):
-    PLATFORM=get_os()
-    if PLATFORM == "Darwin":
-        PLATFORM="MacOSX"
-    run([bash, "../source/runConfigureICU", PLATFORM]+icu_args+["--prefix=%s/install/%s" % (DEPS_DIR, arg1)], cwd=cwd)
-
 def git_clone(clone_url, target_dir, revision=None):
     """Lazily clones the `git` repository denoted by `clone_url` into
     `target_dir`, i.e. skips cloning if `target_dir` exists (naively assumes
@@ -401,9 +406,7 @@ def build_dependency(name, mode, build_tool_args, download_url, download_name, d
         os.makedirs(extract_build_dir)
 
         logger.info("\rConfiguring %s..." % (name,))
-        if mode == "icu":
-            run_icu(name, build_tool_args, cwd=extract_build_dir)
-        elif mode == "autoconf":
+        if mode == "autoconf":
             run_autoconf(name, build_tool_args, cwd=extract_build_dir)
         elif mode == "cmake":
             run_cmake(name, build_tool_args, cwd=extract_build_dir)
@@ -440,41 +443,34 @@ if get_os() == "Darwin":
 # If the linker supports GC sections, set it up to reduce binary file size
 # -fPIC is required for the shared libraries to work
 
-try:
-    CXXFLAGS=os.environ["CXXFLAGS"]
-except KeyError:
-    CXXFLAGS=""
-try:
-    CFLAGS=os.environ["CFLAGS"]
-except KeyError:
-    CFLAGS=""
-try:
-    LDFLAGS=os.environ["LDFLAGS"]
-except KeyError:
-    LDFLAGS=""
+CXXFLAGS=os.environ.get("CXXFLAGS", "")
+CFLAGS=os.environ.get("CFLAGS", "")
+LDFLAGS=os.environ.get("LDFLAGS", "")
 
 if sp.call([bash, "-c", "ld --gc-sections 2>&1 | grep -- --gc-sections &> /dev/null"]) != 0:
-    CXXFLAGS_MINIMAL="%s -fPIC %s" % (CXXFLAGS, str.join(" ", ADDITIONAL_ARGS))
-    os.environ["CXXFLAGS_MINIMAL"]=CXXFLAGS_MINIMAL
-    CFLAGS_MINIMAL="%s -fPIC %s" % (CFLAGS, str.join(" ", ADDITIONAL_ARGS))
-    os.environ["CFLAGS_MINIMAL"]=CFLAGS_MINIMAL
-    CXXFLAGS="%s -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden -fvisibility-inlines-hidden %s" % (CXXFLAGS, str.join(" ", ADDITIONAL_ARGS))
-    os.environ["CXXFLAGS"]=CXXFLAGS
-    CFLAGS="%s   -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden %s"% (CFLAGS, str.join(" ", ADDITIONAL_ARGS))
-    os.environ["CFLAGS"]=CFLAGS
+    CXXFLAGS_MINIMAL="%s %s %s" % (CXXFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
+    CFLAGS_MINIMAL="%s %s %s" % (CFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
+    if BUILD_STATIC:
+        CXXFLAGS="%s %s -fdata-sections -ffunction-sections -fvisibility=hidden -fvisibility-inlines-hidden %s" % (CXXFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
+        CFLAGS="%s   %s -fdata-sections -ffunction-sections -fvisibility=hidden %s"% (CFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
+    else:
+        CXXFLAGS=CXXFLAGS_MINIMAL
+        CFLAGS=CFLAGS_MINIMAL
     LDFLAGS="%s  -Wl,--gc-sections %s" % (LDFLAGS, str.join(" ", ADDITIONAL_ARGS))
-    os.environ["LDFLAGS"]=LDFLAGS
 else:
-    CXXFLAGS_MINIMAL="%s -fPIC %s" % (CXXFLAGS, str.join(" ", ADDITIONAL_ARGS))
-    os.environ["CXXFLAGS_MINIMAL"]=CXXFLAGS_MINIMAL
-    CFLAGS_MINIMAL="%s   -fPIC %s" % (CFLAGS, str.join(" ", ADDITIONAL_ARGS))
-    os.environ["CFLAGS_MINIMAL"]=CFLAGS_MINIMAL
-    CXXFLAGS="%s -fPIC -fvisibility=hidden -fvisibility-inlines-hidden %s" % (CXXFLAGS, str.join(" ", ADDITIONAL_ARGS))
-    os.environ["CXXFLAGS"]=CXXFLAGS
-    CFLAGS="%s   -fPIC -fvisibility=hidden -fvisibility-inlines-hidden %s" % (CFLAGS, str.join(" ", ADDITIONAL_ARGS))
-    os.environ["CFLAGS"]=CFLAGS
+    CXXFLAGS_MINIMAL="%s %s %s" % (CXXFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
+    CFLAGS_MINIMAL="%s   %s %s" % (CFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
+    if BUILD_STATIC:
+        CXXFLAGS="%s %s -fvisibility=hidden -fvisibility-inlines-hidden %s" % (CXXFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
+        CFLAGS="%s   %s -fvisibility=hidden -fvisibility-inlines-hidden %s" % (CFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
+    else:
+        CXXFLAGS=CXXFLAGS_MINIMAL
+        CFLAGS=CFLAGS_MINIMAL
     LDFLAGS="%s %s" % (LDFLAGS, str.join(" ", ADDITIONAL_ARGS))
-    os.environ["LDFLAGS"]=LDFLAGS
+    
+os.environ["CXXFLAGS"] = CXXFLAGS
+os.environ["CFLAGS"] = CFLAGS
+os.environ["LDFLAGS"] = LDFLAGS
 
 # Some dependencies need a more recent CMake version than most distros provide
 build_dependency(name="cmake-%s" % (CMAKE_VERSION,), mode="autoconf", build_tool_args=[], download_url="https://cmake.org/files/v%s" % (CMAKE_VERSION_2,), download_name="cmake-%s.tar.gz" % (CMAKE_VERSION,))
@@ -501,7 +497,7 @@ if "pcre" in targets:
     build_dependency(
         name="pcre-{PCRE_VERSION}".format(**locals()),
         mode="autoconf",
-        build_tool_args=["--disable-shared"],
+        build_tool_args=[DISABLE_FLAG],
         download_url="https://downloads.sourceforge.net/project/pcre/pcre/{PCRE_VERSION}/".format(**locals()),
         download_name="pcre-{PCRE_VERSION}.tar.bz2".format(**locals())
     )
@@ -525,7 +521,7 @@ if USE_OCCT and "occ" in targets:
         mode="cmake",
         build_tool_args=[
             "-DINSTALL_DIR={DEPS_DIR}/install/occt-{OCCT_VERSION}".format(**locals()),
-            "-DBUILD_LIBRARY_TYPE=Static",
+            "-DBUILD_LIBRARY_TYPE={LINK_TYPE_UCFIRST}".format(**locals()),
             "-DBUILD_MODULE_Draw=0",
         ],
         download_url = "https://git.dev.opencascade.org/repos/occt.git",
@@ -562,7 +558,8 @@ if "libxml2" in targets:
         "autoconf",
         build_tool_args=[
             "--without-python",
-            "--disable-shared",
+            ENABLE_FLAG,
+            DISABLE_FLAG,
             "--without-zlib",
             "--without-iconv",
             "--without-lzma"
@@ -577,10 +574,10 @@ if "OpenCOLLADA" in targets:
         "cmake",
         build_tool_args=[
             "-DLIBXML2_INCLUDE_DIR={DEPS_DIR}/install/libxml2-{LIBXML_VERSION}/include/libxml2".format(**locals()),
-            "-DLIBXML2_LIBRARIES={DEPS_DIR}/install/libxml2-{LIBXML_VERSION}/lib/libxml2.a".format(**locals()),
+            "-DLIBXML2_LIBRARIES={DEPS_DIR}/install/libxml2-{LIBXML_VERSION}/lib/libxml2.{LIBRARY_EXT}".format(**locals()),
             "-DPCRE_INCLUDE_DIR={DEPS_DIR}/install/pcre-{PCRE_VERSION}/include".format(**locals()),
-            "-DPCRE_PCREPOSIX_LIBRARY={DEPS_DIR}/install/pcre-{PCRE_VERSION}/lib/libpcreposix.a".format(**locals()),
-            "-DPCRE_PCRE_LIBRARY={DEPS_DIR}/install/pcre-{PCRE_VERSION}/lib/libpcre.a".format(**locals()),
+            "-DPCRE_PCREPOSIX_LIBRARY={DEPS_DIR}/install/pcre-{PCRE_VERSION}/lib/libpcreposix.{LIBRARY_EXT}".format(**locals()),
+            "-DPCRE_PCRE_LIBRARY={DEPS_DIR}/install/pcre-{PCRE_VERSION}/lib/libpcre.{LIBRARY_EXT}".format(**locals()),
             "-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/OpenCOLLADA/".format(**locals())
         ],
         download_url="https://github.com/KhronosGroup/OpenCOLLADA.git",
@@ -637,7 +634,7 @@ if "boost" in targets:
             "--with-thread",
             "--with-date_time",
             "--with-iostreams",
-            "link=static"
+            "link={LINK_TYPE}".format(**locals())
                                                                          ] + \
             BOOST_ADDRESS_MODEL                                            + \
             list(map(str_concat("cxxflags"), CXXFLAGS.strip().split(' '))) + \
@@ -647,6 +644,7 @@ if "boost" in targets:
         download_name="boost_{BOOST_VERSION_UNDERSCORE}.tar.bz2".format(**locals())
     )
     
+<<<<<<< HEAD
 if "icu" in targets:
     build_dependency(
         name="icu-{ICU_VERSION}".format(**locals()),
@@ -706,6 +704,7 @@ cmake_args=[
     "-DUSE_MMAP="                      "OFF",
     "-DBUILD_EXAMPLES="                "OFF",
     "-DBUILD_IFCPYTHON="               "OFF",
+    "-DBUILD_SHARED_LIBS="            +OFF_ON[not BUILD_STATIC],
     "-DBUILD_IFCGEOM="                +OFF_ON["IfcGeom" in targets],
     "-DBUILD_GEOMSERVER="             +OFF_ON["IfcGeomServer" in targets],
     "-DBUILD_CONVERT="                +OFF_ON["IfcConvert" in targets],
@@ -740,12 +739,6 @@ if "OpenCOLLADA" in targets:
         "-DOPENCOLLADA_LIBRARY_DIR="   "{DEPS_DIR}/install/OpenCOLLADA/lib/opencollada".format(**locals())
     ])
 
-if "icu" in targets:
-    cmake_args.extend([
-        "-DICU_INCLUDE_DIR="           "{DEPS_DIR}/install/icu-{ICU_VERSION}/include".format(**locals()),
-        "-DICU_LIBRARY_DIR="           "{DEPS_DIR}/install/icu-{ICU_VERSION}/lib".format(**locals())
-    ])
-
 if "pcre" in targets:
     cmake_args.append(
         "-DPCRE_LIBRARY_DIR="          "{DEPS_DIR}/install/pcre-{PCRE_VERSION}/lib".format(**locals())
@@ -754,7 +747,7 @@ if "pcre" in targets:
 if "libxml2" in targets:
     cmake_args.extend([
         "-DLIBXML2_INCLUDE_DIR="       "{DEPS_DIR}/install/libxml2-{LIBXML_VERSION}/include/libxml2".format(**locals()),
-        "-DLIBXML2_LIBRARIES="         "{DEPS_DIR}/install/libxml2-{LIBXML_VERSION}/lib/libxml2.a".format(**locals())
+        "-DLIBXML2_LIBRARIES="         "{DEPS_DIR}/install/libxml2-{LIBXML_VERSION}/lib/libxml2.{LIBRARY_EXT}".format(**locals())
     ])
 
 run_cmake("", cmake_args, cmake_dir=CMAKE_DIR, cwd=executables_dir)
@@ -789,18 +782,17 @@ if "IfcOpenShell-Python" in targets:
 
         run_cmake("",
             cmake_args=[
+                "-DBUILD_SHARED_LIBS="       "OFF" if BUILD_STATIC else "ON",
                 "-DBOOST_ROOT="              "{DEPS_DIR}/install/boost-{BOOST_VERSION}".format(**locals()),
                 "-DOCC_INCLUDE_DIR="         +occ_include_dir,
                 "-DOCC_LIBRARY_DIR="         +occ_library_dir,
-                "-DICU_INCLUDE_DIR="         "{DEPS_DIR}/install/icu-{ICU_VERSION}/include".format(**locals()),
-                "-DICU_LIBRARY_DIR="         "{DEPS_DIR}/install/icu-{ICU_VERSION}/lib".format(**locals()),
                 "-DPYTHON_LIBRARY="          +PYTHON_LIBRARY,
                 "-DPYTHON_EXECUTABLE="       +PYTHON_EXECUTABLE,
                 "-DPYTHON_INCLUDE_DIR="      +PYTHON_INCLUDE,
                 "-DSWIG_EXECUTABLE="         "{DEPS_DIR}/install/swig/bin/swig".format(**locals()),
                 "-DCMAKE_INSTALL_PREFIX="    "{DEPS_DIR}/install/ifcopenshell/tmp".format(**locals()),
                 "-DLIBXML2_INCLUDE_DIR="     "{DEPS_DIR}/install/libxml2-{LIBXML_VERSION}/include/libxml2".format(**locals()),
-                "-DLIBXML2_LIBRARIES="       "{DEPS_DIR}/install/libxml2-{LIBXML_VERSION}/lib/libxml2.a".format(**locals()),
+                "-DLIBXML2_LIBRARIES="       "{DEPS_DIR}/install/libxml2-{LIBXML_VERSION}/lib/libxml2.{LIBRARY_EXT}".format(**locals()),
                 "-DCOLLADA_SUPPORT=OFF"
             ], cmake_dir=CMAKE_DIR, cwd=python_dir)