sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

interpreters/wamr: Remove WAMR_VERSION_STUB and always use actual tags

Browse Source 
This allows to use a commit sha1 for CONFIG_INTERPRETERS_WAMR_VERSION.

Note: the existing configs with specific wamr version
need to be updated.

Tested with:
CONFIG_INTERPRETERS_WAMR_VERSION=main
CONFIG_INTERPRETERS_WAMR_VERSION=WAMR-04-15-2021
CONFIG_INTERPRETERS_WAMR_VERSION=3168ba8dcf20d9d8539d75c637420f5fd8682335
This commit is contained in:
YAMAMOTO Takashi 2022-06-01 15:24:54 +09:00 committed by Xiang Xiao
parent a46b144ab1
commit e5c07b9a62
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
interpreters/wamr/Kconfig
View File

@ -11,9 +11,9 @@ if INTERPRETERS_WAMR
config INTERPRETERS_WAMR_VERSION config INTERPRETERS_WAMR_VERSION
string "WAMR Version" string "WAMR Version"
default "04-15-2021" default "WAMR-04-15-2021"
---help--- ---help---
Version 09-29-2020 and later (include main) supported. Version WAMR-09-29-2020 and later (include main) supported.
config INTERPRETERS_IWASM_TASK config INTERPRETERS_IWASM_TASK
bool "Webassembly iwasm task" bool "Webassembly iwasm task"

13
interpreters/wamr/Makefile
View File

@ -23,16 +23,7 @@ include $(APPDIR)/Make.defs
WAMR_VERSION = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETERS_WAMR_VERSION))) WAMR_VERSION = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETERS_WAMR_VERSION)))
WAMR_UNPACK = wamr WAMR_UNPACK = wamr
# Tarball of main branch and tagged release have little difference WAMR_TARBALL = $(WAMR_VERSION).zip
# in name after unpack and URL
ifeq ($(WAMR_VERSION), main)
WAMR_VERSION_STUB =
else
WAMR_VERSION_STUB = WAMR-
endif
WAMR_TARBALL = $(WAMR_VERSION_STUB)$(WAMR_VERSION).zip
WAMR_URL_BASE = https://github.com/bytecodealliance/wasm-micro-runtime/archive/ WAMR_URL_BASE = https://github.com/bytecodealliance/wasm-micro-runtime/archive/
WAMR_URL = $(WAMR_URL_BASE)/$(WAMR_TARBALL) WAMR_URL = $(WAMR_URL_BASE)/$(WAMR_TARBALL)
@ -56,7 +47,7 @@ $(WAMR_TARBALL):
$(WAMR_UNPACK): $(WAMR_TARBALL) $(WAMR_UNPACK): $(WAMR_TARBALL)
$(Q) echo "Unpacking $(WAMR_TARBALL) to $(WAMR_UNPACK)" $(Q) echo "Unpacking $(WAMR_TARBALL) to $(WAMR_UNPACK)"
$(Q) unzip $(WAMR_TARBALL) $(Q) unzip $(WAMR_TARBALL)
$(Q) mv wasm-micro-runtime-$(WAMR_VERSION_STUB)$(WAMR_VERSION) $(WAMR_UNPACK) $(Q) mv wasm-micro-runtime-$(WAMR_VERSION) $(WAMR_UNPACK)
$(Q) touch $(WAMR_UNPACK) $(Q) touch $(WAMR_UNPACK)
context:: $(WAMR_UNPACK) context:: $(WAMR_UNPACK)