janware/jw-pkg
1
Code Pull requests Activity Actions 1

py-defs.mk: Move all path defs into py-path.mk

Browse source 
py-path.mk is the place to host PYTHONPATH and MYPYPATH definitions, so move them there from py-defs.mk for consistency. Also, remove some dead code.
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-06-18 11:19:07 +02:00
commit fe5756d761
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61
2 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
make/py-defs.mk
View file

@ -71,20 +71,6 @@ ifeq ($(PY_INSTALL_REG),true)
PY_INSTALLED_REG = $(PY_INSTALLED_PY) $(PY_INSTALLED_PYC) $(PY_INSTALLED_PY_TYPED) PY_INSTALLED_REG = $(PY_INSTALLED_PY) $(PY_INSTALLED_PYC) $(PY_INSTALLED_PY_TYPED)
endif endif
ifeq ($(origin PYTHONPATH),undefined)
PYTHONPATH := $(JW_PKG_PYTHON_PATH)
endif
#PYTHONPATH = $(subst $(space),,$(ENV_PYTHONPATH)$(foreach d,$(PY_MODULE_DIRS),:$(d)))
MYPYPATH = $(PYTHONPATH)
export PYTHONPATH MYPYPATH
# not used anywhere
#PY_PROJ_MODULE_DIRS ?= $(wildcard $(foreach subdir,/tools/python /src/python,$(addsuffix $(subdir),$(TOPDIR) $(PY_PREREQ_BUILD_DIRS))))
#PY_MODULE_DIRS ?= $(PY_PROJ_MODULE_DIRS)
#PY_MODULES ?= $(PY_PROJ_MODULES)
#PY_PROJ_MODULES += $(dir $(wildcard $(PY_MODULE_DIRS)/*/__init__.py))
ifneq ($(PY_DEFS_MK_INCLUDED),true) ifneq ($(PY_DEFS_MK_INCLUDED),true)
all: all:
clean: pyc.clean clean: pyc.clean
@ -99,9 +85,6 @@ echo-py:
@echo 'MYPYPATH = $(MYPYPATH)' @echo 'MYPYPATH = $(MYPYPATH)'
@echo 'PY_INSTALL_MOD = $(PY_INSTALL_MOD)' @echo 'PY_INSTALL_MOD = $(PY_INSTALL_MOD)'
@echo 'PY_INSTALL_SUB_MOD = $(PY_INSTALL_SUB_MOD)' @echo 'PY_INSTALL_SUB_MOD = $(PY_INSTALL_SUB_MOD)'
# not used anywhere'
#@echo 'PY_PROJ_MODULE_DIRS = $(PY_PROJ_MODULE_DIRS)'
#@echo 'PY_MODULE_DIRS = $(PY_MODULE_DIRS)'
pyc.clean: pyc.clean:
$(RM) -rf $(wildcard *.pyc) __pycache__ $(RM) -rf $(wildcard *.pyc) __pycache__

2
make/py-path.mk
View file

@ -1,7 +1,7 @@
# -- PYTHONPATH # -- PYTHONPATH
PYTHONPATH_ENV := $(PYTHONPATH) PYTHONPATH_ENV := $(PYTHONPATH)
JW_PKG_PYTHON_PATH_PREREQ += $(PROJECT)
ifeq ($(origin JW_PKG_PYTHON_PATH),undefined) ifeq ($(origin JW_PKG_PYTHON_PATH),undefined)
JW_PKG_PYTHON_PATH := $(shell $(JW_PKG_PY) --topdir-format absolute projects pythonpath --delimiter ' ' $(PROJECT) $(PREREQ_RUN)) JW_PKG_PYTHON_PATH := $(shell $(JW_PKG_PY) --topdir-format absolute projects pythonpath --delimiter ' ' $(PROJECT) $(PREREQ_RUN))
endif endif
export PYTHONPATH := $(subst $(space),:,$(JW_PKG_PYTHON_PATH)) export PYTHONPATH := $(subst $(space),:,$(JW_PKG_PYTHON_PATH))
export MYPYPATH := $(PYTHONPATH)