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

py-xxx.mk: Some variable housekeeping #81

Merged
Jan Lindemann merged 2 commits from jan/fix/20260824-py-defs-mk-some-variable-housekeeping into master 2026-08-24 18:23:01 +02:00 AGit
Conversation 0 Commits 2 Files changed 3 +21 -15
2 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e6e96d64c2 - Show all commits

py-defs.mk, py-mod.mk: Add PY_LOCAL_PY(C)
All checks were successful
CI / Packaging - Kali Linux (pull_request) Successful in 4m17s
Details
CI / Packaging - OpenSUSE Tumbleweed (pull_request) Successful in 4m22s
Details
CI / Packaging test (pull_request) Successful in 0s
Details
CI / Packaging - Kali Linux (push) Successful in 4m11s
Details
CI / Packaging - OpenSUSE Tumbleweed (push) Successful in 3m57s
Details
CI / Packaging test (push) Successful in 0s
Details

Prev Next 
The meaning of the many PY_XXX variables isn't easy to tell apart, so
start renaming some of them.

PY_ALL_PY and PY_PYC consistently are now named PY_LOCAL|INSTALL_PY and
PY_LOCAL|INSTALL_PYC, depending on whether or not they are intended to
be installed.

The old PY_INSTALL_PY was renamed to PY_DO_INSTALLL_PY, a move that
would be better applied to all boolean variables. I won't try with this
commit, however, because a lot of downstream packages depend on
PY_UPDATE_INIT_PY and PY_INSTALL_INIT_PY, i.e. without "_DO".

Signed-off-by: Jan Lindemann <jan@janware.com>
Jan Lindemann 2026-08-24 17:18:35 +02:00
commit e6e96d64c2
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61

32
make/py-defs.mk
View file

@ -3,14 +3,14 @@ include $(JWBDIR)/make/py-version.mk
PY_INSTALL_INIT_PY ?= true
PY_UPDATE_INIT_PY ?= true
PY_INSTALL ?= true
PY_INSTALL_REG ?= true
PY_DO_INSTALL_REG ?= true
ifneq ($(PY_INSTALL),true)
PY_INSTALL_REG = false
PY_DO_INSTALL_REG = false
endif
PY_INSTALL_PYC ?= true
ifneq ($(PY_INSTALL_REG),true)
PY_INSTALL_PYC = false
PY_DO_INSTALL_PYC ?= true
ifneq ($(PY_DO_INSTALL_REG),true)
PY_DO_INSTALL_PYC = false
endif
ifeq ($(DEVELOPMENT),true)
@ -20,13 +20,16 @@ else
endif
PY_SRC_PY ?= $(wildcard *.py)
PY_ALL_PY = $(filter-out __init__.py,$(PY_SRC_PY))
PY_LOCAL_PY = $(PY_SRC_PY)
PY_INSTALL_PY = $(filter-out __init__.py,$(PY_SRC_PY))
ifneq ($(PYTHON_MAJOR),3)
PY_PYC = $(patsubst %.py,%.pyc,$(PY_ALL_PY))
PY_LOCAL_PYC = $(patsubst %.py,%.pyc,$(PY_LOCAL_PY))
PY_INSTALL_PYC = $(patsubst %.py,%.pyc,$(PY_INSTALL_PY))
else
PY_CPYTHON_PREFIX := $(shell $(PYTHON) -c "import sys; print('cpython-{}{}'.format(sys.version_info[0],sys.version_info[1]))")
PY_PYC = $(patsubst %.py,__pycache__/%.$(PY_CPYTHON_PREFIX).pyc,$(PY_ALL_PY))
PY_LOCAL_PYC = $(patsubst %.py,__pycache__/%.$(PY_CPYTHON_PREFIX).pyc,$(PY_LOCAL_PY))
PY_INSTALL_PYC = $(patsubst %.py,__pycache__/%.$(PY_CPYTHON_PREFIX).pyc,$(PY_INSTALL_PY))
endif
ifneq ($(PY_INSTALL_DIR),)
@ -46,7 +49,10 @@ ifeq ($(PY_INSTALL_DIR_PY),)
endif
PY_MOD ?= $(subst /,.,$(PY_INSTALL_MOD))
ifeq ($(PY_INSTALL_INIT_PY),true)
PY_ALL_PY += __init__.py
PY_INSTALL_PY += __init__.py
PY_LOCAL_PY += __init__.py
else ifeq ($(PY_UPDATE_INIT_PY),true)
PY_LOCAL_PY += __init__.py
endif
PY_INSTALL_DIR_PY ?= $(ENV_PREFIX)$(PY_SITE_PACKAGES_PATH)/$(patsubst .,/,$(PY_INSTALL_MOD))
else
@ -62,12 +68,12 @@ else
endif
PY_INSTALL_DIRS ?= $(sort $(PY_INSTALL_DIR_PY) $(PY_INSTALL_DIR_PYC))
PY_INSTALLED_PY = $(addprefix $(PY_INSTALL_DIR_PY)/,$(sort $(PY_ALL_PY)))
PY_INSTALLED_PY = $(addprefix $(PY_INSTALL_DIR_PY)/,$(sort $(PY_INSTALL_PY)))
PY_INSTALLED_PY_TYPED = $(addprefix $(PY_INSTALL_DIR_PY)/,$(wildcard py.typed))
ifeq ($(PY_INSTALL_PYC),true)
PY_INSTALLED_PYC = $(addprefix $(PY_INSTALL_DIR_PY)/,$(PY_PYC))
ifeq ($(PY_DO_INSTALL_PYC),true)
PY_INSTALLED_PYC = $(addprefix $(PY_INSTALL_DIR_PY)/,$(PY_INSTALL_PYC))
endif
ifeq ($(PY_INSTALL_REG),true)
ifeq ($(PY_DO_INSTALL_REG),true)
PY_INSTALLED_REG = $(PY_INSTALLED_PY) $(PY_INSTALLED_PYC) $(PY_INSTALLED_PY_TYPED)
endif

4
make/py-mod.mk
View file

@ -23,7 +23,7 @@ endif
#leftparen := (
#PY_EXPORT ?= $(shell sed '/\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[$(leftparen):].*//' $(PY_SRC_PY))
all: $(PY_PYC)
all: $(PY_LOCAL_PYC)
install: install-dirs.done install-reg.done
clean: invalidate-testability py.clean
distclean:
@ -34,6 +34,6 @@ ifeq ($(PY_UPDATE_INIT_PY),true)
__init__.py: $(PY_INIT_TMPL) $(filter-out __init__.py,$(PY_SRC_PY))
if [ "$(PY_INIT_TMPL)" ]; then cat "$(PY_INIT_TMPL)" > $@.tmp; else > $@.tmp; fi
set -e -o pipefail; $(PY_GENERATE_INIT_PY) \
$(filter-out __init__.py,$(PY_ALL_PY)) $(SUBDIRS_TO_ITERATE) | $(PY_INIT_FILTER) | tee -a $@.tmp
$(filter-out __init__.py,$(PY_LOCAL_PY)) $(SUBDIRS_TO_ITERATE) | $(PY_INIT_FILTER) | tee -a $@.tmp
mv $@.tmp $@
endif