revpi/revpicommander
1
0
Fork 0
mirror of https://github.com/naruxde/revpicommander.git synced 2025-11-08 16:43:53 +01:00
Code Issues Packages Releases Wiki Activity

build: Let target venv run combined with other targets

Browse Source 
The venv target always had to be created as a separate command. Now it
is possible to use it with other targets in a command.
This commit is contained in:
Sven Sager
2024-12-02 10:01:14 +01:00
parent 6a1e989e19
commit 44d9ea4561
1 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Makefile
View File

@@ -8,6 +8,9 @@ APP_NAME = RevPi\ Commander
APP_IDENT = org.revpimodio.revpicommander APP_IDENT = org.revpimodio.revpicommander
APPLE_SIG = "Developer ID Application: Sven Sager (U3N5843D9K)" APPLE_SIG = "Developer ID Application: Sven Sager (U3N5843D9K)"
# Python interpreter to use for venv creation
SYSTEM_PYTHON = python3
# Set path to create the virtual environment with package name # Set path to create the virtual environment with package name
ifdef PYTHON3_VENV ifdef PYTHON3_VENV
VENV_PATH = $(PYTHON3_VENV)/$(PACKAGE) VENV_PATH = $(PYTHON3_VENV)/$(PACKAGE)
@@ -15,39 +18,37 @@ else
VENV_PATH = venv VENV_PATH = venv
endif endif
# If virtualenv exists, use it. If not, use PATH to find commands # Set targets for "all"-target
SYSTEM_PYTHON = python3 all: build-ui build-rc build
PYTHON = $(or $(wildcard $(VENV_PATH)/bin/python), $(SYSTEM_PYTHON))
APP_VERSION = $(shell "$(PYTHON)" src/$(PACKAGE) --version | cut -d ' ' -f 2)
all: build_ui build_rc test build
.PHONY: all .PHONY: all
## Environment ## Virtual environment creation with SYSTEM_PYTHON
venv-info:
@echo Environment for $(APP_NAME) $(APP_VERSION)
@echo Using path: "$(VENV_PATH)"
exit 0
venv: venv:
# Start with empty environment # Start with empty environment
"$(SYSTEM_PYTHON)" -m venv "$(VENV_PATH)" "$(SYSTEM_PYTHON)" -m venv "$(VENV_PATH)"
source "$(VENV_PATH)/bin/activate" && \ "$(VENV_PATH)/bin/pip" install --upgrade pip
python3 -m pip install --upgrade pip && \ "$(VENV_PATH)/bin/pip" install --upgrade -r requirements.txt
python3 -m pip install -r requirements.txt
exit 0
venv-ssp: venv-ssp:
# Include system installed site-packages and add just missing modules # Include system installed site-packages and add just missing modules
"$(SYSTEM_PYTHON)" -m venv --system-site-packages "$(VENV_PATH)" "$(SYSTEM_PYTHON)" -m venv --system-site-packages "$(VENV_PATH)"
source "$(VENV_PATH)/bin/activate" && \ "$(VENV_PATH)/bin/pip" install --upgrade pip
python3 -m pip install --upgrade pip && \ "$(VENV_PATH)/bin/pip" install --upgrade -r requirements.txt
python3 -m pip install -r requirements.txt
exit 0
.PHONY: venv-info venv venv-ssp .PHONY: venv venv-ssp
# Choose python interpreter from venv or system
PYTHON = $(or $(wildcard $(VENV_PATH)/bin/python), $(SYSTEM_PYTHON))
# Read app version from program
APP_VERSION = $(shell "$(PYTHON)" src/$(PACKAGE) --version | cut -d ' ' -f 2)
# Environment info
venv-info:
@echo Environment for $(APP_NAME) $(APP_VERSION)
@echo Using path: "$(VENV_PATH)"
.PHONY: venv-info
## Compile Qt UI files to python code ## Compile Qt UI files to python code
build-ui: build-ui:
@@ -164,6 +165,8 @@ clean:
rm -rf build dist src/*.egg-info rm -rf build dist src/*.egg-info
# PyInstaller created files # PyInstaller created files
rm -rf *.spec rm -rf *.spec
# Pycaches
find . -type d -name '__pycache__' -exec rm -r {} \+
distclean: clean distclean: clean
# Virtual environment # Virtual environment