Skip to content

Commit 728fc5b

Browse files
linguini1Biancaa Ramesh
authored andcommitted
!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>
1 parent 10b3cf1 commit 728fc5b

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

interpreters/python/Kconfig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# see the file kconfig-language.txt in the NuttX tools repository.
44
#
55

6-
config INTERPRETER_CPYTHON
6+
config INTERPRETERS_CPYTHON
77
tristate "CPython"
88
depends on LIB_ZLIB
99
depends on EXPERIMENTAL
@@ -13,25 +13,25 @@ config INTERPRETER_CPYTHON
1313
interpreter to NuttX. Initially, it is tweaked to work with the
1414
RISC-V QEMU virtual board (`rv-virt`).
1515

16-
if INTERPRETER_CPYTHON
16+
if INTERPRETERS_CPYTHON
1717

18-
config INTERPRETER_CPYTHON_VERSION
18+
config INTERPRETERS_CPYTHON_VERSION
1919
string "Python Version"
2020
default "3.13.0"
2121

22-
config INTERPRETER_CPYTHON_STACKSIZE
22+
config INTERPRETERS_CPYTHON_STACKSIZE
2323
int "CPython stack size"
2424
default 307200
2525
---help---
2626
This is the stack size allocated when the CPython task runs.
2727

28-
config INTERPRETER_CPYTHON_PRIORITY
28+
config INTERPRETERS_CPYTHON_PRIORITY
2929
int "CPython task priority"
3030
default 100
3131
---help---
3232
This is the priority of the CPython task.
3333

34-
config INTERPRETER_CPYTHON_PROGNAME
34+
config INTERPRETERS_CPYTHON_PROGNAME
3535
string "CPython name"
3636
default "python"
3737
---help---

interpreters/python/Make.defs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#
2121
############################################################################
2222

23-
ifneq ($(CONFIG_INTERPRETER_CPYTHON),)
23+
ifneq ($(CONFIG_INTERPRETERS_CPYTHON),)
2424

25-
CPYTHON_VERSION = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETER_CPYTHON_VERSION)))
25+
CPYTHON_VERSION = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETERS_CPYTHON_VERSION)))
2626
CPYTHON_VERSION_MINOR=$(basename $(CPYTHON_VERSION))
2727

2828
EXTRA_LIBPATHS += -L$(APPDIR)/interpreters/python/install/target

interpreters/python/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
include $(APPDIR)/Make.defs
2424

2525
CPYTHON_URL ?= "https://github.com/python/cpython/archive"
26-
CPYTHON_VERSION = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETER_CPYTHON_VERSION)))
26+
CPYTHON_VERSION = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETERS_CPYTHON_VERSION)))
2727
CPYTHON_VERSION_MINOR=$(basename $(CPYTHON_VERSION))
2828
CPYTHON_ZIP = v$(CPYTHON_VERSION).zip
2929

@@ -171,11 +171,11 @@ $(TARGETLIBPYTHON): $(TARGETBUILD)/Makefile
171171
$(Q) ( cp $(TARGETBUILD)/libpython$(CPYTHON_VERSION_MINOR).a $(TARGETLIBPYTHON) )
172172
$(Q) $(UNPACK) $(TARGETMODULESPACK) -d $(TARGETMODULES)/python$(CPYTHON_VERSION_MINOR)
173173

174-
MODULE = $(CONFIG_INTERPRETER_CPYTHON)
174+
MODULE = $(CONFIG_INTERPRETERS_CPYTHON)
175175

176-
PROGNAME += $(CONFIG_INTERPRETER_CPYTHON_PROGNAME)
177-
PRIORITY += $(CONFIG_INTERPRETER_CPYTHON_PRIORITY)
178-
STACKSIZE += $(CONFIG_INTERPRETER_CPYTHON_STACKSIZE)
176+
PROGNAME += $(CONFIG_INTERPRETERS_CPYTHON_PROGNAME)
177+
PRIORITY += $(CONFIG_INTERPRETERS_CPYTHON_PRIORITY)
178+
STACKSIZE += $(CONFIG_INTERPRETERS_CPYTHON_STACKSIZE)
179179

180180
MAINSRC += python_wrapper.c
181181

0 commit comments

Comments
 (0)