summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-12-01 13:06:37 +0100
committerLeif Johansson <leifj@sunet.se>2011-12-01 13:06:37 +0100
commitee5313ec12f581d7ff175132e3d3816d40090155 (patch)
tree4db9744c6700eae1a9e88d5d35d3d696a8afe9ff
parent059405d04f34194ac3d2eab0c4a24435080f0c16 (diff)
make tou optional
-rw-r--r--Makefile5
-rw-r--r--xslt/normalize.xsl4
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 1fb324ee..2370c899 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,9 @@ DAYS:=1
DATE=$(shell perl scripts/expiration_date.pl $(DAYS))
RPI=false
CONTACTS=false
+TOU=true
TRANSFORM=xslt/normalize.xsl
-XSLTDEFS := --stringparam rpi $(RPI) --stringparam defaultContact $(CONTACTS) --stringparam date $(DATE)
+XSLTDEFS := --stringparam tou $(TOU) --stringparam rpi $(RPI) --stringparam defaultContact $(CONTACTS) --stringparam date $(DATE)
all: update clean sign clean
@@ -42,7 +43,7 @@ edugain:
$(MAKE) RPI=true CONTACTS=true swamid-edugain-testing-1.0.pub swamid-edugain-1.0.pub
projects:
- $(MAKE) RPI=false CONTACTS=false swamid-fiv-test.pub
+ $(MAKE) RPI=false CONTACTS=false TOU=false swamid-fiv-test.pub
swamid-externals: swamid-externals1 swamid-externals2
diff --git a/xslt/normalize.xsl b/xslt/normalize.xsl
index c996192b..7de5a90f 100644
--- a/xslt/normalize.xsl
+++ b/xslt/normalize.xsl
@@ -12,7 +12,7 @@
<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
<xsl:template match="/md:EntitiesDescriptor">
- <xsl:comment>
+ <xsl:if test="$tou='true'"><xsl:comment>
IMPORTANT NOTICE: READ CAREFULLY
@@ -29,7 +29,7 @@ The Terms is available at
If You do not accept these Terms, then You must not continue to use this Metadata.
- </xsl:comment>
+ </xsl:comment></xsl:if>
<md:EntitiesDescriptor>
<xsl:attribute name="Name"><xsl:value-of select="@Name"/></xsl:attribute>
<xsl:if test="@cacheDuration">