From d16a726e958aa78d5d9f3515eb18b589e27bdac1 Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Thu, 24 Aug 2023 20:10:34 +0200 Subject: make it possible to build&test&use just hydrilla without haketilo --- Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 50c4204..5ee80ec 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,9 @@ GUIX_COMMIT := a86979b41a49a8fcdaa887970ba594dbba701226 GUIX_TM = $(GUIX) time-machine --commit=$(GUIX_COMMIT) -- -GUIX_DEVSHELL = $(GUIX_TM) shell -Df guix.scm -- +GUIX_PACKAGE_SELECTION_FLAGS = -f guix.scm + +GUIX_DEVSHELL = $(GUIX_TM) shell -D $(GUIX_PACKAGE_SELECTION_FLAGS) -- GET_VER = $$(grep '^Version:' src/hydrilla.egg-info/PKG-INFO | cut -d' ' -f2) RECORD_VER = VER="$(GET_VER)" @@ -96,13 +98,20 @@ shell-with-haketilo: dist *bash*) \ HYDRILLA_SHELL_NAME=hydrilla \ $(GUIX_TM) shell \ - --rebuild-cache -f guix.scm -- \ + --rebuild-cache \ + $(GUIX_PACKAGE_SELECTION_FLAGS) -- \ "$$SHELL_TO_USE" --rcfile ./bashrc || true;; \ *) \ - $(GUIX_TM) shell --rebuild-cache -f guix.scm -- \ + $(GUIX_TM) shell --rebuild-cache \ + $(GUIX_PACKAGE_SELECTION_FLAGS) -- \ || true;; \ esac +.PHONY: +shell-with-hydrilla-only: + $(MAKE) shell-with-haketilo \ + GUIX_PACKAGE_SELECTION_FLAGS="-e '(@ (hydrilla-base) hydrilla-without-haketilo)' -L ./guix-module-dir" + catalogs: $(GUIX_DEVSHELL) python3 setup.py compile_catalog -- cgit v1.2.3