Integrate samu

.builds/alpine.yml

@@ -66,7 +66,7 @@ tasks:
       fi
   - build_gcc: |
       cd muon
-      CC=gcc tools/ci/fullbootstrap.sh -Dbuildtype=release -Dstatic=true -Dwebsite=true
+      CC=gcc tools/ci/bootstrap.sh build -Dbuildtype=release -Dstatic=true -Dwebsite=true
   - build_tcc: |
       cd muon
       CC=tcc tools/ci/bootstrap.sh build-tcc
@@ -81,14 +81,12 @@ tasks:
       CC=gcc build/muon setup \
         -Dbuildtype=minsize \
         -Dstatic=true \
-        -Dsamurai=enabled \
         -Dlibcurl=disabled \
         -Dlibarchive=disabled \
         build-small
       samu -C build-small
   - release: |
       cd muon
-      tools/ci/git_archive_with_samurai.sh muon-edge+samurai
       tools/ci/prepare_release_docs.sh build
       tools/ci/prepare_binary.sh build edge-amd64-linux-static
       tools/ci/prepare_binary.sh build-small edge-amd64-linux-static-small
@@ -98,12 +96,10 @@ tasks:
         build/muon-edge-amd64-linux-static \
         build/muon-edge-amd64-linux-static.md5 \
         build-small/muon-edge-amd64-linux-static-small \
-        build-small/muon-edge-amd64-linux-static-small.md5 \
-        muon-edge+samurai.tar.gz
+        build-small/muon-edge-amd64-linux-static-small.md5
 artifacts:
   - muon/build/muon-edge-amd64-linux-static
   - muon/build/muon-edge-amd64-linux-static.md5
   - muon/build-small/muon-edge-amd64-linux-static-small
   - muon/build-small/muon-edge-amd64-linux-static-small.md5
   - muon/build/doc/docs/man.tar.gz
-  - muon/muon-edge+samurai.tar.gz

.builds/netbsd.yml

@@ -3,18 +3,14 @@
 
 image: netbsd/latest
 packages:
-  - curl
-  - libarchive
-  - pkgconf
-  - samurai
 sources:
   - https://git.sr.ht/~lattis/muon
 tasks:
   - build: |
       cd muon
       # TODO remove this when we implement rpaths
       export LD_LIBRARY_PATH=/usr/pkg/lib
-      tools/ci/fullbootstrap.sh
+      tools/ci/bootstrap.sh build
   - test: |
       cd muon/build
       # TODO remove this when we implement rpaths

.github/workflows/macos.yml

@@ -21,15 +21,15 @@ jobs:
     - name: bootstrap_deps
       run: |
         set -x
-        CFLAGS=-DNO_GETLOADAVG tools/bootstrap_ninja.sh build
+        mkdir -p build
         curl -L -o build/pkgconf-1.9.3.tar.gz https://github.com/pkgconf/pkgconf/archive/refs/tags/pkgconf-1.9.3.tar.gz
         tar xvf build/pkgconf-1.9.3.tar.gz
         mv pkgconf-pkgconf-1.9.3 subprojects/pkgconf
     - name: bootstrap
       run: |
         ./bootstrap.sh build
-        PATH="build:$PATH" CFLAGS=-DNO_GETLOADAVG build/muon setup -Dsamurai=enabled build
-        build/samu -C build
+        PATH="build:$PATH" build/muon -v setup build
+        build/muon -C build samu
     - name: test
       run: |
-        build/muon -C build test || true
+        build/muon -C build test -v -ddots || true

README.md

@@ -43,8 +43,6 @@ Patches and bug reports welcome!
 Essential:
 
 - `c99`
-- a ninja-compatible build tool (`samu` can be optionally bootstrapped with
-  `tools/bootstrap_ninja.sh`)
 
 For `pkgconf` support:
 
@@ -90,19 +88,14 @@ Stage 1:
 ./bootstrap.sh build
 ```
 
-Optionally, if your system does not provide a ninja-compatible build tool, you
-may use the provided ninja bootstrapping script.
-
-```
-./tools/bootstrap_ninja.sh build
-ninja=build/samu
-```
+This will by default build a copy of samurai into the resulting executable.  To
+disable this behavior use `CFLAGS=-DBOOTSTRAP_NO_SAMU`.
 
 Stage 2:
 
 ```
 build/muon setup build
-$ninja -C build
+build/muon -C build samu
 build/muon -C build test
 build/muon -C build install
 ```

include/backend/ninja.h

@@ -15,5 +15,5 @@ struct write_tgt_ctx {
 };
 
 bool ninja_write_all(struct workspace *wk);
-int ninja_run(struct workspace *wk, obj args, const char *chdir, const char *capture);
+bool ninja_run(struct workspace *wk, obj args, const char *chdir, const char *capture);
 #endif

include/external/samurai.h

@@ -6,10 +6,15 @@
 #ifndef MUON_EXTERNAL_SAMURAI_H
 #define MUON_EXTERNAL_SAMURAI_H
 
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+
+struct samu_opts {
+	FILE *out;
+};
 
 extern const bool have_samurai;
 
-bool muon_samu(uint32_t argc, char *const argv[]);
+bool samu_main(int argc, char *argv[], struct samu_opts *opts);
 #endif

include/external/samurai/arg.h

@@ -0,0 +1,30 @@
+/*
+ * SPDX-FileCopyrightText: Michael Forney <[email protected]>
+ * SPDX-FileCopyrightText: Stone Tickle <[email protected]>
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef MUON_EXTERNAL_SAMU_ARG_H
+#define MUON_EXTERNAL_SAMU_ARG_H
+
+#define SAMU_ARGBEGIN \
+	for (;;) { \
+		if (argc > 0) \
+			++argv, --argc; \
+		if (argc == 0 || (*argv)[0] != '-') \
+			break; \
+		if ((*argv)[1] == '-' && !(*argv)[2]) { \
+			++argv, --argc; \
+			break; \
+		} \
+		for (char *opt_ = &(*argv)[1], done_ = 0; !done_ && *opt_; ++opt_) { \
+			switch (*opt_)
+
+#define SAMU_ARGEND \
+		} \
+	}
+
+#define SAMU_EARGF(x) \
+	(done_ = 1, *++opt_ ? opt_ : argv[1] ? --argc, *++argv : ((x), abort(), (char *)0))
+
+#endif

include/external/samurai/build.h

@@ -0,0 +1,19 @@
+/*
+ * SPDX-FileCopyrightText: Michael Forney <[email protected]>
+ * SPDX-FileCopyrightText: Stone Tickle <[email protected]>
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef MUON_EXTERNAL_SAMU_BUILD_H
+#define MUON_EXTERNAL_SAMU_BUILD_H
+
+struct samu_node;
+
+/* reset state, so a new build can be executed */
+void samu_buildreset(struct samu_ctx *ctx);
+/* schedule a particular target to be built */
+void samu_buildadd(struct samu_ctx *ctx, struct samu_node *n);
+/* execute rules to build the scheduled targets */
+void samu_build(struct samu_ctx *ctx);
+
+#endif