Merge cmake and meson into C++ provider

Author: aleksrutins

core/providers/cmake/cmake.go

@@ -0,0 +1,8 @@
+package cpp
+
+import "github.com/railwayapp/railpack/core/generate"
+
+type buildSystem interface {
+	Install(pkgs *generate.MiseStepBuilder)
+	Build(build *generate.CommandStepBuilder)
+}

core/providers/cpp/buildsystem.go

@@ -0,0 +1,27 @@
+package cpp
+
+import (
+	"github.com/railwayapp/railpack/core/generate"
+	"github.com/railwayapp/railpack/core/plan"
+)
+
+type cmake struct{}
+
+func (_ *CppProvider) DetectCmake(ctx *generate.GenerateContext) (buildSystem, bool) {
+	if ctx.App.HasFile("CMakeLists.txt") {
+		return &cmake{}, true
+	}
+	return nil, false
+}
+
+func (_ *cmake) Install(mise *generate.MiseStepBuilder) {
+	mise.Default("cmake", "latest")
+	mise.Default("ninja", "latest")
+}
+
+func (_ *cmake) Build(build *generate.CommandStepBuilder) {
+	build.AddCommands([]plan.Command{
+		plan.NewExecCommand("cmake -B /build -GNinja /app"),
+		plan.NewExecCommand("cmake --build /build"),
+	})
+}

core/providers/cpp/cmake.go

@@ -0,0 +1,54 @@
+package cpp
+
+import (
+	"fmt"
+	"path/filepath"
+
+	"github.com/railwayapp/railpack/core/generate"
+	"github.com/railwayapp/railpack/core/plan"
+)
+
+type CppProvider struct{}
+
+func (p *CppProvider) Name() string {
+	return "cpp"
+}
+
+func (p *CppProvider) Detect(ctx *generate.GenerateContext) (bool, error) {
+	_, c := p.DetectCmake(ctx)
+	_, m := p.DetectMeson(ctx)
+	return c || m, nil
+}
+
+func (p *CppProvider) Initialize(ctx *generate.GenerateContext) error {
+	return nil
+}
+
+func (p *CppProvider) StartCommandHelp() string {
+	return ""
+}
+
+func (p *CppProvider) Plan(ctx *generate.GenerateContext) error {
+
+	packages := ctx.GetMiseStepBuilder()
+
+	buildsystem, found := p.DetectCmake(ctx)
+	if !found {
+		buildsystem, _ = p.DetectMeson(ctx)
+	}
+
+	buildsystem.Install(packages)
+
+	build := ctx.NewCommandStep("build")
+	build.AddInput(plan.NewStepLayer(packages.Name()))
+	build.AddInput(ctx.NewLocalLayer())
+	build.AddCommand(plan.NewExecCommand("mkdir /build"))
+	buildsystem.Build(build)
+
+	ctx.Deploy.StartCmd = fmt.Sprintf("/build/%s", filepath.Base(ctx.GetAppSource()))
+	ctx.Deploy.AddInputs([]plan.Layer{
+		plan.NewStepLayer(build.Name(), plan.NewIncludeFilter([]string{"/build/"})),
+	})
+
+	return nil
+}

core/providers/cpp/cpp.go

@@ -0,0 +1,27 @@
+package cpp
+
+import (
+	"github.com/railwayapp/railpack/core/generate"
+	"github.com/railwayapp/railpack/core/plan"
+)
+
+type meson struct{}
+
+func (_ *CppProvider) DetectMeson(ctx *generate.GenerateContext) (buildSystem, bool) {
+	if ctx.App.HasFile("meson.build") {
+		return &meson{}, true
+	}
+	return nil, false
+}
+
+func (_ *meson) Install(mise *generate.MiseStepBuilder) {
+	mise.Default("meson", "latest")
+	mise.Default("ninja", "latest")
+}
+
+func (_ *meson) Build(build *generate.CommandStepBuilder) {
+	build.AddCommands([]plan.Command{
+		plan.NewExecCommand("meson setup /build"),
+		plan.NewExecCommand("meson compile -C /build"),
+	})
+}

core/providers/cpp/meson.go

@@ -2,13 +2,12 @@ package providers
 
 import (
 	"github.com/railwayapp/railpack/core/generate"
-	"github.com/railwayapp/railpack/core/providers/cmake"
+	"github.com/railwayapp/railpack/core/providers/cpp"
 	"github.com/railwayapp/railpack/core/providers/deno"
 	"github.com/railwayapp/railpack/core/providers/elixir"
 	"github.com/railwayapp/railpack/core/providers/gleam"
 	"github.com/railwayapp/railpack/core/providers/golang"
 	"github.com/railwayapp/railpack/core/providers/java"
-	"github.com/railwayapp/railpack/core/providers/meson"
 	"github.com/railwayapp/railpack/core/providers/node"
 	"github.com/railwayapp/railpack/core/providers/php"
 	"github.com/railwayapp/railpack/core/providers/python"
@@ -41,8 +40,7 @@ func GetLanguageProviders() []Provider {
 		&node.NodeProvider{},
 		&gleam.GleamProvider{},
 		&ros.RosProvider{},
-		&meson.MesonProvider{},
-		&cmake.CmakeProvider{},
+		&cpp.CppProvider{},
 		&staticfile.StaticfileProvider{},
 		&shell.ShellProvider{},
 	}