mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-04 05:19:11 +00:00
Code Activity

make dotnet optional and recover from python installation mismatch. Pull requests #338, #340

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-12-06 19:25:18 -08:00
parent a940230301
commit febd83912e
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scripts/mk_util.py
View file

@ -712,7 +712,7 @@ def parse_options():
display_help(1) display_help(1)
# Handle the Python package directory # Handle the Python package directory
if IS_WINDOWS: if IS_WINDOWS:
PYTHON_INSTALL_ENABLED = False PYTHON_INSTALL_ENABLED = True
else: else:
if not PYTHON_PACKAGE_DIR.startswith(PREFIX): if not PYTHON_PACKAGE_DIR.startswith(PREFIX):
print(("Warning: The detected Python package directory (%s)" print(("Warning: The detected Python package directory (%s)"
@ -811,6 +811,9 @@ def is_ml_enabled():
def is_dotnet_enabled(): def is_dotnet_enabled():
return DOTNET_ENABLED return DOTNET_ENABLED
def is_python_install_enabled():
return PYTHON_INSTALL_ENABLED
def disable_dotnet(): def disable_dotnet():
global DOTNET_ENABLED global DOTNET_ENABLED
DOTNET_ENABLED = False DOTNET_ENABLED = False
@ -1297,6 +1300,8 @@ class DLLComponent(Component):
dllfile = '%s$(SO_EXT)' % self.dll_name dllfile = '%s$(SO_EXT)' % self.dll_name
dllInstallPath = os.path.join(INSTALL_LIB_DIR, dllfile) dllInstallPath = os.path.join(INSTALL_LIB_DIR, dllfile)
MakeRuleCmd.install_files(out, dllfile, dllInstallPath) MakeRuleCmd.install_files(out, dllfile, dllInstallPath)
if not python_install_enabled():
return
pythonPkgDirWithoutPrefix = strip_path_prefix(PYTHON_PACKAGE_DIR, PREFIX) pythonPkgDirWithoutPrefix = strip_path_prefix(PYTHON_PACKAGE_DIR, PREFIX)
if IS_WINDOWS: if IS_WINDOWS:
MakeRuleCmd.install_files(out, dllfile, os.path.join(pythonPkgDirWithoutPrefix, dllfile)) MakeRuleCmd.install_files(out, dllfile, os.path.join(pythonPkgDirWithoutPrefix, dllfile))