Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-25 06:09:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix python build script

Browse Source
This commit is contained in:
Thomas Krijnen
2016-11-06 19:07:03 +01:00
parent 72d8b5377c
commit 8e2f528a99
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/build-all.py
+18 -10
View File
@@ -40,6 +40,7 @@ import subprocess as sp
import shutil import shutil
import time import time
import tarfile import tarfile
import multiprocessing
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.setLevel(logging.INFO) logger.setLevel(logging.INFO)
@@ -104,7 +105,7 @@ def get_os():
try: try:
IFCOS_NUM_BUILD_PROCS = os.environ["IFCOS_NUM_BUILD_PROCS"] IFCOS_NUM_BUILD_PROCS = os.environ["IFCOS_NUM_BUILD_PROCS"]
except KeyError: except KeyError:
IFCOS_NUM_BUILD_PROCS=int(sp.check_output([bash, "-c", "sysctl -n hw.ncpu 2> /dev/null || cat /proc/cpuinfo | grep processor | wc -l"]))+1 IFCOS_NUM_BUILD_PROCS=multiprocessing.cpu_count() + 1
os.environ["IFCOS_NUM_BUILD_PROCS"]=str(IFCOS_NUM_BUILD_PROCS) os.environ["IFCOS_NUM_BUILD_PROCS"]=str(IFCOS_NUM_BUILD_PROCS)
try: try:
@@ -188,11 +189,19 @@ if not os.path.exists(LOG_FILE):
logger.info("using command log file '%s'" % (LOG_FILE,)) logger.info("using command log file '%s'" % (LOG_FILE,))
def __check_call__(cmds, cwd=None): def __check_call__(cmds, cwd=None):
logger.info("running command '%s' in directory '%s'" % (cmds, cwd)) logger.info("running command '%s' in directory '%s'" % (" ".join(cmds), cwd))
log_file_handle = open(LOG_FILE, "a") log_file_handle = open(LOG_FILE, "a")
sp.check_call(cmds, cwd=cwd, stdout=log_file_handle, stderr=log_file_handle) proc = sp.Popen(cmds, cwd=cwd, stdout=log_file_handle, stderr=sp.PIPE)
_, stderr = proc.communicate()
log_file_handle.write(stderr)
log_file_handle.close() log_file_handle.close()
if proc.returncode != 0:
print "-" * 70
print stderr
print "-" * 70
raise Exception("Command `%s` returned exit code %d" % (" ".join(cmds), proc.returncode))
def __check_output__(cmds, cwd=None): def __check_output__(cmds, cwd=None):
"""Wraps `subprocess.check_output` and logs the command being executed, """Wraps `subprocess.check_output` and logs the command being executed,
sets up logging `stderr` to `LOG_FILE` (in append mode) and strips the sets up logging `stderr` to `LOG_FILE` (in append mode) and strips the
@@ -219,9 +228,8 @@ def run_autoconf(arg1, configure_args, cwd):
configure_path = os.path.realpath(os.path.join(cwd, "..", "configure")) configure_path = os.path.realpath(os.path.join(cwd, "..", "configure"))
if not os.path.exists(configure_path): if not os.path.exists(configure_path):
__check_call__([bash, "./autogen.sh"], cwd=os.path.realpath(os.path.join(cwd, ".."))) # only run autogen.sh in the directory it is located and use cwd to achieve that in order to not mess up things __check_call__([bash, "./autogen.sh"], cwd=os.path.realpath(os.path.join(cwd, ".."))) # only run autogen.sh in the directory it is located and use cwd to achieve that in order to not mess up things
__check_call__([bash, configure_path # Using `sh` over `bash` fixes issues with building swig
#"../configure" __check_call__(["/bin/sh", "../configure"]+configure_args+["--prefix=%s" % (os.path.realpath("%s/install/%s" % (DEPS_DIR, arg1)),)], cwd=cwd)
]+configure_args+["--prefix=%s" % (os.path.realpath("%s/install/%s" % (DEPS_DIR, arg1)),)], cwd=cwd)
def run_cmake(arg1, cmake_args, cmake_dir=None, cwd=None): def run_cmake(arg1, cmake_args, cmake_dir=None, cwd=None):
if cmake_dir is None: if cmake_dir is None:
@@ -454,14 +462,14 @@ run_cmake("", cmake_args=["-DBOOST_ROOT=%s/install/boost-%s" % (DEPS_DIR, BOOST_
logger.info("\rBuilding executables... ") logger.info("\rBuilding executables... ")
__check_call__([make, "-j%s" % (IFCOS_NUM_BUILD_PROCS,)], cwd=CMAKE_DIR) __check_call__([make, "-j%s" % (IFCOS_NUM_BUILD_PROCS,)], cwd=executables_dir)
if get_os() == "Darwin": if get_os() == "Darwin":
STRIP_OPTION="-x" STRIP_OPTION="-x"
else: else:
STRIP_OPTION="-s" STRIP_OPTION="-s"
__check_call__([strip, STRIP_OPTION, "IfcConvert", "IfcGeomServer"], cwd=CMAKE_DIR) __check_call__([strip, STRIP_OPTION, "IfcConvert", "IfcGeomServer"], cwd=executables_dir)
# On OSX the actual Python library is not linked against. # On OSX the actual Python library is not linked against.
ADDITIONAL_ARGS="" ADDITIONAL_ARGS=""
@@ -499,10 +507,10 @@ for PYTHON_VERSION in PYTHON_VERSIONS:
logger.info("\rBuilding python %s wrapper... " % (PYTHON_VERSION,)) logger.info("\rBuilding python %s wrapper... " % (PYTHON_VERSION,))
__check_call__([make, "-j%s" % (IFCOS_NUM_BUILD_PROCS,), "_ifcopenshell_wrapper"], cwd=CMAKE_DIR) __check_call__([make, "-j%s" % (IFCOS_NUM_BUILD_PROCS,), "_ifcopenshell_wrapper"], cwd=python_dir)
if get_os() != "Darwin": if get_os() != "Darwin":
# TODO: This symbol name depends on the Python version? # TODO: This symbol name depends on the Python version?
__check_call__([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", "ifcwrap/_ifcopenshell_wrapper.so"]) __check_call__([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", "ifcwrap/_ifcopenshell_wrapper.so"], cwd=python_dir)
logger.info("\rBuilt IfcOpenShell...\n\n") logger.info("\rBuilt IfcOpenShell...\n\n")