working with a munged-up repo
This commit is contained in:
parent
1179ba1088
commit
0dbd121d15
36
run
36
run
|
|
@ -10,14 +10,16 @@ HERE=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
|
|||
# Merge pull request #13560 from ziglang/wasi-bootstrap
|
||||
#
|
||||
# Nuke the C++ implementation of Zig from orbit using WASI
|
||||
MERGE_WASI_BOOTSTRAP=0.10.0-610-ge7d28344fa
|
||||
MERGE_WASI_BOOTSTRAP=e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
|
||||
#MERGE_WASI_BOOTSTRAP=0.10.0-610-ge7d28344fa
|
||||
|
||||
# commit 3ba916584db5485c38ebf2390e8d22bc6d81bf8e
|
||||
# Author: Andrew Kelley <andrew@ziglang.org>
|
||||
# Date: 2022-11-05T03:47:19+02:00
|
||||
#
|
||||
# actually remove stage1
|
||||
REMOVE_STAGE1=0.10.0-542-g3ba916584d
|
||||
REMOVE_STAGE1=3ba916584db5485c38ebf2390e8d22bc6d81bf8e
|
||||
#REMOVE_STAGE1=0.10.0-542-g3ba916584d
|
||||
|
||||
# commit 28514476ef8c824c3d189d98f23d0f8d23e496ea
|
||||
# Author: Andrew Kelley <andrew@ziglang.org>
|
||||
|
|
@ -27,7 +29,8 @@ REMOVE_STAGE1=0.10.0-542-g3ba916584d
|
|||
#
|
||||
# After this commit, the self-hosted compiler does not offer the option to
|
||||
# use stage1 as a backend anymore.
|
||||
REMOVE_FSTAGE1=0.10.0-539-g28514476ef
|
||||
REMOVE_FSTAGE1=28514476ef8c824c3d189d98f23d0f8d23e496ea
|
||||
#REMOVE_FSTAGE1=0.10.0-539-g28514476ef
|
||||
|
||||
# commit 9d93b2ccf11f584320a2c5209dd2d94705167695
|
||||
# Author: Veikka Tuominen <git@vexu.eu>
|
||||
|
|
@ -36,7 +39,8 @@ REMOVE_FSTAGE1=0.10.0-539-g28514476ef
|
|||
# Eliminate `BoundFn` type from the language
|
||||
#
|
||||
# Closes #9484
|
||||
BOUNDFN=0.10.0-675-g9d93b2ccf1
|
||||
BOUNDFN=9d93b2ccf11f584320a2c5209dd2d94705167695
|
||||
#BOUNDFN=0.10.0-675-g9d93b2ccf1
|
||||
|
||||
# commit d10fd78d4615f329141f5c19f893039d56aff425
|
||||
# Author: Andrew Kelley <andrew@ziglang.org>
|
||||
|
|
@ -50,28 +54,32 @@ BOUNDFN=0.10.0-675-g9d93b2ccf1
|
|||
#
|
||||
# stage1/zig1.wasm | Bin 2315523 -> 2315899 bytes
|
||||
# 1 file changed, 0 insertions(+), 0 deletions(-)
|
||||
C_AARCH64=0.10.0-722-gd10fd78d46
|
||||
C_AARCH64=d10fd78d4615f329141f5c19f893039d56aff425
|
||||
#C_AARCH64=0.10.0-722-gd10fd78d46
|
||||
|
||||
# commit 7b2a936173165002105ba5e76bed69654e132fea
|
||||
# Author: Veikka Tuominen <git@vexu.eu>
|
||||
# Date: 2022-12-12T15:32:37+02:00
|
||||
#
|
||||
# remove `stack` option from `@call`
|
||||
CALL_OPTIONS=0.10.0-747-g7b2a936173-CallOptions.patch
|
||||
CALL_OPTIONS=7b2a936173165002105ba5e76bed69654e132fea
|
||||
#CALL_OPTIONS=0.10.0-747-g7b2a936173
|
||||
|
||||
# commit 08b2d491bcd8c79c68495267cc71967661caea1e
|
||||
# Author: Veikka Tuominen <git@vexu.eu>
|
||||
# Date: 2022-12-12T15:32:37+02:00
|
||||
#
|
||||
# update usages of `@call`
|
||||
CALL_USAGES=0.10.0-748-g08b2d491bc
|
||||
CALL_USAGES=08b2d491bcd8c79c68495267cc71967661caea1e
|
||||
#CALL_USAGES=0.10.0-748-g08b2d491bc
|
||||
|
||||
# commit 2a5e1426aa9469fadb78e837d0100d689213b034
|
||||
# Author: Veikka Tuominen <git@vexu.eu>
|
||||
# Date: 2022-12-16T19:44:25+02:00
|
||||
#
|
||||
# update zig1.wasm to builtin.Type field changes
|
||||
BUILTIN_TYPE=0.10.0-853-g2a5e1426aa
|
||||
BUILTIN_TYPE=2a5e1426aa9469fadb78e837d0100d689213b034
|
||||
#BUILTIN_TYPE=0.10.0-853-g2a5e1426aa
|
||||
|
||||
step00() {
|
||||
git checkout $MERGE_WASI_BOOTSTRAP
|
||||
|
|
@ -82,9 +90,6 @@ step00() {
|
|||
|
||||
git mv stage1/config.zig.in src
|
||||
|
||||
# removing the wasi-based stage1 just to be sure
|
||||
git rm stage1/zig1.wasm.zst
|
||||
|
||||
sed -i '/have_stage1/ s/false/true/' src/config.zig.in
|
||||
|
||||
git checkout $REMOVE_FSTAGE1~1 build.zig CMakeLists.txt
|
||||
|
|
@ -102,7 +107,6 @@ step00() {
|
|||
|
||||
git reset --hard
|
||||
git checkout $MERGE_WASI_BOOTSTRAP
|
||||
rm stage1/zig1.wasm.zst
|
||||
|
||||
build/stage3/bin/zig build update-zig1
|
||||
|
||||
|
|
@ -123,7 +127,7 @@ step00() {
|
|||
step10() {
|
||||
echo "Generating zig1.wasm.zst for $BOUNDFN"
|
||||
rm -fr ../zig-$BOUNDFN
|
||||
git archive --prefix=zig-$BOUNDFN/ $BOUNDFN | tar -C .. -x --exclude="stage1/zig1.wasm*"
|
||||
git archive --prefix=zig-$BOUNDFN/ $BOUNDFN | tar -C .. -x
|
||||
|
||||
{
|
||||
pushd "../zig-$BOUNDFN"
|
||||
|
|
@ -145,7 +149,7 @@ step10() {
|
|||
step20() {
|
||||
echo "Generating zig1.wasm.zst for $C_AARCH64"
|
||||
rm -fr ../zig-$BOUNDFN
|
||||
git archive --prefix=zig-$C_AARCH64/ $C_AARCH64 | tar -C .. -x --exclude="stage1/zig1.wasm*"
|
||||
git archive --prefix=zig-$C_AARCH64/ $C_AARCH64 | tar -C .. -x
|
||||
|
||||
{
|
||||
pushd "../zig-$C_AARCH64"
|
||||
|
|
@ -169,7 +173,7 @@ step30() {
|
|||
|
||||
echo "Updating zig1.wasm from $FROM -> $TO in ../zig-$TO"
|
||||
rm -fr "../zig-$TO"
|
||||
git archive --prefix="zig-$TO/" "$TO" | tar -C .. -x --exclude="stage1/zig1.wasm"
|
||||
git archive --prefix="zig-$TO/" "$TO" | tar -C .. -x
|
||||
|
||||
{
|
||||
pushd "../zig-$TO"
|
||||
|
|
@ -186,7 +190,7 @@ step40() {
|
|||
local FROM="$CALL_OPTIONS"
|
||||
local TO="$CALL_USAGES"
|
||||
rm -fr "../zig-$TO"
|
||||
git archive --prefix=zig-$TO/ "$TO" | tar -C .. -x --exclude="stage1/zig1.wasm*"
|
||||
git archive --prefix=zig-$TO/ "$TO" | tar -C .. -x
|
||||
|
||||
{
|
||||
pushd "../zig-$TO"
|
||||
|
|
|
|||
Loading…
Reference in New Issue