make this script pass on errors caused by autoconf, automake, etc rather
2005-05-20 James Henstridge <james@jamesh.id.au> * autogen.sh: make this script pass on errors caused by autoconf, automake, etc rather than continuing to run. Also call automake with the --foreign argument so it doesn't complain about missing AUTHORS and NEWS files. * rules.common: use xsltproc to process the *.wml documents. * include/add-header.xsl: new XSLT script that takes the place of evilsedhack. * foundation.gnome.org/elections/2004/preliminary-results.wml: same here. * foundation.gnome.org/elections/2004/candidates.wml: add a <meta> tag to set the charset of the document to UTF-8, so it can be parsed correctly as HTML.
This commit is contained in:
James Henstridge
James Henstridge
parent
8e51bd011c
commit
1b1bf098af
7 changed files with 152 additions and 6 deletions
19
ChangeLog
19
ChangeLog
|
|
@ -1,3 +1,22 @@
|
||||||
|
2005-05-20 James Henstridge <james@jamesh.id.au>
|
||||||
|
|
||||||
|
* autogen.sh: make this script pass on errors caused by
|
||||||
|
autoconf, automake, etc rather than continuing to run.
|
||||||
|
Also call automake with the --foreign argument so it doesn't
|
||||||
|
complain about missing AUTHORS and NEWS files.
|
||||||
|
|
||||||
|
* rules.common: use xsltproc to process the *.wml documents.
|
||||||
|
|
||||||
|
* include/add-header.xsl: new XSLT script that takes the place of
|
||||||
|
evilsedhack.
|
||||||
|
|
||||||
|
* foundation.gnome.org/elections/2004/preliminary-results.wml:
|
||||||
|
same here.
|
||||||
|
|
||||||
|
* foundation.gnome.org/elections/2004/candidates.wml: add a <meta>
|
||||||
|
tag to set the charset of the document to UTF-8, so it can be
|
||||||
|
parsed correctly as HTML.
|
||||||
|
|
||||||
2005-03-24 Murray Cumming <murrayc@murrayc.com>
|
2005-03-24 Murray Cumming <murrayc@murrayc.com>
|
||||||
|
|
||||||
* foundation.gnome.org/about/index.wml:
|
* foundation.gnome.org/about/index.wml:
|
||||||
|
|
|
||||||
|
|
@ -44,14 +44,14 @@ if test -z "$*"; then
|
||||||
echo "to pass any to it, please specify them on the $0 command line."
|
echo "to pass any to it, please specify them on the $0 command line."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
aclocal
|
aclocal || exit $?
|
||||||
automake --add-missing
|
autoconf || exit $?
|
||||||
autoconf
|
automake --add-missing --foreign || exit $?
|
||||||
|
|
||||||
cd $ORIGDIR
|
cd $ORIGDIR
|
||||||
|
|
||||||
echo "Running $srcdir/configure --enable-maintainer-mode" "$@"
|
echo "Running $srcdir/configure --enable-maintainer-mode" "$@"
|
||||||
$srcdir/configure --enable-maintainer-mode "$@"
|
$srcdir/configure --enable-maintainer-mode "$@" || exit $?
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "Now type 'make' to compile foundation-web."
|
echo "Now type 'make' to compile foundation-web."
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<title>GNOME Foundation 2004 Elections Candidates</title>
|
<title>GNOME Foundation 2004 Elections Candidates</title>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||||
<meta name="cvsdate" content="$Date$" />
|
<meta name="cvsdate" content="$Date$" />
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<title>GNOME Foundation 2004 Elections Preliminary Results</title>
|
<title>GNOME Foundation 2004 Elections Preliminary Results</title>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||||
<meta name="cvsdate" content="$Date$" />
|
<meta name="cvsdate" content="$Date$" />
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
|
|
|
||||||
3
foundation.gnome.org/finance/.cvsignore
Normal file
3
foundation.gnome.org/finance/.cvsignore
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
Makefile
|
||||||
|
Makefile.in
|
||||||
|
index.html
|
||||||
121
include/add-header.xsl
Normal file
121
include/add-header.xsl
Normal file
|
|
@ -0,0 +1,121 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<!DOCTYPE xsl:stylesheet [
|
||||||
|
<!ENTITY copy "©" >
|
||||||
|
<!ENTITY middot "·" >
|
||||||
|
]>
|
||||||
|
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||||
|
xmlns:date="http://exslt.org/dates-and-times"
|
||||||
|
version="1.0" extension-element-prefixes="date">
|
||||||
|
|
||||||
|
<!-- using encoding="US-ASCII" would make the output compatible with
|
||||||
|
both ISO-8859-1 and UTF-8 -->
|
||||||
|
<xsl:output method="xml" encoding="UTF-8" indent="yes"
|
||||||
|
omit-xml-declaration="yes"
|
||||||
|
doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||||
|
doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" />
|
||||||
|
|
||||||
|
<!-- the root directory for the website -->
|
||||||
|
<xsl:param name="root" select="''" />
|
||||||
|
|
||||||
|
<xsl:template match="html">
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
<xsl:copy-of select="@*" />
|
||||||
|
<xsl:apply-templates />
|
||||||
|
</html>
|
||||||
|
</xsl:template>
|
||||||
|
|
||||||
|
<xsl:template match="head">
|
||||||
|
<head xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
<link rel="stylesheet" type="text/css" href="http://www.gnome.org/default.css" />
|
||||||
|
<link rel="stylesheet" type="text/css" href="{$root}/foundation.css" />
|
||||||
|
<link rel="icon" type="image/png" href="http://www.gnome.org/img/logo/foot-16.png" />
|
||||||
|
<xsl:copy-of select="@*" />
|
||||||
|
<xsl:apply-templates select="node()" />
|
||||||
|
</head>
|
||||||
|
</xsl:template>
|
||||||
|
|
||||||
|
<xsl:template match="body">
|
||||||
|
<body xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
<div id="body">
|
||||||
|
<xsl:copy-of select="@*" />
|
||||||
|
<xsl:apply-templates select="node()" />
|
||||||
|
</div>
|
||||||
|
<div id="sidebar">
|
||||||
|
<p class="section">Foundation</p>
|
||||||
|
<ul>
|
||||||
|
<li><a href="{$root}/about/">About the Foundation</a></li>
|
||||||
|
<li><a href="{$root}/membership/">Membership</a></li>
|
||||||
|
<li><a href="{$root}/elections/">Elections</a></li>
|
||||||
|
<li><a href="{$root}/referenda/">Referenda</a></li>
|
||||||
|
<li><a href="{$root}/legal/">Legal</a></li>
|
||||||
|
<li><a href="{$root}/finance/">Finance</a></li>
|
||||||
|
<li><a href="{$root}/contact/">Contact</a></li>
|
||||||
|
</ul>
|
||||||
|
<ul>
|
||||||
|
<li><a href="http://www.gnome.org/press/">Press</a></li>
|
||||||
|
<li><a href="http://www.gnome.org/friends/">Donate to GNOME</a></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="hdr">
|
||||||
|
<div id="logo"><a href="{$root}/"><img src="http://www.gnome.org/img/spacer" alt="Home" /></a></div>
|
||||||
|
<div id="banner"><img src="http://www.gnome.org/img/spacer" alt="" /></div>
|
||||||
|
<p class="none"></p>
|
||||||
|
<div id="hdrNav">
|
||||||
|
<a href="http://www.gnome.org/about/">About GNOME</a> ·
|
||||||
|
<a href="http://www.gnome.org/start/stable/">Download</a> ·
|
||||||
|
<!--<a href="http://www.gnome.org/contribute/"><i>Get Involved!</i></a> ·-->
|
||||||
|
<a href="http://www.gnome.org/">Users</a> ·
|
||||||
|
<a href="http://developer.gnome.org/">Developers</a> ·
|
||||||
|
<a href="http://foundation.gnome.org/"><b>Foundation</b></a> ·
|
||||||
|
<a href="http://www.gnome.org/contact/">Contact</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="copyright">
|
||||||
|
Copyright © <xsl:value-of select="date:year()" />,
|
||||||
|
<a href="http://www.gnome.org/">The GNOME Project</a>.<br />
|
||||||
|
<!-- disabling output escaping in order to leave the email
|
||||||
|
addresses obfuscated -->
|
||||||
|
<xsl:text disable-output-escaping="yes"><![CDATA[
|
||||||
|
Maintained by the GNOME Foundation <a href="mailto:board-list@gnome.org">Board of Directors</a> and <a href="mailto:membership-committee@gnome.org">Membership Committee</a>.
|
||||||
|
]]></xsl:text><br />
|
||||||
|
<a href="http://validator.w3.org/check/referer">Optimised</a> for
|
||||||
|
<a href="http://www.w3.org/">standards</a>.
|
||||||
|
Hosted by <a href="http://www.redhat.com/">Red Hat</a>.
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</xsl:template>
|
||||||
|
|
||||||
|
<!-- copy elements, adding the XHTML namespace to elements with an
|
||||||
|
empty namespace URI -->
|
||||||
|
<xsl:template match="*">
|
||||||
|
<xsl:choose>
|
||||||
|
<xsl:when test="namespace-uri() = ''">
|
||||||
|
<xsl:element namespace="http://www.w3.org/1999/xhtml"
|
||||||
|
name="{local-name()}">
|
||||||
|
<xsl:copy-of select="@*" />
|
||||||
|
<xsl:apply-templates select="node()" />
|
||||||
|
</xsl:element>
|
||||||
|
</xsl:when>
|
||||||
|
<xsl:otherwise>
|
||||||
|
<xsl:copy>
|
||||||
|
<xsl:copy-of select="@*" />
|
||||||
|
<xsl:apply-templates select="node()" />
|
||||||
|
</xsl:copy>
|
||||||
|
</xsl:otherwise>
|
||||||
|
</xsl:choose>
|
||||||
|
</xsl:template>
|
||||||
|
|
||||||
|
<!-- get rid of processing instructions -->
|
||||||
|
<xsl:template match="processing-instruction()">
|
||||||
|
</xsl:template>
|
||||||
|
|
||||||
|
<!-- copy everything else -->
|
||||||
|
<xsl:template match="node()" priority="-1">
|
||||||
|
<xsl:copy>
|
||||||
|
<xsl:apply-templates select="node()" />
|
||||||
|
</xsl:copy>
|
||||||
|
</xsl:template>
|
||||||
|
|
||||||
|
</xsl:stylesheet>
|
||||||
|
|
@ -12,8 +12,9 @@ CLEANFILES = $(BUILT_SOURCES)
|
||||||
|
|
||||||
# Interesting target stuff
|
# Interesting target stuff
|
||||||
|
|
||||||
%.html %.shtml %.php3 %.php %.phtml: %.wml $(top_srcdir)/include/evilsedhack
|
%.html %.shtml %.php3 %.php %.phtml: %.wml $(top_srcdir)/include/add-header.xsl
|
||||||
@$(top_srcdir)/include/evilsedhack $< $(HTTP_PREFIX)/$(SITE) > $@
|
@xsltproc -html --stringparam root $(HTTP_PREFIX)/$(SITE) \
|
||||||
|
$(top_srcdir)/include/add-header.xsl $< > $@
|
||||||
|
|
||||||
.htaccess: htaccess
|
.htaccess: htaccess
|
||||||
@sed -e "s,@SITE@,$(HTTP_PREFIX)/$(SITE)," $< > $@
|
@sed -e "s,@SITE@,$(HTTP_PREFIX)/$(SITE)," $< > $@
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue