mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 04:03:39 +00:00
Code Activity

Unbreak running `make install. The python site-package` directory

Browse source 
was not created before trying to create files in it.

The ``install_deps()`` method was also dead. It looks like that
should have been named ``mk_install_deps()`` but even if we give it
the right name it does the wrong thing. That method is supposed
emit target names (i.e. dependencies) not commands.
This commit is contained in:
Dan Liew 2015-12-07 07:38:24 +00:00
parent e2546d2b95
commit 38b45919b5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/mk_util.py
View file

@ -1300,9 +1300,13 @@ 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)
# FIXME: This belongs in ``PythonInstallComponent`` but
# it currently doesn't have access to this component so
# it can't emit these rules
if not is_python_install_enabled(): if not is_python_install_enabled():
return return
pythonPkgDirWithoutPrefix = strip_path_prefix(PYTHON_PACKAGE_DIR, PREFIX) pythonPkgDirWithoutPrefix = strip_path_prefix(PYTHON_PACKAGE_DIR, PREFIX)
MakeRuleCmd.make_install_directory(out, pythonPkgDirWithoutPrefix)
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))
else: else:
@ -1349,14 +1353,10 @@ class PythonInstallComponent(Component):
def main_component(self): def main_component(self):
return False return False
def install_deps(self, out):
if not is_python_install_enabled():
return
MakeRuleCmd.make_install_directory(out, self.pythonPkgDirWithoutPrefix)
def mk_install(self, out): def mk_install(self, out):
if not is_python_install_enabled(): if not is_python_install_enabled():
return return
MakeRuleCmd.make_install_directory(out, self.pythonPkgDirWithoutPrefix)
MakeRuleCmd.install_files(out, 'z3*.py', self.pythonPkgDirWithoutPrefix) MakeRuleCmd.install_files(out, 'z3*.py', self.pythonPkgDirWithoutPrefix)
if sys.version >= "3": if sys.version >= "3":
pythonPycacheDir = os.path.join(self.pythonPkgDirWithoutPrefix, '__pycache__') pythonPycacheDir = os.path.join(self.pythonPkgDirWithoutPrefix, '__pycache__')