From 6d8d5f6d114783cfdc068e18f53faec152a5acf9 Mon Sep 17 00:00:00 2001 From: John-Mark Gurney Date: Thu, 23 Jan 2020 00:29:25 -0800 Subject: [PATCH] paramaterize more things... --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0902c15..962a6ee 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,11 @@ PROJNAME=solardash VIRTUALENV ?= virtualenv-3.7 VRITUALENVARGS = +CPP ?= cpp +HOST ?= localhost + +RAINEAGLEDATAPREF ?= p/src/raineagle/fixtures/data + FILES=$(PROJNAME)/__init__.py JSFILES = root/js/solardash.file.js root/js/solardash.https.js root/js/solardash.http.js @@ -32,7 +37,7 @@ all: $(JSFILES) run: $(JSFILES) .jspp.js: - cpp -Wno-invalid-pp-token -E $< | sed -e '/^#/d' > $@ || (rm "$@"; false) + $(CPP) -Wno-invalid-pp-token -E $< | sed -e '/^#/d' > $@ || (rm "$@"; false) keepupdate: find . -name '*.js' -o -name '*.jspp' | entr make all @@ -44,7 +49,7 @@ test-noentr: python -m coverage run -m unittest $(PROJNAME) && coverage report --omit=p/\* -m -i run: $(JSFILES) - python -m aiohttp.web -H localhost -P 38382 solardash:getapp p/src/raineagle/fixtures/data + python -m aiohttp.web -H $(HOST) -P 38382 solardash:getapp $(RAINEAGLEDATAPREF) env: ($(VIRTUALENV) $(VIRTUALENVARGS) p && . ./p/bin/activate && pip install -r requirements.txt)