old
/
old-website
2
0
Fork 0
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

Merge branch 'master' into build 

Conflicts:

	default.mk.in
This commit is contained in:
David Bartley 2007-10-06 16:29:17 -04:00
parent 5a336c0488 06b93863ff
commit 319984b6b8
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.mk.in
View File

@ -15,8 +15,8 @@ build: $(OUTPUTS)
clean:
rm -rf $(OUTDIR)
XSLTARGS = g_date=`date -I` g_time=`date +%H:%M:%S` \
g_pwd="$$(pwd)" g_root="$(ROOT)" g_outdir="$(OUTDIR)"
XSLTARGS=g_date=`date -I` g_time=`date +%H:%M:%S`
g_datetime="`date --rfc-3339=seconds`" pwd="$$(pwd)" g_root="$(ROOT)"
CLASSPATH = /users/www/saxon8/saxon8.jar
$(OUTDIR)%.html: %.xml $(ROOT)/csc.dtd $(ROOT)/xsl/*.xsl $(ROOT)/events.xml $(ROOT)/news.xml directory.xml

5
xsl/atom.xsl
View File

@ -8,9 +8,6 @@
xmlns:csc="http://csclub.uwaterloo.ca/xslt">
<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:call-template name="atom">
@ -36,7 +33,7 @@
<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/"/>
<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>
<author>
<name>University of Waterloo Computer Science Club</name>