mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-10 16:13:25 +00:00
Code Activity

Refactor the use of `$(DESTDIR)$(PREFIX) in MakeRuleCmd`

Browse source 
class so that it is exposed via a public method (``install_root()``)
so that is can be used externally. Also refactor the existing methods
to use it.
This commit is contained in:
Dan Liew 2015-11-25 18:50:02 +00:00
parent 32c4384d48
commit f1d4f36ddf
1 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

35
scripts/mk_util.py
View file

@ -3227,15 +3227,27 @@ class MakeRuleCmd(object):
to writing commands manually which can be error prone. to writing commands manually which can be error prone.
""" """
@classmethod @classmethod
def install_files(cls, out, srcPattern, dest): def install_root(cls):
"""
Returns a string that will expand to the
install location when used in a makefile rule.
"""
# Note: DESTDIR is to support staged installs
return "$(DESTDIR)$(PREFIX)/"
@classmethod
def install_files(cls, out, src_pattern, dest):
assert len(dest) > 0 assert len(dest) > 0
assert isinstance(srcPattern, str) assert isinstance(src_pattern, str)
assert not ' ' in srcPattern assert not ' ' in src_pattern
assert isinstance(dest, str) assert isinstance(dest, str)
assert not ' ' in dest assert not ' ' in dest
assert not os.path.isabs(srcPattern) assert not os.path.isabs(src_pattern)
assert not os.path.isabs(dest) assert not os.path.isabs(dest)
cls.write_cmd(out, "cp {} $(DESTDIR)$(PREFIX)/{}".format(srcPattern, dest)) cls.write_cmd(out, "cp {src_pattern} {install_root}{dest}".format(
src_pattern=src_pattern,
install_root=cls.install_root(),
dest=dest))
@classmethod @classmethod
def remove_installed_files(cls, out, pattern): def remove_installed_files(cls, out, pattern):
@ -3243,7 +3255,9 @@ class MakeRuleCmd(object):
assert isinstance(pattern, str) assert isinstance(pattern, str)
assert not ' ' in pattern assert not ' ' in pattern
assert not os.path.isabs(pattern) assert not os.path.isabs(pattern)
cls.write_cmd(out, "rm -f $(DESTDIR)$(PREFIX)/{}".format(pattern)) cls.write_cmd(out, "rm -f {install_root}{pattern}".format(
install_root=cls.install_root(),
pattern=pattern))
@classmethod @classmethod
def make_install_directory(cls, out, dir): def make_install_directory(cls, out, dir):
@ -3251,7 +3265,9 @@ class MakeRuleCmd(object):
assert isinstance(dir, str) assert isinstance(dir, str)
assert not ' ' in dir assert not ' ' in dir
assert not os.path.isabs(dir) assert not os.path.isabs(dir)
cls.write_cmd(out, "mkdir -p $(DESTDIR)$(PREFIX)/{}".format(dir)) cls.write_cmd(out, "mkdir -p {install_root}{dir}".format(
install_root=cls.install_root(),
dir=dir))
@classmethod @classmethod
def create_relative_symbolic_link(cls, out, target, link_name): def create_relative_symbolic_link(cls, out, target, link_name):
@ -3296,7 +3312,10 @@ class MakeRuleCmd(object):
assert isinstance(link_name, str) assert isinstance(link_name, str)
assert not os.path.isabs(target) assert not os.path.isabs(target)
assert not os.path.isabs(link_name) assert not os.path.isabs(link_name)
cls.write_cmd(out, 'ln -s {} $(DESTDIR)$(PREFIX)/{}'.format(target, link_name)) cls.write_cmd(out, 'ln -s {target} {install_root}{link_name}'.format(
target=target,
install_root=cls.install_root(),
link_name=link_name))
# TODO: Refactor all of the build system to emit commands using this # TODO: Refactor all of the build system to emit commands using this
# helper to simplify code. This will also let us replace ``@`` with # helper to simplify code. This will also let us replace ``@`` with