Separate app-manager and app-framework from WAMR (bytecodealliance#3129)

As planned, the app-manager and app-framework are to be migrated to https://github.com/bytecodealliance/wamr-app-framework. ps. bytecodealliance#2329 https://github.com/bytecodealliance/wasm-micro-runtime/wiki/TSC-meeting-notes
dylibso · Feb 20, 2024 · 63cd567 · 63cd567
1 parent b9db23b
commit 63cd567
Show file tree

Hide file tree

Showing 359 changed files with 45 additions and 37,923 deletions.
diff --git a/.github/workflows/build_wamr_sdk.yml b/.github/workflows/build_wamr_sdk.yml
@@ -30,13 +30,25 @@ on:
         description: download WASI_SDK from this URL
         type: string
         required: true
+      wamr_app_framework_url:
+        description: download WAMR app framework to get wamr_sdk
+        type: string
+        required: true
 
 jobs:
   build:
     runs-on: ${{ inputs.runner }}
     steps:
       - uses: actions/checkout@v4
 
+      - name: download wamr-app-framework
+        run: |
+          git clone ${{ inputs.wamr_app_framework_url }}
+          cd wamr-app-framework
+          git submodule init
+          git submodule update 
+        working-directory: wamr-sdk
+
       - name: download and install wasi-sdk
         run: |
           cd /opt
@@ -48,22 +60,24 @@ jobs:
 
       - name: generate wamr-sdk release
         run: |
+          cd ./wamr-app-framework/wamr-sdk
           ./build_sdk.sh -n wamr-sdk -x $(pwd)/${{ inputs.config_file }}
         working-directory: wamr-sdk
 
       - name: compress the binary
         run: |
+          cd wamr-app-framework/wamr-sdk/out
           tar czf wamr-sdk-${{ inputs.ver_num }}-${{ inputs.runner }}.tar.gz wamr-sdk
           zip -r wamr-sdk-${{ inputs.ver_num }}-${{ inputs.runner }}.zip wamr-sdk
-        working-directory: wamr-sdk/out
+        working-directory: wamr-sdk
 
       - name: upload release tar.gz
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ inputs.upload_url }}
-          asset_path: wamr-sdk/out/wamr-sdk-${{ inputs.ver_num }}-${{ inputs.runner }}.tar.gz
+          asset_path: wamr-sdk/wamr-app-framework/wamr-sdk/out/wamr-sdk-${{ inputs.ver_num }}-${{ inputs.runner }}.tar.gz
           asset_name: wamr-sdk-${{ inputs.ver_num }}-${{ inputs.arch }}-${{ inputs.runner }}.tar.gz
           asset_content_type: application/x-gzip
 
@@ -73,6 +87,11 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ inputs.upload_url }}
-          asset_path: wamr-sdk/out/wamr-sdk-${{ inputs.ver_num }}-${{ inputs.runner }}.zip
+          asset_path: wamr-sdk/wamr-app-framework/wamr-sdk/out/wamr-sdk-${{ inputs.ver_num }}-${{ inputs.runner }}.zip
           asset_name: wamr-sdk-${{ inputs.ver_num }}-${{ inputs.arch }}-${{ inputs.runner }}.zip
           asset_content_type: application/zip
+
+      - name: delete wamr-app-framework
+        run: |
+          rm -rf wamr-app-framework
+        working-directory: wamr-sdk
diff --git a/.github/workflows/compilation_on_android_ubuntu.yml b/.github/workflows/compilation_on_android_ubuntu.yml
@@ -20,7 +20,6 @@ on:
       - "!samples/workload/**"
       - "tests/wamr-test-suites/**"
       - "wamr-compiler/**"
-      - "wamr-sdk/**"
       - "test-tools/wamr-ide/**"
   # will be triggered on push events
   push:
@@ -38,7 +37,6 @@ on:
       - "!samples/workload/**"
       - "tests/wamr-test-suites/**"
       - "wamr-compiler/**"
-      - "wamr-sdk/**"
       - "test-tools/wamr-ide/**"
   # allow to be triggered manually
   workflow_dispatch:
@@ -430,13 +428,6 @@ jobs:
           cmake --build . --config Debug --parallel 4
           ./hello
 
-      - name: Build Sample [simple]
-        run: |
-          ./build.sh -p host-interp
-          python3 ./sample_test_run.py $(pwd)/out
-          exit $?
-        working-directory: ./samples/simple
-
       - name: Build Sample [wasi-threads]
         run: |
           cd samples/wasi-threads

diff --git a/.github/workflows/compilation_on_macos.yml b/.github/workflows/compilation_on_macos.yml
@@ -20,7 +20,6 @@ on:
       - "!samples/workload/**"
       - "tests/wamr-test-suites/**"
       - "wamr-compiler/**"
-      - "wamr-sdk/**"
   # will be triggered on push events
   push:
     branches:
@@ -37,7 +36,6 @@ on:
       - "!samples/workload/**"
       - "tests/wamr-test-suites/**"
       - "wamr-compiler/**"
-      - "wamr-sdk/**"
   # allow to be triggered manually
   workflow_dispatch:
 

diff --git a/.github/workflows/compilation_on_nuttx.yml b/.github/workflows/compilation_on_nuttx.yml
@@ -19,7 +19,6 @@ on:
       - "!samples/workload/**"
       - "tests/wamr-test-suites/**"
       - "wamr-compiler/**"
-      - "wamr-sdk/**"
   # will be triggered on push events
   push:
     branches:
@@ -35,7 +34,6 @@ on:
       - "!samples/workload/**"
       - "tests/wamr-test-suites/**"
       - "wamr-compiler/**"
-      - "wamr-sdk/**"
   # allow to be triggered manually
   workflow_dispatch:
 

diff --git a/.github/workflows/compilation_on_sgx.yml b/.github/workflows/compilation_on_sgx.yml
@@ -20,7 +20,6 @@ on:
       - "!samples/workload/**"
       - "tests/wamr-test-suites/**"
       - "wamr-compiler/**"
-      - "wamr-sdk/**"
   # will be triggered on push events
   push:
     branches:
@@ -37,7 +36,6 @@ on:
       - "!samples/workload/**"
       - "tests/wamr-test-suites/**"
       - "wamr-compiler/**"
-      - "wamr-sdk/**"
   # allow to be triggered manually
   workflow_dispatch:
 

diff --git a/.github/workflows/compilation_on_windows.yml b/.github/workflows/compilation_on_windows.yml
@@ -19,7 +19,6 @@ on:
       - "!samples/workload/**"
       - "tests/wamr-test-suites/**"
       - "wamr-compiler/**"
-      - "wamr-sdk/**"
   # will be triggered on push events
   push:
     branches:
@@ -35,7 +34,6 @@ on:
       - "!samples/workload/**"
       - "tests/wamr-test-suites/**"
       - "wamr-compiler/**"
-      - "wamr-sdk/**"
   # allow to be triggered manually
   workflow_dispatch:
 

diff --git a/.github/workflows/nightly_run.yml b/.github/workflows/nightly_run.yml
@@ -13,7 +13,7 @@ on:
     paths:
       - ".github/workflows/nightly_run.yml"
       - "core/iwasm/libraries/lib-wasi-threads/stress-test/**"
-      
+
   # midnight UTC
   schedule:
     - cron: "0 0 * * *"
@@ -489,12 +489,6 @@ jobs:
           cmake ..
           cmake --build . --config Release --parallel 4
           ./hello
-      - name: Build Sample [simple]
-        run: |
-          ./build.sh -p host-interp
-          python3 ./sample_test_run.py $(pwd)/out
-          exit $?
-        working-directory: ./samples/simple
 
       - name: Build Sample [wasi-threads]
         run: |

diff --git a/.github/workflows/release_process.yml b/.github/workflows/release_process.yml
@@ -147,6 +147,7 @@ jobs:
       upload_url: ${{ needs.create_release.outputs.upload_url }}
       ver_num: ${{ needs.create_tag.outputs.new_ver}}
       wasi_sdk_url: https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-linux.tar.gz
+      wamr_app_framework_url: https://github.com/bytecodealliance/wamr-app-framework.git
 
   release_wamr_sdk_on_ubuntu_2204:
     needs: [create_tag, create_release]
@@ -157,6 +158,7 @@ jobs:
       upload_url: ${{ needs.create_release.outputs.upload_url }}
       ver_num: ${{ needs.create_tag.outputs.new_ver}}
       wasi_sdk_url: https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-linux.tar.gz
+      wamr_app_framework_url: https://github.com/bytecodealliance/wamr-app-framework.git
 
   release_wamr_sdk_on_macos:
     needs: [create_tag, create_release]
@@ -167,6 +169,7 @@ jobs:
       upload_url: ${{ needs.create_release.outputs.upload_url }}
       ver_num: ${{ needs.create_tag.outputs.new_ver}}
       wasi_sdk_url: https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-macos.tar.gz
+      wamr_app_framework_url: https://github.com/bytecodealliance/wamr-app-framework.git
 
   #
   # vscode extension cross-platform

