Depend on pkgs and move code there; drop other distros but guix

1 files changed, 36 insertions, 34 deletions

diff --git a/Makefile b/Makefile
index af4d841..27e141f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
 N = `nproc`
 
 
+
 .SUFFIXES:
 .SUFFIXES: .in .sentinel
 
@@ -13,13 +14,20 @@ N = `nproc`
 
 
 
+all:
+include deps.mk
+
+
+test-config-files-local = \
+
+test-config-files-internet = \
+
 test-config-files = \
-	tests/internet/etc/postfix/main.cf      \
-	tests/internet/etc/dkimproxyout.conf    \
-	tests/internet/etc/dovecot/dovecot.conf \
+	$(test-config-files-local)     \
+	$(test-config-files-internet)  \
+
 
 derived-assets = \
-	queue.scm.sentinel             \
 	packages.scm.sentinel          \
 	local.scm.sentinel             \
 	internet.scm.sentinel          \
@@ -27,57 +35,53 @@ derived-assets = \
 	$(test-config-files)           \
 
 side-assets = \
-	queue.scm                      \
-	queue.scm-*                    \
 	dynamic.scm                    \
 	packages.scm                   \
 	local.scm                      \
 	internet.scm                   \
+	tests/cert/                    \
+
 
 
 all: $(derived-assets)
-all: maintainer.key.sentinel
 
 
-queue.scm.sentinel:    src/org/euandre/queue.scm
-packages.scm.sentinel: src/org/euandre/queue.scm src/org/euandre/packages.scm
-local.scm.sentinel:    src/org/euandre/queue.scm tests/local/system.scm
-internet.scm.sentinel: src/org/euandre/queue.scm src/org/euandre/packages.scm \
-		tests/internet/system.scm
+$(test-config-files):  Makefile deps.mk
+local.scm.sentinel:    tests/local/system.scm
+internet.scm.sentinel: tests/internet/system.scm
 
-queue.scm.sentinel packages.scm.sentinel: Makefile
-	rm -f `basename $@ .sentinel`*
-	guix build -c$N -v3 -Lsrc -r`basename $@ .sentinel` -Kf src/org/euandre/`basename $@ .sentinel`
+packages.scm.sentinel: src/org/euandre/packages.scm Makefile deps.mk
+	rm -f packages.scm
+	guix build -c$N -v3 -Lsrc -r packages.scm -Kf src/org/euandre/packages.scm
 	touch $@
 
-local.scm.sentinel internet.scm.sentinel: queue.scm.sentinel packages.scm.sentinel
-	rm -f `basename $@ .sentinel`*
-	guix build -c$N -v3 -Lsrc -r`basename $@ .sentinel` -Kf tests/`basename $@ .scm.sentinel`/system.scm
+local.scm.sentinel internet.scm.sentinel: packages.scm.sentinel
+	rm -f $*
+	guix build -c$N -v3 -Lsrc -r $* -Kf tests/`basename $* .scm`/system.scm
 	touch $@
 
-maintainer.key.sentinel: meta.capim
-	ID="`awk '$$1 == ":email" && $$0=$$2' meta.capim | tr -d '"'`" && \
-	gpg --export --armour "$$ID" | ifnew $*
+maintainer.key.sentinel: email.txt
+	gpg --export --armour "`cat email.txt`" | ifnew $*
 	touch $@
 
 
 
+check-guile:
+	guix repl -L src/ tests/unit.scm
+
+check-unit: check-guile
+
 local-files = \
-	/etc/postfix/master.cf \
-	/etc/postfix/main.cf   \
 
 internet-files = \
-	$(local-files)            \
-	/etc/sasl2/smtpd.conf     \
-	/etc/dkimproxyout.conf    \
-	/etc/dovecot/dovecot.conf \
+	$(local-files)                 \
 
-check-guix-static-local: local.scm.sentinel       $(test-config-files)
+check-guix-static-local:    local.scm.sentinel    $(test-config-files-local)
 	for f in $(local-files); do \
 		diff -U5 local.scm"$$f" tests/local"$$f"; \
 	done
 
-check-guix-static-internet: internet.scm.sentinel $(test-config-files)
+check-guix-static-internet: internet.scm.sentinel $(test-config-files-internet)
 	for f in $(internet-files); do \
 		diff -U5 internet.scm"$$f" tests/internet"$$f"; \
 	done
@@ -85,15 +89,13 @@ check-guix-static-internet: internet.scm.sentinel $(test-config-files)
 check-guix-static: check-guix-static-local check-guix-static-internet
 
 check-guix-dynamic:
-	rm -f dynamic.scm*
-	guix build -c$N -v3 -Lsrc -r dynamic.scm -Km tests/internet/tests.scm
+	rm -f dynamic.scm
+	guix build -c$N -v3 -Lsrc -r dynamic.scm -Km tests/tests.scm
 
 check-guix: check-guix-static check-guix-dynamic
 
-check-unit: check-guix
-
 
-check-integration:
+check-integration: check-guix
 
 
 ## Run all tests.  Each test suite is isolated, so that a parallel