Skip to content

Commit

Permalink
Add pip updates to make update target
Browse files Browse the repository at this point in the history
  • Loading branch information
lhearachel committed Jan 2, 2025
1 parent 1e39b30 commit 591a259
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ VENV ?= .venv
VENV_ACTIVATE := $(VENV)/bin/activate
VENV_MESON := . $(VENV_ACTIVATE) ; $(MESON)
VENV_NINJA := . $(VENV_ACTIVATE) ; $(NINJA)
VENV_PIP := . $(VENV_ACTIVATE) ; pip

PIP_REQUIREMENTS := requirements.txt

ifneq (,$(findstring Microsoft,$(UNAME_R)))
ifneq (,$(filter /mnt/%,$(CWD)))
Expand Down Expand Up @@ -79,6 +82,8 @@ clean: $(BUILD)/build.ninja
$(VENV_MESON) compile -C $(BUILD) --clean

update: $(BUILD)/build.ninja
$(VENV_PIP) install --upgrade pip
$(VENV_PIP) install --upgrade -r $(PIP_REQUIREMENTS)
$(VENV_MESON) subprojects update

distclean:
Expand All @@ -96,7 +101,7 @@ venv: $(VENV_ACTIVATE)

$(VENV_ACTIVATE):
python3 -m venv $(VENV)
. $(VENV_ACTIVATE) ; pip install -r requirements.txt
. $(VENV_ACTIVATE) ; pip install -r $(PIP_REQUIREMENTS)

$(BUILD)/build.ninja: $(ROOT_INI) $(DOT_MWCONFIG) $(VENV_ACTIVATE) | $(BUILD)
. $(VENV_ACTIVATE) ; MWCONFIG=$(abspath $(DOT_MWCONFIG)) $(MESON) setup \
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
meson >= 1.3.*
ninja >= 1.11.*
meson >= 1.3.0
ninja >= 1.11.0

0 comments on commit 591a259

Please sign in to comment.