christoph/wamr
1
Fork 0
Code Releases Activity

Upgrade WAMR-IDE (#1313)

Browse Source 
Upgrade WAMR-IDE: test-tools/wamr-ide folder
- add `wamr-sdk` to include libc-builtin-sysroot header files
- add `prettier` check and apply script in `package.json`
- update `wasm-toolchain` dockerfile and resource
- enhance `build | run | debug` process to clean up the container
- enhance the change workspace
- enhance `wasm` type project check before building, running and debugging
- format the project_compilation.json
- update documents
This commit is contained in:
Wang Ning
2022-07-29 08:12:36 +08:00
committed by GitHub
parent efc8bc10a9
commit 653b926d53
69 changed files with 1675 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test-tools/wamr-ide/VSCode-Extension/resource/scripts/CMakeLists.txt
View File

@ -7,26 +7,19 @@ project(Main)
include(${CMAKE_CURRENT_SOURCE_DIR}/project.cmake)
set (CMAKE_SYSROOT /opt/wamr-sdk/app/libc-builtin-sysroot)
set (CMAKE_C_FLAGS " -nostdlib -g -Wno-unused-command-line-argument " CACHE INTERNAL "")
set (CMAKE_CXX_FLAGS " -nostdlib -g" CACHE INTERNAL "")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wno-unused-command-line-argument " CACHE INTERNAL "")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -z stack-size=${STACK_SIZE}")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdebug-prefix-map=/mnt='$ENV{PROJ_PATH}'")
set (CMAKE_EXE_LINKER_FLAGS
"-Wl,--initial-memory=${INIT_MEM_SIZE},--max-memory=${MAX_MEM_SIZE}, \
-Wl,--no-entry,")
"${CMAKE_EXE_LINKER_FLAGS} -Wl,--initial-memory=${INIT_MEM_SIZE},--max-memory=${MAX_MEM_SIZE},")
set (CMAKE_EXE_LINKER_FLAGS
"${CMAKE_EXE_LINKER_FLAGS} \
${EXPORTED_SYMBOLS},")
set (CMAKE_EXE_LINKER_FLAGS
"${CMAKE_EXE_LINKER_FLAGS} \
-Wl,--allow-undefined-file=${CMAKE_SYSROOT}/share/defined-symbols.txt" CACHE INTERNAL "")
set (SRC_LIST
${PROJECT_SRC_LIST})
@ -36,5 +29,4 @@ set (HEADER_LIST
include_directories(${HEADER_LIST})
add_executable (${OUTPUT_FILE_NAME} ${SRC_LIST})
add_executable (${OUTPUT_FILE_NAME} ${SRC_LIST})

28
test-tools/wamr-ide/VSCode-Extension/resource/scripts/boot_debugger_server.bat
View File

@ -1,14 +1,14 @@
@REM Copyright (C) 2019 Intel Corporation. All rights reserved.
@REM SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@echo off
set target_name=%1
docker run -it --name=wasm-debug-server-ctr ^
-v "%cd%":/mnt ^
-p 1234:1234 ^
wasm-debug-server:1.0 ^
/bin/bash -c "./debug.sh %target_name%"
@REM stop and remove wasm-debug-server-container
docker stop wasm-debug-server-ctr && docker rm wasm-debug-server-ctr
@REM Copyright (C) 2019 Intel Corporation. All rights reserved.
@REM SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@echo off
docker run -it --name=wasm-debug-server-ctr ^
-v "%cd%":/mnt ^
-p 1234:1234 ^
wasm-debug-server:1.0 ^
/bin/bash -c "./debug.sh %1"
@REM stop and remove wasm-debug-server-container
docker stop wasm-debug-server-ctr>nul 2>nul
docker rm wasm-debug-server-ctr>nul 2>nul

9
test-tools/wamr-ide/VSCode-Extension/resource/scripts/boot_debugger_server.sh Normal file → Executable file
View File

@ -3,12 +3,11 @@
#!/bin/bash
target_name=$1
docker run -it --name=wasm-debug-server-ctr \
-v $(pwd):/mnt \
-v "$(pwd)":/mnt \
-p 1234:1234 \
wasm-debug-server:1.0 \
/bin/bash -c "./debug.sh ${target_name}"
/bin/bash -c "./debug.sh $1"
docker stop wasm-debug-server-ctr && docker rm wasm-debug-server-ctr
docker stop wasm-debug-server-ctr>/dev/null
docker rm wasm-debug-server-ctr>/dev/null

29
test-tools/wamr-ide/VSCode-Extension/resource/scripts/build.bat
View File

@ -1,14 +1,15 @@
@REM Copyright (C) 2019 Intel Corporation. All rights reserved.
@REM SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@echo off
set AoT_Binary_Name=%1
@REM start a container, mount current project path to container/mnt
docker run --name=wasm-toolchain-provider-ctr ^
-it -v %cd%:/mnt ^
wasm-toolchain-provider:1.0 ^
/bin/bash -c "./build_wasm.sh %AoT_Binary_Name%"
@REM stop and remove wasm-toolchain-ctr container
docker stop wasm-toolchain-provider-ctr && docker rm wasm-toolchain-provider-ctr
@REM Copyright (C) 2019 Intel Corporation. All rights reserved.
@REM SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@echo off
@REM start a container, mount current project path to container/mnt
docker run --name=wasm-toolchain-ctr ^
-it -v "%cd%":/mnt ^
--env=PROJ_PATH="%cd%" ^
wasm-toolchain:1.0 ^
/bin/bash -c "./build_wasm.sh %1"
@REM stop and remove wasm-toolchain-ctr container
docker stop wasm-toolchain-ctr>nul 2>nul
docker rm wasm-toolchain-ctr>nul 2>nul

20
test-tools/wamr-ide/VSCode-Extension/resource/scripts/build.sh Normal file → Executable file
View File

@ -3,17 +3,11 @@
#!/bin/bash
AoT_Binary_Name=$1
docker run --name=wasm-toolchain-ctr \
-it -v "$(pwd)":/mnt \
--env=PROJ_PATH="$(pwd)" \
wasm-toolchain:1.0 \
/bin/bash -c "./build_wasm.sh $1"
# start & run docker image and build wasm
if test ! -z "$(docker ps -a | grep wasm-toolchain-ctr)"; then
sudo docker rm wasm-toolchain-ctr
fi
sudo docker run --name=wasm-toolchain-provider-ctr \
-it -v $(pwd):/mnt \
wasm-toolchain-provider:1.0 \
/bin/bash -c "./build_wasm.sh $AoT_Binary_Name"
# stop and remove wasm-toolchain-ctr container
sudo docker stop wasm-toolchain-provider-ctr && sudo docker rm wasm-toolchain-provider-ctr
docker stop wasm-toolchain-ctr>/dev/null
docker rm wasm-toolchain-ctr>/dev/null

38
test-tools/wamr-ide/VSCode-Extension/resource/scripts/destroy.bat Normal file
View File

@ -0,0 +1,38 @@
@REM Copyright (C) 2019 Intel Corporation. All rights reserved.
@REM SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@echo off
call docker --version>nul 2>nul
IF %ERRORLEVEL% GTR 0 (
echo "Docker is not installed, please install docker desktop firstly."
echo
exit /b 1
)
call docker images>nul 2>nul
IF %ERRORLEVEL% GTR 0 (
echo "Docker is not ready, please lanuch docker desktop firstly."
echo
exit /b 2
)
echo "Prepare to clean up the docker containers..."
call docker inspect wasm-toolchain-ctr>nul 2>nul
IF %ERRORLEVEL% EQU 0 (
echo "Stopping and removing wasm-toolchain-ctr container..."
docker stop wasm-toolchain-ctr>nul 2>nul
docker rm wasm-toolchain-ctr>nul 2>nul
echo "Done."
)
call docker inspect wasm-debug-server-ctr>nul 2>nul
IF %ERRORLEVEL% EQU 0 (
echo "Stopping and removing wasm-debug-server-ctr container..."
docker stop wasm-debug-server-ctr>nul 2>nul
docker rm wasm-debug-server-ctr>nul 2>nul
echo "Done."
)
echo "Clean up docker containers successfully."

34
test-tools/wamr-ide/VSCode-Extension/resource/scripts/destroy.sh Executable file
View File

@ -0,0 +1,34 @@
# Copyright (C) 2019 Intel Corporation. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
#!/bin/bash
docker -v>/dev/null
if [ $? -ne 0 ]; then
echo "\nDocker is not installed, please install docker firstly.\n"
exit 1
fi
docker images>/dev/null
if [ $? -ne 0 ]; then
echo "\nDocker service is not running, please start your docker service firstly.\n"
exit 2
fi
echo "Prepare to clean up the docker containers..."
if test ! -z "$(docker ps -a | grep wasm-toolchain-ctr)"; then
echo "Stopping and removing wasm-toolchain-ctr container..."
docker stop wasm-toolchain-ctr>/dev/null
docker rm wasm-toolchain-ctr>/dev/null
echo "Done."
fi
if test ! -z "$(docker ps -a | grep wasm-debug-server-ctr)"; then
echo "Stopping and removing wasm-debug-server-ctr container..."
docker stop wasm-debug-server-ctr>/dev/null
docker rm wasm-debug-server-ctr>/dev/null
echo "Done."
fi
echo "Clean up docker containers successfully."

34
test-tools/wamr-ide/VSCode-Extension/resource/scripts/project.cmake
View File

@ -1,17 +1,17 @@
# Copyright (C) 2019 Intel Corporation. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
set (OUTPUT_FILE_NAME)
set (INIT_MEM_SIZE)
set (MAX_MEM_SIZE)
set (STACK_SIZE)
set (EXPORTED_SYMBOLS)
set (PROJECT_SRC_LIST)
set (PROJECT_INCLUDES)
# Copyright (C) 2019 Intel Corporation. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
set (OUTPUT_FILE_NAME)
set (INIT_MEM_SIZE)
set (MAX_MEM_SIZE)
set (STACK_SIZE)
set (EXPORTED_SYMBOLS)
set (PROJECT_SRC_LIST)
set (PROJECT_INCLUDES)

26
test-tools/wamr-ide/VSCode-Extension/resource/scripts/run.bat
View File

@ -1,13 +1,13 @@
@REM Copyright (C) 2019 Intel Corporation. All rights reserved.
@REM SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@echo off
set target_name=%1
docker run -it --name=wasm-executor-ctr ^
-v "%cd%":/mnt ^
wasm-debug-server:1.0 ^
/bin/bash -c "./run.sh %target_name%"
@REM stop and remove wasm-executor-ctr
docker stop wasm-executor-ctr && docker rm wasm-executor-ctr
@REM Copyright (C) 2019 Intel Corporation. All rights reserved.
@REM SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@echo off
docker run -it --name=wasm-debug-server-ctr ^
-v "%cd%":/mnt ^
wasm-debug-server:1.0 ^
/bin/bash -c "./run.sh %1"
@REM stop and remove wasm-debug-server-ctr
docker stop wasm-debug-server-ctr>nul 2>nul
docker rm wasm-debug-server-ctr>nul 2>nul

8
test-tools/wamr-ide/VSCode-Extension/resource/scripts/run.sh Normal file → Executable file
View File

@ -2,11 +2,11 @@
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
#!/bin/bash
target_name=$1
docker run -it --name=wasm-debug-server-ctr \
-v $(pwd):/mnt \
-v "$(pwd)":/mnt \
wasm-debug-server:1.0 \
/bin/bash -c "./run.sh ${target_name}"
/bin/bash -c "./run.sh $1"
docker stop wasm-debug-server-ctr && docker rm wasm-debug-server-ctr
docker stop wasm-debug-server-ctr>/dev/null
docker rm wasm-debug-server-ctr>/dev/null