internal/rosa/make: migrate to helper interface

This also updates all affected artifacts to use new behaviour.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 22 insertions, 32 deletions

diff --git a/internal/rosa/x.go b/internal/rosa/x.go
index 191bbe6f..fc4596b7 100644
--- a/internal/rosa/x.go
+++ b/internal/rosa/x.go
@@ -7,12 +7,12 @@ func (t Toolchain) newUtilMacros() pkg.Artifact {
 		version  = "1.17"
 		checksum = "vYPO4Qq3B_WGcsBjG0-lfwZ6DZ7ayyrOLqfDrVOgTDcyLChuMGOAAVAa_UXLu5tD"
 	)
-	return t.NewViaMake("util-macros", version, pkg.NewHTTPGetTar(
+	return t.NewPackage("util-macros", version, pkg.NewHTTPGetTar(
 		nil, "https://www.x.org/releases/X11R7.7/src/util/"+
 			"util-macros-"+version+".tar.bz2",
 		mustDecode(checksum),
 		pkg.TarBzip2,
-	), nil)
+	), nil, (*MakeHelper)(nil))
 }
 func init() { artifactsF[utilMacros] = Toolchain.newUtilMacros }
 
@@ -21,27 +21,22 @@ func (t Toolchain) newXproto() pkg.Artifact {
 		version  = "7.0.23"
 		checksum = "goxwWxV0jZ_3pNczXFltZWHAhq92x-aEreUGyp5Ns8dBOoOmgbpeNIu1nv0Zx07z"
 	)
-	return t.NewViaMake("xproto", version, pkg.NewHTTPGetTar(
+	return t.NewPackage("xproto", version, pkg.NewHTTPGetTar(
 		nil, "https://www.x.org/releases/X11R7.7/src/proto/"+
 			"xproto-"+version+".tar.bz2",
 		mustDecode(checksum),
 		pkg.TarBzip2,
-	), &MakeAttr{
-		Writable: true,
-
+	), nil, &MakeHelper{
 		// ancient configure script
-		ScriptEarly: `
-cd /usr/src/xproto
-autoreconf -if
-`,
+		Generate: "autoreconf -if",
 	},
-		t.Load(M4),
-		t.Load(Perl),
-		t.Load(Autoconf),
-		t.Load(Automake),
-		t.Load(PkgConfig),
+		M4,
+		Perl,
+		Autoconf,
+		Automake,
+		PkgConfig,
 
-		t.Load(utilMacros),
+		utilMacros,
 	)
 }
 func init() { artifactsF[Xproto] = Toolchain.newXproto }
@@ -51,29 +46,24 @@ func (t Toolchain) newLibXau() pkg.Artifact {
 		version  = "1.0.7"
 		checksum = "bm768RoZZnHRe9VjNU1Dw3BhfE60DyS9D_bgSR-JLkEEyUWT_Hb_lQripxrXto8j"
 	)
-	return t.NewViaMake("libXau", version, pkg.NewHTTPGetTar(
+	return t.NewPackage("libXau", version, pkg.NewHTTPGetTar(
 		nil, "https://www.x.org/releases/X11R7.7/src/lib/"+
 			"libXau-"+version+".tar.bz2",
 		mustDecode(checksum),
 		pkg.TarBzip2,
-	), &MakeAttr{
-		Writable: true,
-
+	), nil, &MakeHelper{
 		// ancient configure script
-		ScriptEarly: `
-cd /usr/src/libXau
-autoreconf -if
-`,
+		Generate: "autoreconf -if",
 	},
-		t.Load(M4),
-		t.Load(Perl),
-		t.Load(Autoconf),
-		t.Load(Automake),
-		t.Load(Libtool),
-		t.Load(PkgConfig),
+		M4,
+		Perl,
+		Autoconf,
+		Automake,
+		Libtool,
+		PkgConfig,
 
-		t.Load(utilMacros),
-		t.Load(Xproto),
+		utilMacros,
+		Xproto,
 	)
 }
 func init() { artifactsF[LibXau] = Toolchain.newLibXau }