diff options
| author | Fredrik Åslund <fredrik.aslund@umu.se> | 2013-09-24 10:19:38 +0200 |
|---|---|---|
| committer | Fredrik Åslund <fredrik.aslund@umu.se> | 2013-09-24 10:19:38 +0200 |
| commit | 46b6a83aaecbddd698972839c8470835ac7211d6 (patch) | |
| tree | 1ae4425a981267795b13981f410e938dd0fa0953 /Makefile | |
| parent | bca2bb6b51904fc80667281e16ac25a02e615e07 (diff) | |
swamid-1.0* removed
nya-1.0* removed
non-used metadata moved to swamid-2.0-obsolete
swamid-1.0/* moved to swamid-2.0/
nya-1.0/* moved to swamid-2.0/
mxml cleaned from swamid-1.0 data
Makefile cleaned from nya-1.0 and swamid-1.0 data
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 33 |
1 files changed, 4 insertions, 29 deletions
@@ -3,7 +3,7 @@ KEY=/opt/swamid-credentials/swamid-signer.key CERT=/opt/swamid-credentials/swamid-signer.crt PASS=$(shell cat /opt/swamid-credentials/swamid-signer-pass.txt) DEST=/opt/published-metadata -SRCDIRS=swamid-1.0 swamid-2.0 nya-1.0 +SRCDIRS=swamid-2.0 DAYS:=1 DATE=$(shell perl scripts/expiration_date.pl $(DAYS)) @@ -23,7 +23,7 @@ keys: $(KEY) $(CERT) MXML=$(shell echo *.mxml) -sign: keys swamid nocache nya nya-testing swamid-testing swamid-testing-idp upstream projects swamid-ki-sll +sign: keys swamid swamid-testing swamid-testing-idp upstream projects swamid-ki-sll %.sig: %.mxml xsltproc $(XSLTDEFS) --xinclude $(TRANSFORM) $< > $*.n @@ -45,10 +45,6 @@ kalmar: edugain: $(MAKE) RPI=true CONTACTS=true swamid-edugain-testing-1.0.pub swamid-edugain-1.0.pub -nocache: - #$(MAKE) swamid-1.0-nocache.pub - rm -f $(DEST)/swamid-1.0-nocache.xml - projects: $(MAKE) RPI=false CONTACTS=false TOU=false ORG=false swamid-fiv-test.pub @@ -70,28 +66,17 @@ swamid-interfederations1: swamid-interfederations2: scripts/aggregate.sh swamid-interfederations-2.0 -swamid: swamid1 swamid2 swamid-no-interfederation-combined swamid-discovery swamid-idp swamid-idp-transitive publish +swamid: swamid2 swamid-no-interfederation-combined swamid-discovery swamid-idp swamid-idp-transitive publish publish: swamid-tou-en.txt swamid-tou-sv.txt HEADER.html README.html cp swamid-tou-en.txt swamid-tou-sv.txt sunet-swamid.png HEADER.html README.html $(DEST) -swamid1: - @saml-md-tool swamid-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - #@test -s swamid-1.0.xml && cp swamid-1.0.xml $(DEST) - rm -f $(DEST)/swamid-1.0.xml - -swamid2-deps: swamid-sp-1.0.xml swamid-idp-1.0.xml swamid-externals-sp-2.0.xml swamid-interfederations-idp-2.0.xml +swamid2-deps: swamid-externals-sp-2.0.xml swamid-interfederations-idp-2.0.xml swamid2: swamid2-deps @saml-md-tool swamid-2.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) --days=$(DAYS) @test -s swamid-2.0.xml && cp swamid-2.0.xml $(DEST) -swamid-sp-1.0.xml: - @xsltproc --xinclude xslt/extract-non-idp.xslt swamid-1.0.mxml > swamid-sp-1.0.xml - -swamid-idp-1.0.xml: - @xsltproc --xinclude xslt/extract-idp.xslt swamid-1.0.mxml > swamid-idp-1.0.xml - swamid-interfederations-idp-2.0.xml: swamid-interfederations-2.0.mxml @xsltproc --xinclude xslt/extract-idp.xslt swamid-interfederations-2.0.mxml > swamid-interfederations-idp-2.0.xml @@ -114,16 +99,6 @@ swamid-idp-transitive: swamid2-deps @saml-md-tool swamid-idp-transitive update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) --days=$(DAYS) test -s swamid-idp-transitive.xml && cp swamid-idp-transitive.xml $(DEST) -nya: - @saml-md-tool nya-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - #@test -s nya-1.0.xml && cp nya-1.0.xml $(DEST) - rm -f $(DEST)/nya-1.0.xml - -nya-testing: - @saml-md-tool nya-1.0-testing update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - #@test -s nya-1.0-testing.xml && cp nya-1.0-testing.xml $(DEST) - rm -f $(DEST)/nya-1.0-testing.xml - swamid-testing: @saml-md-tool swamid-testing-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) @test -s swamid-testing-1.0.xml && cp swamid-testing-1.0.xml $(DEST) |