mirror of
https://github.com/apache/nuttx-apps.git
synced 2026-08-01 20:29:00 +00:00
!interpreters/python: Align naming of configuration options
Aligns `CONFIG_INTERPRETER_*` options to `CONFIG_INTERPRETERS_*` options to be consistent with other interpreters. BREAKING CHANGE: All configurations using `CONFIG_INTERPRETER_PYTHON_*` options will no longer compile due to missing symbol errors. The fix is very quick: any configurations using this options should add a trailing S following INTERPRETER in the affected Kconfig variables. I believe `./tools/refresh.sh` should also be capable of doing this automatically. Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
This commit is contained in:
parent
a604c46b00
commit
3ce356378d
3 changed files with 13 additions and 13 deletions
|
|
@ -3,7 +3,7 @@
|
|||
# see the file kconfig-language.txt in the NuttX tools repository.
|
||||
#
|
||||
|
||||
config INTERPRETER_CPYTHON
|
||||
config INTERPRETERS_CPYTHON
|
||||
tristate "CPython"
|
||||
depends on LIB_ZLIB
|
||||
depends on EXPERIMENTAL
|
||||
|
|
@ -13,25 +13,25 @@ config INTERPRETER_CPYTHON
|
|||
interpreter to NuttX. Initially, it is tweaked to work with the
|
||||
RISC-V QEMU virtual board (`rv-virt`).
|
||||
|
||||
if INTERPRETER_CPYTHON
|
||||
if INTERPRETERS_CPYTHON
|
||||
|
||||
config INTERPRETER_CPYTHON_VERSION
|
||||
config INTERPRETERS_CPYTHON_VERSION
|
||||
string "Python Version"
|
||||
default "3.13.0"
|
||||
|
||||
config INTERPRETER_CPYTHON_STACKSIZE
|
||||
config INTERPRETERS_CPYTHON_STACKSIZE
|
||||
int "CPython stack size"
|
||||
default 307200
|
||||
---help---
|
||||
This is the stack size allocated when the CPython task runs.
|
||||
|
||||
config INTERPRETER_CPYTHON_PRIORITY
|
||||
config INTERPRETERS_CPYTHON_PRIORITY
|
||||
int "CPython task priority"
|
||||
default 100
|
||||
---help---
|
||||
This is the priority of the CPython task.
|
||||
|
||||
config INTERPRETER_CPYTHON_PROGNAME
|
||||
config INTERPRETERS_CPYTHON_PROGNAME
|
||||
string "CPython name"
|
||||
default "python"
|
||||
---help---
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@
|
|||
#
|
||||
############################################################################
|
||||
|
||||
ifneq ($(CONFIG_INTERPRETER_CPYTHON),)
|
||||
ifneq ($(CONFIG_INTERPRETERS_CPYTHON),)
|
||||
|
||||
CPYTHON_VERSION = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETER_CPYTHON_VERSION)))
|
||||
CPYTHON_VERSION = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETERS_CPYTHON_VERSION)))
|
||||
CPYTHON_VERSION_MINOR=$(basename $(CPYTHON_VERSION))
|
||||
|
||||
EXTRA_LIBPATHS += -L$(APPDIR)/interpreters/python/install/target
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
include $(APPDIR)/Make.defs
|
||||
|
||||
CPYTHON_URL ?= "https://github.com/python/cpython/archive"
|
||||
CPYTHON_VERSION = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETER_CPYTHON_VERSION)))
|
||||
CPYTHON_VERSION = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETERS_CPYTHON_VERSION)))
|
||||
CPYTHON_VERSION_MINOR=$(basename $(CPYTHON_VERSION))
|
||||
CPYTHON_ZIP = v$(CPYTHON_VERSION).zip
|
||||
|
||||
|
|
@ -171,11 +171,11 @@ $(TARGETLIBPYTHON): $(TARGETBUILD)/Makefile
|
|||
$(Q) ( cp $(TARGETBUILD)/libpython$(CPYTHON_VERSION_MINOR).a $(TARGETLIBPYTHON) )
|
||||
$(Q) $(UNPACK) $(TARGETMODULESPACK) -d $(TARGETMODULES)/python$(CPYTHON_VERSION_MINOR)
|
||||
|
||||
MODULE = $(CONFIG_INTERPRETER_CPYTHON)
|
||||
MODULE = $(CONFIG_INTERPRETERS_CPYTHON)
|
||||
|
||||
PROGNAME += $(CONFIG_INTERPRETER_CPYTHON_PROGNAME)
|
||||
PRIORITY += $(CONFIG_INTERPRETER_CPYTHON_PRIORITY)
|
||||
STACKSIZE += $(CONFIG_INTERPRETER_CPYTHON_STACKSIZE)
|
||||
PROGNAME += $(CONFIG_INTERPRETERS_CPYTHON_PROGNAME)
|
||||
PRIORITY += $(CONFIG_INTERPRETERS_CPYTHON_PRIORITY)
|
||||
STACKSIZE += $(CONFIG_INTERPRETERS_CPYTHON_STACKSIZE)
|
||||
|
||||
MAINSRC += python_wrapper.c
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue