janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

py-defs.mk, projects.mk: Use latest install Python

Browse source 
Use $(lastword $(shell ls -v /usr/bin/python[0-9]*)) for the Python version to use.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2020-05-16 13:22:51 +00:00
commit caf33841b4
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
make/projects.mk
View file

@ -27,12 +27,15 @@ ifndef WHICH
WHICH := $(firstword $(wildcard /usr/bin/which) $(shell which which)) WHICH := $(firstword $(wildcard /usr/bin/which) $(shell which which))
endif endif
ifeq ($(PYTHON),) ifneq ($(PYTHON_VERSION),)
PYTHON_VERSION := 3 PYTHON := /usr/bin/python$(PYTHON_VERSION)
PYTHON := $(shell $(WHICH) python$(PYTHON_VERSION))
else else
PYTHON_VERSION := $(word 2,$(subst ., ,$(shell $(PYTHON) --version))) ifeq ($(PYTHON),)
PYTHON := $(lastword $(shell ls -v /usr/bin/python[0-9]*))
endif
PYTHON_VERSION ?= $(patsubst python%,%,$(notdir $(PYTHON)))
endif endif
PYTHON_MAJOR = $(basename $(PYTHON_VERSION))
ifneq ($(TOPDIR),) ifneq ($(TOPDIR),)
proj_query_cmd = $(PYTHON) $(JWB_SCRIPT_DIR)/projects.py -p $(PROJECTS_DIR) -t $(TOPDIR) $(PROJECTS_PY_EXTRA_ARGS) proj_query_cmd = $(PYTHON) $(JWB_SCRIPT_DIR)/projects.py -p $(PROJECTS_DIR) -t $(TOPDIR) $(PROJECTS_PY_EXTRA_ARGS)

8
make/py-defs.mk
View file

@ -1,9 +1,11 @@
ENV_PYTHONPATH := $(PYTHONPATH) ENV_PYTHONPATH := $(PYTHONPATH)
ifeq ($(PYTHON),) ifneq ($(PYTHON_VERSION),)
PYTHON_VERSION ?= 3 PYTHON := /usr/bin/python$(PYTHON_VERSION)
PYTHON ?= /usr/bin/python$(PYTHON_VERSION)
else else
ifeq ($(PYTHON),)
PYTHON := $(lastword $(shell ls -v /usr/bin/python[0-9]*))
endif
PYTHON_VERSION ?= $(patsubst python%,%,$(notdir $(PYTHON))) PYTHON_VERSION ?= $(patsubst python%,%,$(notdir $(PYTHON)))
endif endif
PYTHON_MAJOR = $(basename $(PYTHON_VERSION)) PYTHON_MAJOR = $(basename $(PYTHON_VERSION))