Add Support to other scripts

Signed-off-by: James Sturtevant <[email protected]>

Author: jsturtevant

src/hyperlight_wasm/scripts/build-wasm-examples.sh

@@ -12,7 +12,7 @@ OUTPUT_DIR=$(realpath $OUTPUT_DIR)
 
 if [ -f "/.dockerenv" ] || grep -q docker /proc/1/cgroup; then
     # running in a container so use the installed wasi-sdk as the devcontainer has this installed  
-    for FILENAME in $(find . -name '*.c')
+    for FILENAME in $(find . -name '*.c' -not -path './components/*')
     do
         echo Building ${FILENAME}
         # Build the wasm file with wasi-libc for wasmtime
@@ -23,6 +23,29 @@ if [ -f "/.dockerenv" ] || grep -q docker /proc/1/cgroup; then
         cargo run -p hyperlight-wasm-aot compile ${OUTPUT_DIR}/${FILENAME%.*}-wasi-libc.wasm ${OUTPUT_DIR}/${FILENAME%.*}.aot
         cp ${OUTPUT_DIR}/${FILENAME%.*}.aot ${OUTPUT_DIR}/${FILENAME%.*}.wasm
     done
+
+    for WIT_FILE in ${PWD}/components/*.wit; do
+        COMPONENT_NAME=$(basename ${WIT_FILE} .wit)
+        echo Building component: ${COMPONENT_NAME}
+
+        # Generate bindings for the component
+        wit-bindgen c ${WIT_FILE} --out-dir ${PWD}/components/bindings
+
+        # Build the wasm file with wasi-libc for wasmtime
+        /opt/wasi-sdk/bin/wasm32-wasip2-clang \
+            -ffunction-sections -mexec-model=reactor -O3 -z stack-size=4096 \
+            -Wl,--initial-memory=65536 -Wl,--export=__data_end -Wl,--export=__heap_base,--export=malloc,--export=free,--export=__wasm_call_ctors \
+            -Wl,--strip-all,--no-entry -Wl,--allow-undefined -Wl,--gc-sections \
+            -o ${OUTPUT_DIR}/${COMPONENT_NAME}-p2.wasm \
+            ${PWD}/components/${COMPONENT_NAME}.c \
+            ${PWD}/components/bindings/${COMPONENT_NAME}.c \
+            ${PWD}/components/bindings/${COMPONENT_NAME}_component_type.o
+
+        # Build AOT for Wasmtime
+        cargo run -p hyperlight-wasm-aot compile --component ${OUTPUT_DIR}/${COMPONENT_NAME}-p2.wasm ${OUTPUT_DIR}/${COMPONENT_NAME}.aot
+        cp ${OUTPUT_DIR}/${COMPONENT_NAME}.aot ${OUTPUT_DIR}/${COMPONENT_NAME}.wasm
+    done
+
 else 
     # not running in a container so use the docker image to build the wasm files
     echo Building docker image that has Wasm sdk. Should be quick if preivoulsy built and no changes to dockerfile.

src/wasmsamples/compile-wasm.bat

@@ -31,6 +31,22 @@ for /R "%1" %%i in (*.c) do (
     copy  %2\%%~ni.aot  %2\%%~ni.wasm
 )
 
+echo Building components
+for %%j in (%~1\components\*.wit) do (
+    set "COMPONENT_NAME=%%~nj"
+    echo Building component: !COMPONENT_NAME!
+
+    rem Generate bindings for the component
+    wit-bindgen c %%j --out-dir %~1\components\bindings
+
+    rem Build the wasm file with wasi-libc for wasmtime
+    %dockercmd% run --rm -i -v !dockerinput!:/tmp/host1 -v !dockeroutput!:/tmp/host2 wasm-clang-builder /opt/wasi-sdk/bin/wasm32-wasip2-clang -ffunction-sections -mexec-model=reactor -O3 -z stack-size=4096 -Wl,--initial-memory=65536 -Wl,--export=__data_end -Wl,--export=__heap_base,--export=malloc,--export=free,--export=__wasm_call_ctors -Wl,--strip-all,--no-entry -Wl,--allow-undefined -Wl,--gc-sections -o /tmp/host2/!COMPONENT_NAME!-p2.wasm /tmp/host1/components/!COMPONENT_NAME!.c /tmp/host1/components/bindings/!COMPONENT_NAME!.c /tmp/host1/components/bindings/!COMPONENT_NAME!_component_type.o
+
+    rem Build AOT for Wasmtime
+    cargo run -p hyperlight-wasm-aot compile --component %2\!COMPONENT_NAME!-p2.wasm %2\!COMPONENT_NAME!.aot
+    copy %2\!COMPONENT_NAME!.aot %2\!COMPONENT_NAME!.wasm
+)
+
 goto :EOF
 :Error
 echo Usage - compile-wasm ^<source directory^> ^<output directory^>