diff options
Diffstat (limited to 'metadata/Makefile')
| -rw-r--r-- | metadata/Makefile | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/metadata/Makefile b/metadata/Makefile index 981abc7d..7fbebc7d 100644 --- a/metadata/Makefile +++ b/metadata/Makefile @@ -1,5 +1,5 @@ SHELL=/bin/bash -SRCDIRS=swamid-2.0 swamid-edugain swamid-testing +SRCDIRS=swamid-2.0 swamid-edugain NOW=$(shell perl scripts/now_date.pl) @@ -8,7 +8,6 @@ tag: EDUGAINXML=$(patsubst swamid-edugain/%.xml,.time/%.time,$(wildcard swamid-edugain/*.xml)) SWAMID20XML=$(patsubst swamid-2.0/%.xml,.time/%.time,$(wildcard swamid-2.0/*.xml)) -TESTINGXML=$(patsubst swamid-testing/%.xml,.time/%.time,$(wildcard swamid-testing/*.xml)) testRefedsRnS: @echo "Checking for refeds R&S compatibillity for entities exported to eduGAIN" @@ -87,7 +86,7 @@ checkUKalgorithms: @xsltproc --xinclude xslt/check_uk_algorithms.xsl swamid-edugain/* | sed 's/.*/[1;31m&[0m/' | grep . && exit 1 || exit 0 @xsltproc --xinclude xslt/check_algsupport.xsl swamid-edugain/* | sed 's/.*/[1;31m&[0m/' | grep . && exit 1 || exit 0 -test: $(EDUGAINXML) $(SWAMID20XML) $(TESTINGXML) testMDUI testALlevel testEduGAINchecks testRefedsRnS testBadStrings testRegistrationAuthority checkInvalidChars checkUKalgorithms +test: $(EDUGAINXML) $(SWAMID20XML) testMDUI testALlevel testEduGAINchecks testRefedsRnS testBadStrings testRegistrationAuthority checkInvalidChars checkUKalgorithms .time/%.time: swamid-edugain/%.xml @xsltproc --stringparam regDate $(NOW) xslt/add-rpi.xsl $< > $<.c && mv $<.c $< @@ -107,18 +106,9 @@ test: $(EDUGAINXML) $(SWAMID20XML) $(TESTINGXML) testMDUI testALlevel testEduGAI @echo $< done @touch -r $< $@ -.time/%.time: swamid-testing/%.xml - @xsltproc --stringparam regDate $(NOW) xslt/add-rpi.xsl $< > $<.c && mv $<.c $< - @xsltproc xslt/clean-entitydescriptor.xsl $< > $<.c && mv $<.c $< - - @xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $< 2>&1 - - @echo $< done - @touch -r $< $@ - commit: test @git diff --color || true @echo ; echo -n "Run 'git commit -av'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -av ;; s|skip) ;; *) exit 1 ;; esac @git status -u - @echo "Checking for not committed files in swamid-*/" ; if git status --porcelain --ignored | awk '{print $$2}' | egrep "^swamid-edugain|^swamid-2.0/|^swamid-testing/" | sed 's/^/ /' | grep . ; then echo "Not committed files in swamid-*/, aborting" ; exit 1 ; fi + @echo "Checking for not committed files in swamid-*/" ; if git status --porcelain --ignored | awk '{print $$2}' | egrep "^swamid-edugain|^swamid-2.0/" | sed 's/^/ /' | grep . ; then echo "Not committed files in swamid-*/, aborting" ; exit 1 ; fi |