billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't rely on cwd.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-17 12:24:43 +00:00
parent 159dc9879c
commit c6afe4eb40
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ognibuild/buildsystem.py
View file

@ -226,7 +226,7 @@ class SetupPy(BuildSystem):
self._run_setup(session, resolver, ["install"] + extra_args, fixers) self._run_setup(session, resolver, ["install"] + extra_args, fixers)
def _run_setup(self, session, resolver, args, fixers): def _run_setup(self, session, resolver, args, fixers):
interpreter = shebang_binary("setup.py") interpreter = shebang_binary(self.path)
if interpreter is not None: if interpreter is not None:
resolver.install([BinaryRequirement(interpreter)]) resolver.install([BinaryRequirement(interpreter)])
run_with_build_fixers(session, ["./setup.py"] + args, fixers) run_with_build_fixers(session, ["./setup.py"] + args, fixers)
@ -502,24 +502,24 @@ class Make(BuildSystem):
name = "make" name = "make"
def __init__(self, path):
self.path = path
def __repr__(self): def __repr__(self):
return "%s()" % type(self).__name__ return "%s(%r)" % (type(self).__name__, self.path)
def setup(self, session, resolver, fixers): def setup(self, session, resolver, fixers):
resolver.install([BinaryRequirement("make")])
def makefile_exists(): def makefile_exists():
return any( return any(
[session.exists(p) for p in ["Makefile", "GNUmakefile", "makefile"]] [session.exists(p) for p in ["Makefile", "GNUmakefile", "makefile"]]
) )
if session.exists("Makefile.PL") and not makefile_exists(): if session.exists("Makefile.PL") and not makefile_exists():
resolver.install([BinaryRequirement("perl")])
run_with_build_fixers(session, ["perl", "Makefile.PL"], fixers) run_with_build_fixers(session, ["perl", "Makefile.PL"], fixers)
if not makefile_exists() and not session.exists("configure"): if not makefile_exists() and not session.exists("configure"):
if session.exists("autogen.sh"): if session.exists("autogen.sh"):
if shebang_binary("autogen.sh") is None: if shebang_binary(os.path.join(self.path, "autogen.sh")) is None:
run_with_build_fixers(session, ["/bin/sh", "./autogen.sh"], fixers) run_with_build_fixers(session, ["/bin/sh", "./autogen.sh"], fixers)
try: try:
run_with_build_fixers(session, ["./autogen.sh"], fixers) run_with_build_fixers(session, ["./autogen.sh"], fixers)
@ -802,7 +802,7 @@ def detect_buildsystems(path, trust_package=False): # noqa: C901
] ]
] ]
): ):
yield Make() yield Make(path)
seen_golang = False seen_golang = False
if os.path.exists(os.path.join(path, ".travis.yml")): if os.path.exists(os.path.join(path, ".travis.yml")):