diff options
| author | Björn Mattsson <Bjorn.Mattsson@bth.se> | 2020-09-14 16:29:29 +0200 |
|---|---|---|
| committer | Björn Mattsson <Bjorn.Mattsson@bth.se> | 2020-09-14 16:29:29 +0200 |
| commit | 1eae47b8328607830b1b1d0eecbcaa682b89ac13 (patch) | |
| tree | cc3cb33d6090e08227e9f54b0917865e3a97a433 | |
| parent | b7ed8f8b40bcaf4c66331ca9aa404dbcb704cefb (diff) | |
Moved validate to it's own file to remove dep on perl
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | Makefile.validate | 7 |
2 files changed, 7 insertions, 6 deletions
@@ -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) |