From 1eae47b8328607830b1b1d0eecbcaa682b89ac13 Mon Sep 17 00:00:00 2001 From: Björn Mattsson Date: Mon, 14 Sep 2020 16:29:29 +0200 Subject: Moved validate to it's own file to remove dep on perl --- Makefile | 6 ------ Makefile.validate | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 Makefile.validate diff --git a/Makefile b/Makefile index 32182668..f5d67ded 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,6 @@ all: clean dependencies test sign clean web MXML=$(shell echo *.mxml) SWAMIDXML=$(patsubst swamid-2.0/%.xml,.time/%.time,$(wildcard swamid-2.0/*.xml)) -VALIDATEXML=$(patsubst swamid-2.0/%.xml,.time/%.validate,$(wildcard swamid-2.0/*.xml)) TIMEFILES=$(patsubst %.time,.xml/swamid-2.0/%.time,$(wildcard .time/*.time)) sign: swamid upstream projects @@ -313,8 +312,3 @@ commit: tidy test @echo "Checking for not committed files in swamid-2.0/" ; if git status --porcelain --ignored | awk '{print $$2}' | grep "^swamid-2.0/" | sed 's/^/ /' | grep . ; then echo "Not committed files in swamid-2.0/, aborting" ; exit 1 ; fi @echo ; echo -n "Run 'git push'? [Y/n] " ; read x ; case $$x in "Y"|"y"|"") ;; *) exit 1 ;; esac @git push - -.time/%.validate: swamid-2.0/%.xml - @/var/www/metadata/validate.py prod $< - -validate: $(VALIDATEXML) diff --git a/Makefile.validate b/Makefile.validate new file mode 100644 index 00000000..72afb86a --- /dev/null +++ b/Makefile.validate @@ -0,0 +1,7 @@ + +VALIDATEXML=$(patsubst swamid-2.0/%.xml,.time/%.validate,$(wildcard swamid-2.0/*.xml)) + +.time/%.validate: swamid-2.0/%.xml + @/var/www/metadata/validate.py prod $< + +validate: $(VALIDATEXML) -- cgit v1.2.3