diff --git a/run b/run index c9748ac..d2713bf 100755 --- a/run +++ b/run @@ -73,13 +73,21 @@ CALL_OPTIONS_=0.10.0-747-g7b2a936173 CALL_USAGES=08b2d491bcd8c79c68495267cc71967661caea1e CALL_USAGES_=0.10.0-748-g08b2d491bc +# commit 35184bff75420f405cb703c9cf86b196843b9a94 (HEAD) +# Author: r00ster91 +# Date: 2022-12-13T23:30:06+02:00 +# +# std.builtin: rename Type.UnionField and Type.StructField's field_type to type +BUILTIN_TYPE=aac2d6b56f32134ea32fb3d984e3fcdfddd8aaf6 +BUILTIN_TYPE_=0.10.0-851-gaac2d6b56f + # commit 2a5e1426aa9469fadb78e837d0100d689213b034 # Author: Veikka Tuominen # Date: 2022-12-16T19:44:25+02:00 # # update zig1.wasm to builtin.Type field changes -BUILTIN_TYPE=2a5e1426aa9469fadb78e837d0100d689213b034 -BUILTIN_TYPE_=0.10.0-853-g2a5e1426aa +REMOVE_BUILTIN_TYPE=2a5e1426aa9469fadb78e837d0100d689213b034 +REMOVE_BUILTIN_TYPE_=0.10.0-853-g2a5e1426aa fullbuild() { rm -fr build @@ -209,7 +217,22 @@ step50() { pushd "../zig-$TO_" cp ../zig-$FROM_/stage1/zig1.wasm stage1/zig1.wasm fullbuild - build/stage3/bin/zig build update-zig1 + popd + } +} + +step60() { + local FROM="$BUILTIN_TYPE" + local FROM_="$BUILTIN_TYPE_" + local TO="$REMOVE_BUILTIN_TYPE" + local TO_="$REMOVE_BUILTIN_TYPE_" + + echo "Updating zig1.wasm from $FROM_ -> $TO_ in ../zig-$TO_" + rm -fr "../zig-$TO_" + git archive --prefix=zig-$TO_/ $TO | tar -C .. -x + { + pushd "../zig-$TO_" + "../zig-$FROM_/build/stage3/bin/zig" build --zig-lib-dir lib update-zig1 popd } echo "zig1.wasm updated for $TO_" @@ -226,7 +249,6 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then if [[ "$step" -le 20 ]] ; then step20; fi if [[ "$step" -le 30 ]] ; then step30; fi if [[ "$step" -le 40 ]] ; then step40; fi - - # does not work: if [[ "$step" -le 50 ]] ; then step50; fi + if [[ "$step" -le 60 ]] ; then step60; fi fi