summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 2 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index 6300c101..428fb78e 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,6 @@ sign: swamid upstream
%.pub: %.sig
mkdir -p $(DEST) && xmllint --nowarning --noout --path schema --schema schema.xsd $< && mv $< $(DEST)/$*.xml
-#dependencies: swamid-externals-sp-2.0.xml swamid-interfederations-idp-2.0.xml swamid-interfederations-sp-2.0.xml
dependencies: swamid-interfederations-idp-2.0.xml swamid-interfederations-sp-2.0.xml
# kalmar obsolete
@@ -53,17 +52,8 @@ kalmar:
edugain:
env SWAMID_MK_CONFIG=$(SWAMID_MK_CONFIG) $(MAKE) RPI=true CONTACTS=true swamid-edugain-testing-1.0.pub swamid-edugain-1.0.pub
-#aggregate: swamid-externals swamid-interfederations
aggregate: swamid-interfederations
-swamid-externals: swamid-externals1 swamid-externals2
-
-swamid-externals1:
- scripts/aggregate.sh swamid-externals-1.0
-
-swamid-externals2:
- scripts/aggregate.sh swamid-externals-2.0
-
# kalmar obsolete
#swamid-interfederations: swamid-interfederations1 swamid-interfederations2
swamid-interfederations: swamid-interfederations2
@@ -105,9 +95,6 @@ swamid-interfederations-idp-2.0.xml: swamid-interfederations-2.0.mxml
swamid-interfederations-sp-2.0.xml: swamid-interfederations-2.0.mxml
@xsltproc --xinclude xslt/extract-sp.xslt swamid-interfederations-2.0.mxml > swamid-interfederations-sp-2.0.xml
-swamid-externals-sp-2.0.xml: swamid-externals-2.0.mxml
- @xsltproc --xinclude xslt/extract-non-idp.xslt swamid-externals-2.0.mxml > swamid-externals-sp-2.0.xml
-
syntaxtest: clean dependencies schematest
pedantic: clean dependencies schematest testRefedsRnS testGeantCoCo testEduGAINchecks
@@ -205,11 +192,11 @@ testMDUI:
testIdPinSP:
@echo "Check that SP:s does not define IDPSSODescriptor"
- @for spfile in `cat swamid-sp-2.0.mxml swamid-externals-sp-2.0.xml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}'` ; do grep -q IDPSSODescriptor $$spfile && echo " $$spfile" | sed 's/.*/&/' ; done | grep . && exit 1 || exit 0
+ @for spfile in `cat swamid-sp-2.0.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}'` ; do grep -q IDPSSODescriptor $$spfile && echo " $$spfile" | sed 's/.*/&/' ; done | grep . && exit 1 || exit 0
testMDUIreach:
@echo "Check that MDUI URLs are reachable"
- @cat swamid-idp-2.0.mxml swamid-sp-2.0.mxml swamid-externals-sp-2.0.xml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | \
+ @cat swamid-idp-2.0.mxml swamid-sp-2.0.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | \
xargs -n1 -P 10 scripts/verify-uiinfo-urls.sh
testOrgData: