Skip to content

Commit 63cd567

Browse files
authored
Separate app-manager and app-framework from WAMR (#3129)
As planned, the app-manager and app-framework are to be migrated to https://github.com/bytecodealliance/wamr-app-framework. ps. #2329 https://github.com/bytecodealliance/wasm-micro-runtime/wiki/TSC-meeting-notes
1 parent b9db23b commit 63cd567

File tree

359 files changed

+45
-37923
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

359 files changed

+45
-37923
lines changed

.github/workflows/build_wamr_sdk.yml

+22-3
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,25 @@ on:
3030
description: download WASI_SDK from this URL
3131
type: string
3232
required: true
33+
wamr_app_framework_url:
34+
description: download WAMR app framework to get wamr_sdk
35+
type: string
36+
required: true
3337

3438
jobs:
3539
build:
3640
runs-on: ${{ inputs.runner }}
3741
steps:
3842
- uses: actions/checkout@v4
3943

44+
- name: download wamr-app-framework
45+
run: |
46+
git clone ${{ inputs.wamr_app_framework_url }}
47+
cd wamr-app-framework
48+
git submodule init
49+
git submodule update
50+
working-directory: wamr-sdk
51+
4052
- name: download and install wasi-sdk
4153
run: |
4254
cd /opt
@@ -48,22 +60,24 @@ jobs:
4860
4961
- name: generate wamr-sdk release
5062
run: |
63+
cd ./wamr-app-framework/wamr-sdk
5164
./build_sdk.sh -n wamr-sdk -x $(pwd)/${{ inputs.config_file }}
5265
working-directory: wamr-sdk
5366

5467
- name: compress the binary
5568
run: |
69+
cd wamr-app-framework/wamr-sdk/out
5670
tar czf wamr-sdk-${{ inputs.ver_num }}-${{ inputs.runner }}.tar.gz wamr-sdk
5771
zip -r wamr-sdk-${{ inputs.ver_num }}-${{ inputs.runner }}.zip wamr-sdk
58-
working-directory: wamr-sdk/out
72+
working-directory: wamr-sdk
5973

6074
- name: upload release tar.gz
6175
uses: actions/upload-release-asset@v1
6276
env:
6377
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6478
with:
6579
upload_url: ${{ inputs.upload_url }}
66-
asset_path: wamr-sdk/out/wamr-sdk-${{ inputs.ver_num }}-${{ inputs.runner }}.tar.gz
80+
asset_path: wamr-sdk/wamr-app-framework/wamr-sdk/out/wamr-sdk-${{ inputs.ver_num }}-${{ inputs.runner }}.tar.gz
6781
asset_name: wamr-sdk-${{ inputs.ver_num }}-${{ inputs.arch }}-${{ inputs.runner }}.tar.gz
6882
asset_content_type: application/x-gzip
6983

@@ -73,6 +87,11 @@ jobs:
7387
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7488
with:
7589
upload_url: ${{ inputs.upload_url }}
76-
asset_path: wamr-sdk/out/wamr-sdk-${{ inputs.ver_num }}-${{ inputs.runner }}.zip
90+
asset_path: wamr-sdk/wamr-app-framework/wamr-sdk/out/wamr-sdk-${{ inputs.ver_num }}-${{ inputs.runner }}.zip
7791
asset_name: wamr-sdk-${{ inputs.ver_num }}-${{ inputs.arch }}-${{ inputs.runner }}.zip
7892
asset_content_type: application/zip
93+
94+
- name: delete wamr-app-framework
95+
run: |
96+
rm -rf wamr-app-framework
97+
working-directory: wamr-sdk

.github/workflows/compilation_on_android_ubuntu.yml

-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ on:
2020
- "!samples/workload/**"
2121
- "tests/wamr-test-suites/**"
2222
- "wamr-compiler/**"
23-
- "wamr-sdk/**"
2423
- "test-tools/wamr-ide/**"
2524
# will be triggered on push events
2625
push:
@@ -38,7 +37,6 @@ on:
3837
- "!samples/workload/**"
3938
- "tests/wamr-test-suites/**"
4039
- "wamr-compiler/**"
41-
- "wamr-sdk/**"
4240
- "test-tools/wamr-ide/**"
4341
# allow to be triggered manually
4442
workflow_dispatch:
@@ -430,13 +428,6 @@ jobs:
430428
cmake --build . --config Debug --parallel 4
431429
./hello
432430
433-
- name: Build Sample [simple]
434-
run: |
435-
./build.sh -p host-interp
436-
python3 ./sample_test_run.py $(pwd)/out
437-
exit $?
438-
working-directory: ./samples/simple
439-
440431
- name: Build Sample [wasi-threads]
441432
run: |
442433
cd samples/wasi-threads

.github/workflows/compilation_on_macos.yml

-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ on:
2020
- "!samples/workload/**"
2121
- "tests/wamr-test-suites/**"
2222
- "wamr-compiler/**"
23-
- "wamr-sdk/**"
2423
# will be triggered on push events
2524
push:
2625
branches:
@@ -37,7 +36,6 @@ on:
3736
- "!samples/workload/**"
3837
- "tests/wamr-test-suites/**"
3938
- "wamr-compiler/**"
40-
- "wamr-sdk/**"
4139
# allow to be triggered manually
4240
workflow_dispatch:
4341

.github/workflows/compilation_on_nuttx.yml

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ on:
1919
- "!samples/workload/**"
2020
- "tests/wamr-test-suites/**"
2121
- "wamr-compiler/**"
22-
- "wamr-sdk/**"
2322
# will be triggered on push events
2423
push:
2524
branches:
@@ -35,7 +34,6 @@ on:
3534
- "!samples/workload/**"
3635
- "tests/wamr-test-suites/**"
3736
- "wamr-compiler/**"
38-
- "wamr-sdk/**"
3937
# allow to be triggered manually
4038
workflow_dispatch:
4139

.github/workflows/compilation_on_sgx.yml

-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ on:
2020
- "!samples/workload/**"
2121
- "tests/wamr-test-suites/**"
2222
- "wamr-compiler/**"
23-
- "wamr-sdk/**"
2423
# will be triggered on push events
2524
push:
2625
branches:
@@ -37,7 +36,6 @@ on:
3736
- "!samples/workload/**"
3837
- "tests/wamr-test-suites/**"
3938
- "wamr-compiler/**"
40-
- "wamr-sdk/**"
4139
# allow to be triggered manually
4240
workflow_dispatch:
4341

.github/workflows/compilation_on_windows.yml

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ on:
1919
- "!samples/workload/**"
2020
- "tests/wamr-test-suites/**"
2121
- "wamr-compiler/**"
22-
- "wamr-sdk/**"
2322
# will be triggered on push events
2423
push:
2524
branches:
@@ -35,7 +34,6 @@ on:
3534
- "!samples/workload/**"
3635
- "tests/wamr-test-suites/**"
3736
- "wamr-compiler/**"
38-
- "wamr-sdk/**"
3937
# allow to be triggered manually
4038
workflow_dispatch:
4139

.github/workflows/nightly_run.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
paths:
1414
- ".github/workflows/nightly_run.yml"
1515
- "core/iwasm/libraries/lib-wasi-threads/stress-test/**"
16-
16+
1717
# midnight UTC
1818
schedule:
1919
- cron: "0 0 * * *"
@@ -489,12 +489,6 @@ jobs:
489489
cmake ..
490490
cmake --build . --config Release --parallel 4
491491
./hello
492-
- name: Build Sample [simple]
493-
run: |
494-
./build.sh -p host-interp
495-
python3 ./sample_test_run.py $(pwd)/out
496-
exit $?
497-
working-directory: ./samples/simple
498492
499493
- name: Build Sample [wasi-threads]
500494
run: |

.github/workflows/release_process.yml

+3
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ jobs:
147147
upload_url: ${{ needs.create_release.outputs.upload_url }}
148148
ver_num: ${{ needs.create_tag.outputs.new_ver}}
149149
wasi_sdk_url: https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-linux.tar.gz
150+
wamr_app_framework_url: https://github.com/bytecodealliance/wamr-app-framework.git
150151

151152
release_wamr_sdk_on_ubuntu_2204:
152153
needs: [create_tag, create_release]
@@ -157,6 +158,7 @@ jobs:
157158
upload_url: ${{ needs.create_release.outputs.upload_url }}
158159
ver_num: ${{ needs.create_tag.outputs.new_ver}}
159160
wasi_sdk_url: https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-linux.tar.gz
161+
wamr_app_framework_url: https://github.com/bytecodealliance/wamr-app-framework.git
160162

161163
release_wamr_sdk_on_macos:
162164
needs: [create_tag, create_release]
@@ -167,6 +169,7 @@ jobs:
167169
upload_url: ${{ needs.create_release.outputs.upload_url }}
168170
ver_num: ${{ needs.create_tag.outputs.new_ver}}
169171
wasi_sdk_url: https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-macos.tar.gz
172+
wamr_app_framework_url: https://github.com/bytecodealliance/wamr-app-framework.git
170173

171174
#
172175
# vscode extension cross-platform

.gitignore

-4
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@
1414

1515
core/deps/**
1616
core/shared/mem-alloc/tlsf
17-
core/app-framework/wgl
1817
core/iwasm/libraries/lib-wasi-threads/test/*.wasm
1918
core/iwasm/libraries/lib-socket/test/*.wasm
2019

21-
wamr-sdk/out/
22-
wamr-sdk/runtime/build_runtime_sdk/
23-
test-tools/host-tool/bin/
2420
product-mini/app-samples/hello-world/test.wasm
2521
product-mini/platforms/linux-sgx/enclave-sample/App/
2622
product-mini/platforms/linux-sgx/enclave-sample/Enclave/

ATTRIBUTIONS.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ WebAssembly Micro Runtime Attributions
22
======================================
33

44
WAMR project reused some components from other open source project:
5-
- **cJson**: used in the host_tool for remotely managing wasm applications
5+
- **cJson**: in the repository [wamr-app-framework](https://github.com/bytecodealliance/wamr-app-framework/), used in the host_tool for remotely managing wasm applications
66
- **contiki-ng**: for the coap protocol implementation
77
- **freebsd libm**: used in core/shared/platform/alios/bh_math.c
8-
- **LVGL**: for the gui samples and wrapped the wasm graphic layer
8+
- **LVGL**: in the repository [wamr-app-framework](https://github.com/bytecodealliance/wamr-app-framework/), for the gui samples and wrapped the wasm graphic layer
99
- **llvm**: for the AOT/JIT compilation
1010
- **wasm-c-api**: to implement the C-APIs of wasm. using headers and sameples
1111
- **wasmtime**: for the wasi libc implementation
@@ -42,7 +42,7 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the
4242

4343
### cJson
4444

45-
[LICENSE](./test-tools/host-tool/external/cJSON/LICENSE)
45+
[LICENSE](https://github.com/bytecodealliance/wamr-app-framework/blob/main/test-tools/host-tool/external/cJSON/LICENSE)
4646

4747
### contiki-ng
4848

@@ -54,17 +54,17 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the
5454

5555
### LVGL
5656

57-
[LICENSE](./samples/littlevgl/LICENCE.txt)
57+
[LICENSE](https://github.com/bytecodealliance/wamr-app-framework/blob/main/samples/littlevgl/LICENCE.txt)
5858

59-
[LICENSE](./core/app-framework/wgl/app/wa-inc/lvgl/LICENCE.txt)
59+
[LICENSE](https://github.com/bytecodealliance/wamr-app-framework/blob/main/app-framework/wgl/app/wa-inc/lvgl/LICENCE.txt)
6060

6161
### llvm
6262

6363
[LICENSE](./core/deps/llvm/llvm/LICENCE.txt)
6464

6565
### wasm-c-api
6666

67-
[LICENSE](./samples/wasm-c-api/src/LICENSE)
67+
[LICENSE](https://github.com/bytecodealliance/wamr-app-framework/blob/main/samples/wasm-c-api/src/LICENSE)
6868

6969
### wasmtime
7070

@@ -76,7 +76,7 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the
7676

7777
### zephyr
7878

79-
[LICENSE](./samples/gui/wasm-runtime-wgl/src/platform/zephyr/LICENSE)
79+
[LICENSE](https://github.com/bytecodealliance/wamr-app-framework/blob/main/samples/gui/wasm-runtime-wgl/src/platform/zephyr/LICENSE)
8080

8181
### wac
8282

README.md

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

2121

assembly-script/.gitignore

-1
This file was deleted.

0 commit comments

Comments
 (0)