From a33a385caaa5e0b3e147cd097bd08216f00dab5c Mon Sep 17 00:00:00 2001 From: Wenyong Huang Date: Tue, 15 Feb 2022 08:41:36 +0800 Subject: [PATCH] Fix littlevgl link error issues (#1006) The littlevgl library had changed its name and domain to [LVGL](https://lvgl.io). See https://blog.lvgl.io/2020-06-01/announcement We change some names and links accordingly. Also remove the cloning for tlsf library as it isn't used now. --- ATTRIBUTIONS.md | 10 +++++----- README.md | 4 ++-- core/deps/download.sh | 12 ++---------- doc/wamr_api.md | 2 +- samples/littlevgl/build.sh | 2 +- .../littlevgl/vgl-native-ui-app/CMakeLists.txt.in | 2 +- samples/simple/build.sh | 4 ---- 7 files changed, 12 insertions(+), 24 deletions(-) diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md index d34c2906..da12a771 100644 --- a/ATTRIBUTIONS.md +++ b/ATTRIBUTIONS.md @@ -5,7 +5,7 @@ WAMR project reused some components from other open source project: - **cJson**: 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 -- **littlevgl**: for the gui samples and wrapped the wasm graphic layer +- **LVGL**: 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 @@ -19,7 +19,7 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the | cjson | 1.7.10 | 1.7.14 | https://github.com/DaveGamble/cJSON | https://www.cvedetails.com/vendor/19164/Cjson-Project.html | | contiki-ng (er-coap) | unspecified | 3.0 | https://github.com/contiki-os/contiki | https://www.cvedetails.com/vendor/16528/Contiki-os.html | | freebsd libm | unspecified | 13.0 | https://www.freebsd.org/ | https://www.cvedetails.com/vendor/6/Freebsd.html | -| littlevgl | 6.0.1 | 7.11.0 | https://lvgl.io/ | | +| LVGL | 6.0.1 | 7.11.0 | https://lvgl.io/ | | | llvm | 11.0.1 | 12.0.0 | https://llvm.org | https://www.cvedetails.com/vendor/13260/Llvm.html | | wasm-c-api | ac9b509f4df86e40e56e9b01f3f49afab0100037 | c9d31284651b975f05ac27cee0bab1377560b87e | https://github.com/WebAssembly/wasm-c-api | | | wasmtime | unspecified | v0.26.0 | https://github.com/bytecodealliance/wasmtime | | @@ -40,11 +40,11 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the [COPYRIGHT](./core/shared/platform/common/math/COPYRIGHT) -### littlevgl +### LVGL -[LICENCE](./samples/littlevgl/LICENCE.txt) +[LICENSE](./samples/littlevgl/LICENCE.txt) -[LICENSE](./core/deps/lvgl/LICENCE.txt) +[LICENSE](./core/app-framework/wgl/app/wa-inc/lvgl/LICENCE.txt) ### llvm diff --git a/README.md b/README.md index 49f76ba1..1465271b 100644 --- a/README.md +++ b/README.md @@ -146,8 +146,8 @@ The WAMR [samples](./samples) integrate the iwasm VM core, application manager a - [**basic**](./samples/basic): Demonstrating how to use runtime exposed API's to call WASM functions, how to register native functions and call them, and how to call WASM function from native function. - **[simple](./samples/simple/README.md)**: The runtime is integrated with most of the WAMR APP libraries, and a few WASM applications are provided for testing the WAMR APP API set. It uses **built-in libc** and executes apps in **interpreter** mode by default. -- **[littlevgl](./samples/littlevgl/README.md)**: Demonstrating the graphic user interface application usage on WAMR. The whole [LittleVGL](https://github.com/lvgl/) 2D user graphic library and the UI application are built into WASM application. It uses **WASI libc** and executes apps in **AOT mode** by default. -- **[gui](./samples/gui/README.md)**: Move the [LittleVGL](https://github.com/lvgl/) library into the runtime and define a WASM application interface by wrapping the littlevgl API. It uses **WASI libc** and executes apps in **interpreter** mode by default. +- **[littlevgl](./samples/littlevgl/README.md)**: Demonstrating the graphic user interface application usage on WAMR. The whole [LVGL](https://github.com/lvgl/lvgl) 2D user graphic library and the UI application are built into WASM application. It uses **WASI libc** and executes apps in **AOT mode** by default. +- **[gui](./samples/gui/README.md)**: Move the [LVGL](https://github.com/lvgl/lvgl) library into the runtime and define a WASM application interface by wrapping the littlevgl API. It uses **WASI libc** and executes apps in **interpreter** mode by default. - **[multi-thread](./samples/multi-thread/)**: Demonstrating how to run wasm application which creates multiple threads to execute wasm functions concurrently, and uses mutex/cond by calling pthread related API's. - **[spawn-thread](./samples/spawn-thread)**: Demonstrating how to execute wasm functions of the same wasm application concurrently, in threads created by host embedder or runtime, but not the wasm application itself. - **[multi-module](./samples/multi-module)**: Demonstrating the [multiple modules as dependencies](./doc/multi_module.md) feature which implements the [load-time dynamic linking](https://webassembly.org/docs/dynamic-linking/). diff --git a/core/deps/download.sh b/core/deps/download.sh index c7e40de8..46b30d7e 100755 --- a/core/deps/download.sh +++ b/core/deps/download.sh @@ -6,23 +6,15 @@ cd ${DEPS_ROOT} if [ ! -d "lvgl" ]; then echo "git pull lvgl..." - git clone https://github.com/littlevgl/lvgl.git --branch v6.0.1 + git clone https://github.com/lvgl/lvgl.git --branch v6.0.1 [ $? -eq 0 ] || exit $? ../app-framework/wgl/app/prepare_headers.sh fi if [ ! -d "lv_drivers" ]; then echo "git pull lv_drivers..." - git clone https://github.com/littlevgl/lv_drivers.git --branch v6.0.1 + git clone https://github.com/lvgl/lv_drivers.git --branch v6.0.1 [ $? -eq 0 ] || exit $? fi -if [ ! -d "tlsf" ]; then - echo "git pull tlsf..." - git clone https://github.com/mattconte/tlsf - [ $? -eq 0 ] || exit $? - #cd ${WAMR_DIR}/core/shared/mem-alloc -fi - - exit 0 diff --git a/doc/wamr_api.md b/doc/wamr_api.md index 88a847c9..5790fd13 100644 --- a/doc/wamr_api.md +++ b/doc/wamr_api.md @@ -283,7 +283,7 @@ void on_destroy() ## GUI API -The API's is listed in header file ```core/app-framework/wgl/app/wa-inc/wgl.h``` which is implemented based on open source 2D graphic library [LittlevGL](https://docs.littlevgl.com/en/html/index.html). +The API's is listed in header file ```core/app-framework/wgl/app/wa-inc/wgl.h``` which is implemented based on open source 2D graphic library [LVGL](https://docs.lvgl.io/master/index.html). ``` C static void btn_event_cb(wgl_obj_t btn, wgl_event_t event); diff --git a/samples/littlevgl/build.sh b/samples/littlevgl/build.sh index 64e8f927..81f2e67f 100755 --- a/samples/littlevgl/build.sh +++ b/samples/littlevgl/build.sh @@ -34,7 +34,7 @@ mkdir ${OUT_DIR} cd ${BUILD_DIR} if [ ! -d "lvgl" ]; then echo "starting download lvgl for v5.3 ..." - git clone https://github.com/littlevgl/lvgl.git --branch v5.3 + git clone https://github.com/lvgl/lvgl.git --branch v5.3 if [ $? != 0 ];then echo "download lvgl repo failed: $?\n" exit 2 diff --git a/samples/littlevgl/vgl-native-ui-app/CMakeLists.txt.in b/samples/littlevgl/vgl-native-ui-app/CMakeLists.txt.in index 7cc57c38..25f4db95 100644 --- a/samples/littlevgl/vgl-native-ui-app/CMakeLists.txt.in +++ b/samples/littlevgl/vgl-native-ui-app/CMakeLists.txt.in @@ -7,7 +7,7 @@ project(lvgl_download NONE) include(ExternalProject) ExternalProject_Add(${lv_name} - GIT_REPOSITORY https://github.com/littlevgl/lvgl.git + GIT_REPOSITORY https://github.com/lvgl/lvgl.git GIT_TAG v5.3 BINARY_DIR "" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/../build/lvgl" diff --git a/samples/simple/build.sh b/samples/simple/build.sh index e95092d2..aab9997e 100755 --- a/samples/simple/build.sh +++ b/samples/simple/build.sh @@ -95,10 +95,6 @@ mkdir ${OUT_DIR} mkdir ${OUT_DIR}/wasm-apps cd ${WAMR_DIR}/core/shared/mem-alloc -if [ ! -d "tlsf" ]; then - git clone https://github.com/mattconte/tlsf -fi - PROFILE="simple-$PROFILE"