From 0ff04803dc284312229fff26bb9c59ad175d2c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Fri, 8 Nov 2024 20:05:18 +0200
Subject: [PATCH] step16, 17

---
 run | 73 ++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 20 deletions(-)

diff --git a/run b/run
index 9e06290..f520949 100755
--- a/run
+++ b/run
@@ -11,6 +11,16 @@ fullbuild() {
   popd
 }
 
+# zig2
+halfbuild() {
+  rm -fr build
+  mkdir build
+  pushd build
+  CC=clang-15 CXX=clang++-15 cmake ..
+  make -j"$(nproc)"
+  popd
+}
+
 # commit e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
 # Merge: 817cf6a82e 20d86d9c63
 # Author: Andrew Kelley <andrew@ziglang.org>
@@ -212,16 +222,7 @@ step07() {
     pushd "../zig-$STEP07_"
     patch -p1 <"$HERE/0.10.0-961-g54160e7f6a-CMakeLists.txt-remove-stage3.patch"
     cp ../zig-$STEP06_/stage1/zig1.wasm stage1/zig1.wasm
-
-    # same as "fullbuild", but for zig2 only
-    rm -fr build
-    mkdir build
-    {
-      pushd build
-      CC=clang-15 CXX=clang++-15 cmake ..
-      make -j"$(nproc)"
-      popd
-    }
+    halfbuild
     popd
   }
 }
@@ -363,16 +364,7 @@ step14() {
     pushd "../zig-$STEP14_"
     patch -p1 <"$HERE/0.10.0-1657-g321ccbdc52-CMakeLists.txt-remove-stage3.patch"
     cp ../zig-$STEP13_/stage1/zig1.wasm stage1/zig1.wasm
-
-    # same as "fullbuild", but for zig2 only
-    rm -fr build
-    mkdir build
-    {
-      pushd build
-      CC=clang-15 CXX=clang++-15 cmake ..
-      make -j"$(nproc)"
-      popd
-    }
+    halfbuild
     popd
   }
 }
@@ -396,6 +388,45 @@ step15() {
   }
 }
 
+# commit 705d2a3c2cd94faf8e16c660b3b342d6fe900e55
+# Author: mlugg <mlugg@mlugg.co.uk>
+# Date:   2023-02-17T03:44:08+02:00
+#
+#     Implement new module CLI
+#
+STEP16=705d2a3c2cd94faf8e16c660b3b342d6fe900e55
+STEP16_=0.10.0-1712-g705d2a3c2c
+step16() {
+  rm -fr "../zig-$STEP16"
+  git archive --prefix=zig-$STEP16_/ $STEP16 | tar -C .. -x
+  {
+    pushd "../zig-$STEP16_"
+    cp ../zig-$STEP15_/stage1/zig1.wasm stage1/zig1.wasm
+    patch -p1 <"$HERE/0.10.0-1657-g321ccbdc52-CMakeLists.txt-remove-stage3.patch"
+    halfbuild
+    popd
+  }
+}
+
+# commit 09a84c8384dffc7884528947b879f32d93c1bd90
+# Author: mlugg <mlugg@mlugg.co.uk>
+# Date:   2023-02-17T08:20:52+02:00
+#
+#     Update std.Build to new module CLI, update zig1 and CMakeLists
+#
+STEP17=09a84c8384dffc7884528947b879f32d93c1bd90
+STEP17_=0.10.0-1713-g09a84c8384
+step17() {
+  rm -fr "../zig-$STEP17"
+  git archive --prefix=zig-$STEP17_/ $STEP17 | tar -C .. -x
+  {
+    pushd "../zig-$STEP17_"
+    ../zig-$STEP16_/build/zig2 build --zig-lib-dir lib update-zig1
+    fullbuild
+    popd
+  }
+}
+
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
   set -xeuo pipefail
   step=${1:-step00}
@@ -418,4 +449,6 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
   if [[ "$step" -le 13 ]]; then step13; fi
   if [[ "$step" -le 14 ]]; then step14; fi
   if [[ "$step" -le 15 ]]; then step15; fi
+  if [[ "$step" -le 16 ]]; then step16; fi
+  if [[ "$step" -le 17 ]]; then step17; fi
 fi