Fix style, initial work on supporting prefixes.

ognibuild/__main__.py

@@ -136,6 +136,8 @@ def main():  # noqa: C901
     install_parser.add_argument(
         "--user", action="store_true", help="Install in local-user directories."
     )
+    install_parser.add_argument(
+        "--prefix", type=str, help='Prefix to install in')
 
     args = parser.parse_args()
     if not args.subcommand:
@@ -219,6 +221,7 @@ def main():  # noqa: C901
                     resolver=resolver,
                     fixers=fixers,
                     user=args.user,
+                    prefix=args.prefix,
                 )
             if args.subcommand == "test":
                 from .test import run_test

ognibuild/buildsystem.py

@@ -44,7 +44,7 @@ from .requirements import (
     GoRequirement,
     GoPackageRequirement,
 )
-from .fix_build import run_with_build_fixers, find_build_failure_description
+from .fix_build import run_with_build_fixers
 from .session import which
 
 
@@ -64,6 +64,8 @@ class InstallTarget(object):
     # Whether to prefer user-specific installation
     user: Optional[bool]
 
+    prefix: Optional[str]
+
     # TODO(jelmer): Add information about target directory, layout, etc.
 
 
@@ -445,6 +447,8 @@ class SetupPy(BuildSystem):
             extra_args = []
             if install_target.user:
                 extra_args.append("--user")
+            if install_target.prefix:
+                extra_args.append("--prefix=%s" % install_target.prefix)
             self._run_setup(session, resolver, ["install"] + extra_args, fixers)
         else:
             raise NotImplementedError
@@ -721,6 +725,7 @@ class R(BuildSystem):
         return dc.copy_single(target_directory)
 
     def install(self, session, resolver, fixers, install_target):
+        extra_args.append("--prefix=%s" % install_target.prefix)
         r_path = guaranteed_which(session, resolver, "R")
         run_with_build_fixers(session, [r_path, "CMD", "INSTALL", "."], fixers)
 
@@ -1078,7 +1083,7 @@ class Make(BuildSystem):
     def __repr__(self):
         return "%s(%r)" % (type(self).__name__, self.path)
 
-    def setup(self, session, resolver, fixers):
+    def setup(self, session, resolver, fixers, prefix=None):
         def makefile_exists():
             return any(
                 [session.exists(p) for p in ["Makefile", "GNUmakefile", "makefile"]]
@@ -1107,7 +1112,10 @@ class Make(BuildSystem):
                 run_with_build_fixers(session, ["autoreconf", "-i"], fixers)
 
         if not makefile_exists() and session.exists("configure"):
-            run_with_build_fixers(session, ["./configure"], fixers)
+            extra_args = []
+            if prefix is not None:
+                extra_args.append('--prefix=%s' % prefix)
+            run_with_build_fixers(session, ["./configure"] + extra_args, fixers)
 
         if not makefile_exists() and any(
             [n.name.endswith(".pro") for n in session.scandir(".")]
@@ -1122,12 +1130,25 @@ class Make(BuildSystem):
         self.setup(session, resolver, fixers)
         self._run_make(session, ["clean"], fixers)
 
-    def _run_make(self, session, args, fixers):
+    def _run_make(self, session, args, fixers, prefix=None):
+        def _wants_configure(line):
+            if line.startswith("Run ./configure"):
+                return True
+            if line == "Please run ./configure first":
+                return True
+            if line.startswith("Project not configured"):
+                return True
+            if line.startswith("The project was not configured"):
+                return True
+            return False
         try:
             run_with_build_fixers(session, ["make"] + args, fixers)
         except UnidentifiedError as e:
-            if len(e.lines) < 5 and any([line.startswith("Run ./configure") for line in e.lines]):
+            if len(e.lines) < 5 and any([_wants_configure(line) for line in e.lines]):
-                run_with_build_fixers(session, ["./configure"], fixers)
+                extra_args = []
+                if prefix is not None:
+                    extra_args.append("--prefix=%s" % prefix)
+                run_with_build_fixers(session, ["./configure"] + extra_args, fixers)
                 run_with_build_fixers(session, ["make"] + args, fixers)
             elif (
                 "Reconfigure the source tree "
@@ -1135,9 +1156,6 @@ class Make(BuildSystem):
             ) in e.lines:
                 run_with_build_fixers(session, ["./config"], fixers)
                 run_with_build_fixers(session, ["make"] + args, fixers)
-            elif "Please run ./configure first" in e.lines:
-                run_with_build_fixers(session, ["./configure"], fixers)
-                run_with_build_fixers(session, ["make"] + args, fixers)
             else:
                 raise
 
@@ -1146,8 +1164,8 @@ class Make(BuildSystem):
         self._run_make(session, ["check"], fixers)
 
     def install(self, session, resolver, fixers, install_target):
-        self.setup(session, resolver, fixers)
+        self.setup(session, resolver, fixers, prefix=install_target.prefix)
-        self._run_make(session, ["install"], fixers)
+        self._run_make(session, ["install"], fixers, prefix=install_target.prefix)
 
     def dist(self, session, resolver, fixers, target_directory, quiet=False):
         self.setup(session, resolver, fixers)

ognibuild/install.py

@@ -16,15 +16,17 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 from .buildsystem import NoBuildToolsFound, InstallTarget
+from typing import Optional
 
 
-def run_install(session, buildsystems, resolver, fixers, user: bool = False):
+def run_install(session, buildsystems, resolver, fixers, user: bool = False, prefix: Optional[str] = None):
     # Some things want to write to the user's home directory,
     # e.g. pip caches in ~/.cache
     session.create_home()
 
     install_target = InstallTarget()
     install_target.user = user
+    install_target.prefix = prefix
 
     for buildsystem in buildsystems:
         buildsystem.install(session, resolver, fixers, install_target)

ognibuild/requirements.py

@@ -472,7 +472,6 @@ class LibraryRequirement(Requirement):
         self.library = library
 
 
-
 class StaticLibraryRequirement(Requirement):
 
     library: str