From 8c944f0b57f88d6abbc902f2d31ca3da367f787d Mon Sep 17 00:00:00 2001 From: Theo Markettos Date: Thu, 8 Aug 2024 12:33:57 +0100 Subject: [PATCH 1/2] Add target for building bluespec-libraries, also 'bluespec' alias 'bluespec-libraries' builds and installs the B-lang-org/bsc-contrib repo into the local install. 'bluespec' is a dummy target which depends on 'bluespec-libraries' which depends on 'bluespec-compiler', so building 'bluespec' with dependencies builds both. Upstream bluespec-compiler's makefile tends to rebuild all its BSV files even if nothing changed, so building 'bluespec-libraries' also causes the BSV inside bluespec-compiler to get rebuilt. Not sure if there's an easy solution for this. --- pycheribuild/projects/bluespec_compiler.py | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pycheribuild/projects/bluespec_compiler.py b/pycheribuild/projects/bluespec_compiler.py index 01d6076cc..c691537aa 100644 --- a/pycheribuild/projects/bluespec_compiler.py +++ b/pycheribuild/projects/bluespec_compiler.py @@ -28,6 +28,8 @@ # SUCH DAMAGE. # from .project import DefaultInstallDir, GitRepository, MakeCommandKind, Project +from .project import ExternallyManagedSourceRepository +from .simple_project import TargetAliasWithDependencies from ..utils import OSInfo @@ -86,3 +88,26 @@ def install(self, **kwargs): def run_tests(self) -> None: self.run_cmd("check-smoke") + + +class BuildBluespecLibraries(Project): + target = "bluespec-libraries" + dependencies = ("bluespec-compiler",) + default_directory_basename = "bsc-contrib" + repository = GitRepository("https://github.com/B-Lang-org/bsc-contrib.git") + native_install_dir = DefaultInstallDir.BOOTSTRAP_TOOLS + build_in_source_dir = True + make_kind = MakeCommandKind.GnuMake + + def compile(self, **kwargs): + self.make_args.set(PREFIX=self.install_dir) + self.run_make("all") + + def clean(self): + self.make_args.set(PREFIX=self.install_dir) + self.run_make("full_clean", cwd=self.source_dir) + + +class BuildBluespec(TargetAliasWithDependencies): + target = "bluespec" + dependencies = ("bluespec-libraries",) From d4cd77cd845379bb87d80ebb8d8638cbd2a2749d Mon Sep 17 00:00:00 2001 From: Theo Markettos Date: Thu, 8 Aug 2024 14:02:21 +0100 Subject: [PATCH 2/2] Remove unnecessary import --- pycheribuild/projects/bluespec_compiler.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pycheribuild/projects/bluespec_compiler.py b/pycheribuild/projects/bluespec_compiler.py index c691537aa..b09617f7f 100644 --- a/pycheribuild/projects/bluespec_compiler.py +++ b/pycheribuild/projects/bluespec_compiler.py @@ -28,7 +28,6 @@ # SUCH DAMAGE. # from .project import DefaultInstallDir, GitRepository, MakeCommandKind, Project -from .project import ExternallyManagedSourceRepository from .simple_project import TargetAliasWithDependencies from ..utils import OSInfo