From 519e3bc8bf51f9d6dc02b0dc1d19c1163eb6834c Mon Sep 17 00:00:00 2001 From: Andrzej Ressel Date: Sun, 10 Mar 2024 16:50:22 +0100 Subject: [PATCH] Renaming packages --- build.bat | 34 +++++++++++++++++++++++++++++++++- run.sh => build.sh | 0 entrypoint.bat | 2 +- entrypoint.sh | 2 +- run.bat | 33 --------------------------------- 5 files changed, 35 insertions(+), 36 deletions(-) rename run.sh => build.sh (100%) mode change 100755 => 100644 delete mode 100644 run.bat diff --git a/build.bat b/build.bat index 9052edfa3..47610a242 100644 --- a/build.bat +++ b/build.bat @@ -1 +1,33 @@ -echo %* \ No newline at end of file +cargo component build -p wasm_common || exit /b 1 +cargo component build -p pulumi_wasm || exit /b 1 +cargo component build -p pulumi_wasm_provider_random || exit /b 1 +cargo component build -p pulumi_wasm_example_simple || exit /b 1 +cargo build -p pulumi_wasm_runner || exit /b 1 +@REM cargo build -p pulumi_rust_wasm || exit /b +@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi_wasm_example_simple.wasm +@REM +echo F|xcopy /b /v /y ".\target\wasm32-wasi\debug\pulumi_wasm.wasm" ".\target\wasm32-wasi\debug\pulumi-wasm.wasm" || exit /b 1 +echo F|xcopy /b /v /y ".\target\wasm32-wasi\debug\pulumi_wasm_example_simple.wasm" ".\target\wasm32-wasi\debug\pulumi-wasm-example-simple.wasm" || exit /b 1 +echo F|xcopy /b /v /y ".\target\wasm32-wasi\debug\pulumi_wasm_provider_random.wasm" ".\target\wasm32-wasi\debug\pulumi-wasm-provider-random.wasm" || exit /b 1 +@REM +@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-example-simple.wasm +@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-provider-random.wasm +@REM +wasm-tools compose -o target/wasm32-wasi/debug/composed1.wasm target/wasm32-wasi/debug/pulumi-wasm-example-simple.wasm -d target/wasm32-wasi/debug/pulumi-wasm-provider-random.wasm || exit /b 1 +wasm-tools compose -o target/wasm32-wasi/debug/composed2.wasm target/wasm32-wasi/debug/composed1.wasm -d target/wasm32-wasi/debug/pulumi-wasm.wasm || exit /b 1 +@REM cargo run -p pulumi_wasm_runner -- compile --wasm target/wasm32-wasi/debug/composed2.wasm --output target/wasm32-wasi/debug/composed2.cwasm || exit /b 1 +@REM wasmtime compile -D debug-info=y,coredump=y,address-map=y -o target/wasm32-wasi/debug/composed2.cwasm target/wasm32-wasi/debug/composed2.wasm || exit /b 1 +@REM +@REM cargo build -p pulumi_entrypoint || exit /b +@REM +@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-provider-random.wasm +@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-example-simple.wasm +@REM +@REM wasm-tools component wit target/wasm32-wasi/debug/composed1.wasm +@REM wasm-tools component wit target/wasm32-wasi/debug/composed2.wasm +@REM +wasm-tools component wit target/wasm32-wasi/debug/composed2.wasm || exit /b 1 +wasm-tools print target/wasm32-wasi/debug/composed1.wasm > composed1.wat || exit /b 1 +wasm-tools print target/wasm32-wasi/debug/composed2.wasm > composed2.wat || exit /b 1 + +@REM cargo build --target wasm32-wasi \ No newline at end of file diff --git a/run.sh b/build.sh old mode 100755 new mode 100644 similarity index 100% rename from run.sh rename to build.sh diff --git a/entrypoint.bat b/entrypoint.bat index 83e6dcd50..645ab7201 100644 --- a/entrypoint.bat +++ b/entrypoint.bat @@ -4,4 +4,4 @@ @REM cargo run -- run --wasm target/wasm32-wasi/debug/composed2.wasm -.\run.bat && cargo run -p pulumi_wasm_runner -- run --wasm target/wasm32-wasi/debug/composed2.wasm \ No newline at end of file +.\build.bat && cargo run -p pulumi_wasm_runner -- run --wasm target/wasm32-wasi/debug/composed2.wasm \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh index 7a633b089..16eae7331 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -2,6 +2,6 @@ set -e -./run.sh +./build.sh cargo run -p pulumi_wasm_runner -- run --wasm target/wasm32-wasi/debug/composed2.wasm diff --git a/run.bat b/run.bat deleted file mode 100644 index 47610a242..000000000 --- a/run.bat +++ /dev/null @@ -1,33 +0,0 @@ -cargo component build -p wasm_common || exit /b 1 -cargo component build -p pulumi_wasm || exit /b 1 -cargo component build -p pulumi_wasm_provider_random || exit /b 1 -cargo component build -p pulumi_wasm_example_simple || exit /b 1 -cargo build -p pulumi_wasm_runner || exit /b 1 -@REM cargo build -p pulumi_rust_wasm || exit /b -@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi_wasm_example_simple.wasm -@REM -echo F|xcopy /b /v /y ".\target\wasm32-wasi\debug\pulumi_wasm.wasm" ".\target\wasm32-wasi\debug\pulumi-wasm.wasm" || exit /b 1 -echo F|xcopy /b /v /y ".\target\wasm32-wasi\debug\pulumi_wasm_example_simple.wasm" ".\target\wasm32-wasi\debug\pulumi-wasm-example-simple.wasm" || exit /b 1 -echo F|xcopy /b /v /y ".\target\wasm32-wasi\debug\pulumi_wasm_provider_random.wasm" ".\target\wasm32-wasi\debug\pulumi-wasm-provider-random.wasm" || exit /b 1 -@REM -@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-example-simple.wasm -@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-provider-random.wasm -@REM -wasm-tools compose -o target/wasm32-wasi/debug/composed1.wasm target/wasm32-wasi/debug/pulumi-wasm-example-simple.wasm -d target/wasm32-wasi/debug/pulumi-wasm-provider-random.wasm || exit /b 1 -wasm-tools compose -o target/wasm32-wasi/debug/composed2.wasm target/wasm32-wasi/debug/composed1.wasm -d target/wasm32-wasi/debug/pulumi-wasm.wasm || exit /b 1 -@REM cargo run -p pulumi_wasm_runner -- compile --wasm target/wasm32-wasi/debug/composed2.wasm --output target/wasm32-wasi/debug/composed2.cwasm || exit /b 1 -@REM wasmtime compile -D debug-info=y,coredump=y,address-map=y -o target/wasm32-wasi/debug/composed2.cwasm target/wasm32-wasi/debug/composed2.wasm || exit /b 1 -@REM -@REM cargo build -p pulumi_entrypoint || exit /b -@REM -@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-provider-random.wasm -@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-example-simple.wasm -@REM -@REM wasm-tools component wit target/wasm32-wasi/debug/composed1.wasm -@REM wasm-tools component wit target/wasm32-wasi/debug/composed2.wasm -@REM -wasm-tools component wit target/wasm32-wasi/debug/composed2.wasm || exit /b 1 -wasm-tools print target/wasm32-wasi/debug/composed1.wasm > composed1.wat || exit /b 1 -wasm-tools print target/wasm32-wasi/debug/composed2.wasm > composed2.wat || exit /b 1 - -@REM cargo build --target wasm32-wasi \ No newline at end of file