From 7965f1b455144220c137bcb25c4967283a6b7ff3 Mon Sep 17 00:00:00 2001
From: Wojtek Kosior <koszko@koszko.org>
Date: Wed, 16 Feb 2022 18:12:21 +0100
Subject: improve the build system

---
 Makefile.in | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index cac0c01..28ccb85 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,14 +16,13 @@ SHELL = /bin/sh
 VPATH = <<VPATH>>
 
 version = <<VERSION>>
-PYTEST = <<PYTEST>>
 extension_files = background/ common/ content/ html/ licenses/ \
         copyright default_settings.json manifest.json
 
 metafiles = build.sh configure Makefile.in process_html_file.sh README.txt \
         re-generate_icons.sh shell_utils.sh upload_amo.sh write_makefile.sh
 
-# Configuration goes here
+# Configuration gets included here by write_makefile.sh
 
 # The default target: placed up here
 default: $(default_target)
@@ -45,7 +44,7 @@ all: mozilla chromium
 mozilla: mozilla-build.zip
 chromium: chromium-build.zip
 
-unpacked: $(default_target)-unpacked
+unpacked: $(default_target)-unpacked Makefile
 all-unpacked: mozilla-unpacked chromium-unpacked
 %-unpacked: $(extension_files) icons/haketilo16.png
 	$(srcdir)/build.sh $* $(srcdir) $(UPDATE_URL)
@@ -57,10 +56,13 @@ install install-strip: $(default_target)-unpacked
 uninstall:
 	rm -r "$(DESTDIR)/{6fe13369-88e9-440f-b837-5012fb3bedec}"
 
-%-build.zip: %-unpacked
+%-build.zip: %-unpacked Makefile
 	cd $< && zip -q -r ../$@ *
 
-test/certs/:
+test/:
+	mkdir $@
+
+test/certs/: | test/
 	mkdir $@
 
 test/certs/%.key: | test/certs/
@@ -71,7 +73,7 @@ test/certs/rootCA.pem: test/certs/rootCA.key
 		 -subj "/CN=Haketilo Test"
 
 test: test/certs/rootCA.pem test/certs/site.key $(default_target)-build.zip
-	MOZ_HEADLESS=whatever $(PYTEST)
+	MOZ_HEADLESS=whatever $(PYTHON) -m pytest
 
 test-environment: test/certs/rootCA.pem test/certs/site.key
 	python3 -m test
@@ -82,9 +84,8 @@ test-environment-with-haketilo: test/certs/rootCA.pem test/certs/site.key \
 
 # helper targets
 clean mostlyclean:
-	rm -rf mozilla-unpacked chromium-unpacked haketilo-$(version)
-	rm -f mozilla-build.zip chromium-build.zip haketilo-$(version).tar.gz \
-	        haketilo-$(version).tar exports_init.js
+	rm -rf mozilla-unpacked chromium-unpacked haketilo-[1-9]*
+	rm -f mozilla-build.zip chromium-build.zip exports_init.js
 	rm -rf test/certs
 	rm -rf $$(find . -name geckodriver.log)
 	rm -rf $$(find . -type d -name __pycache__)
-- 
cgit v1.2.3