diff --git a/.gitignore b/.gitignore
@@ -14,13 +14,9 @@
 
 core/deps/**
 core/shared/mem-alloc/tlsf
-core/app-framework/wgl
 core/iwasm/libraries/lib-wasi-threads/test/*.wasm
 core/iwasm/libraries/lib-socket/test/*.wasm
 
-wamr-sdk/out/
-wamr-sdk/runtime/build_runtime_sdk/
-test-tools/host-tool/bin/
 product-mini/app-samples/hello-world/test.wasm
 product-mini/platforms/linux-sgx/enclave-sample/App/
 product-mini/platforms/linux-sgx/enclave-sample/Enclave/

diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md
@@ -2,10 +2,10 @@ WebAssembly Micro Runtime Attributions
 ======================================
 
 WAMR project reused some components from other open source project:
-- **cJson**: used in the host_tool for remotely managing wasm applications
+- **cJson**: in the repository [wamr-app-framework](https://github.com/bytecodealliance/wamr-app-framework/), used in the host_tool for remotely managing wasm applications
 - **contiki-ng**: for the coap protocol implementation
 - **freebsd libm**: used in core/shared/platform/alios/bh_math.c
-- **LVGL**: for the gui samples and wrapped the wasm graphic layer
+- **LVGL**: in the repository [wamr-app-framework](https://github.com/bytecodealliance/wamr-app-framework/), for the gui samples and wrapped the wasm graphic layer
 - **llvm**: for the AOT/JIT compilation
 - **wasm-c-api**: to implement the C-APIs of wasm. using headers and sameples
 - **wasmtime**: for the wasi libc implementation
@@ -42,7 +42,7 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the
 
 ### cJson
 
-[LICENSE](./test-tools/host-tool/external/cJSON/LICENSE)
+[LICENSE](https://github.com/bytecodealliance/wamr-app-framework/blob/main/test-tools/host-tool/external/cJSON/LICENSE)
 
 ### contiki-ng
 
@@ -54,17 +54,17 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the
 
 ### LVGL
 
-[LICENSE](./samples/littlevgl/LICENCE.txt)
+[LICENSE](https://github.com/bytecodealliance/wamr-app-framework/blob/main/samples/littlevgl/LICENCE.txt)
 
-[LICENSE](./core/app-framework/wgl/app/wa-inc/lvgl/LICENCE.txt)
+[LICENSE](https://github.com/bytecodealliance/wamr-app-framework/blob/main/app-framework/wgl/app/wa-inc/lvgl/LICENCE.txt)
 
 ### llvm
 
 [LICENSE](./core/deps/llvm/llvm/LICENCE.txt)
 
 ### wasm-c-api
 
-[LICENSE](./samples/wasm-c-api/src/LICENSE)
+[LICENSE](https://github.com/bytecodealliance/wamr-app-framework/blob/main/samples/wasm-c-api/src/LICENSE)
 
 ### wasmtime
 
@@ -76,7 +76,7 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the
 
 ### zephyr
 
-[LICENSE](./samples/gui/wasm-runtime-wgl/src/platform/zephyr/LICENSE)
+[LICENSE](https://github.com/bytecodealliance/wamr-app-framework/blob/main/samples/gui/wasm-runtime-wgl/src/platform/zephyr/LICENSE)
 
 ### wac
 

diff --git a/README.md b/README.md
@@ -14,8 +14,8 @@ WebAssembly Micro Runtime (WAMR) is a lightweight standalone WebAssembly (Wasm)
 - [**iwasm**](./product-mini/): The executable binary built with WAMR VMcore supports WASI and command line interface.
 - [**wamrc**](./wamr-compiler/): The AOT compiler to compile Wasm file into AOT file
 - Useful components and tools for building real solutions with WAMR vmcore:
-  - [App-framework](./core/app-framework/README.md): A framework for supporting APIs for the Wasm applications
-  - [App-manager](./core/app-mgr/README.md): a framework for dynamical loading the Wasm module remotely
+  - [App-framework](https://github.com/bytecodealliance/wamr-app-framework/blob/main/app-framework/README.md): A framework for supporting APIs for the Wasm applications
+  - [App-manager](https://github.com/bytecodealliance/wamr-app-framework/blob/main/app-mgr/README.md): a framework for dynamical loading the Wasm module remotely
   - [WAMR-IDE](./test-tools/wamr-ide): An experimental VSCode extension for developping WebAssembly applications with C/C++
 
 

diff --git a/assembly-script/.gitignore b/assembly-script/.gitignore