Merge branch 'master' into build
Conflicts: default.mk.in
This commit is contained in:
commit
319984b6b8
|
@ -15,8 +15,8 @@ build: $(OUTPUTS)
|
||||||
clean:
|
clean:
|
||||||
rm -rf $(OUTDIR)
|
rm -rf $(OUTDIR)
|
||||||
|
|
||||||
XSLTARGS = g_date=`date -I` g_time=`date +%H:%M:%S` \
|
XSLTARGS=g_date=`date -I` g_time=`date +%H:%M:%S`
|
||||||
g_pwd="$$(pwd)" g_root="$(ROOT)" g_outdir="$(OUTDIR)"
|
g_datetime="`date --rfc-3339=seconds`" pwd="$$(pwd)" g_root="$(ROOT)"
|
||||||
CLASSPATH = /users/www/saxon8/saxon8.jar
|
CLASSPATH = /users/www/saxon8/saxon8.jar
|
||||||
|
|
||||||
$(OUTDIR)%.html: %.xml $(ROOT)/csc.dtd $(ROOT)/xsl/*.xsl $(ROOT)/events.xml $(ROOT)/news.xml directory.xml
|
$(OUTDIR)%.html: %.xml $(ROOT)/csc.dtd $(ROOT)/xsl/*.xsl $(ROOT)/events.xml $(ROOT)/news.xml directory.xml
|
||||||
|
|
|
@ -8,9 +8,6 @@
|
||||||
xmlns:csc="http://csclub.uwaterloo.ca/xslt">
|
xmlns:csc="http://csclub.uwaterloo.ca/xslt">
|
||||||
|
|
||||||
<xsl:param name="g_datetime" required="yes" />
|
<xsl:param name="g_datetime" required="yes" />
|
||||||
<xsl:param name="g_time" required="yes" />
|
|
||||||
<xsl:param name="g_pwd" required="yes" />
|
|
||||||
<xsl:param name="g_root" required="yes" />
|
|
||||||
|
|
||||||
<xsl:template match="//eventdefs">
|
<xsl:template match="//eventdefs">
|
||||||
<xsl:call-template name="atom">
|
<xsl:call-template name="atom">
|
||||||
|
@ -36,7 +33,7 @@
|
||||||
<title>UW Computer Science Club <xsl:value-of select="$title"/></title>
|
<title>UW Computer Science Club <xsl:value-of select="$title"/></title>
|
||||||
<link href="http://csclub.uwaterloo.ca/{$feedfile}" rel="self"/>
|
<link href="http://csclub.uwaterloo.ca/{$feedfile}" rel="self"/>
|
||||||
<link href="http://csclub.uwaterloo.ca/"/>
|
<link href="http://csclub.uwaterloo.ca/"/>
|
||||||
<updated><xsl:value-of select="$g_date"/></updated>
|
<updated><xsl:value-of select="$g_datetime"/></updated>
|
||||||
<id>urn:uuid:<xsl:value-of select="$uuid"/></id>
|
<id>urn:uuid:<xsl:value-of select="$uuid"/></id>
|
||||||
<author>
|
<author>
|
||||||
<name>University of Waterloo Computer Science Club</name>
|
<name>University of Waterloo Computer Science Club</name>
|
||||||
|
|
Loading…
Reference in New Issue