[libvirt] web page suggestion
My XSL skills are less than stellar, so I'm throwing this out to the list in case someone else can pick it up and come up with a decent patch in less time. Right now, http://libvirt.org/ChangeLog.html is worthless; it is linked from a couple of other pages, such as http://libvirt.org/news.html. A better place to link would be a live git page: http://libvirt.org/git/?p=libvirt.git;a=log I don't know whether it is easier to update news.html.in and sitemap.html.in to point directly to the new link, or if we should keep ChangeLog.xsl but have it revamped to point to the new link. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On Mon, Aug 16, 2010 at 11:29:04AM -0600, Eric Blake wrote:
My XSL skills are less than stellar, so I'm throwing this out to the list in case someone else can pick it up and come up with a decent patch in less time.
Right now, http://libvirt.org/ChangeLog.html is worthless; it is linked from a couple of other pages, such as http://libvirt.org/news.html. A better place to link would be a live git page: http://libvirt.org/git/?p=libvirt.git;a=log
I don't know whether it is easier to update news.html.in and sitemap.html.in to point directly to the new link, or if we should keep ChangeLog.xsl but have it revamped to point to the new link.
Just delete ChangeLog.xsl/.html completely. These were needed when we had CVS because there was no online history browser, but we don't need it in the GITWEB enabled world Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
We instead point to the live git log URL for the few links still needing to point to something. --- docs/ChangeLog.awk | 49 ------------------------------------------------- docs/ChangeLog.xsl | 37 ------------------------------------- docs/Makefile.am | 13 +------------ docs/news.html.in | 2 +- docs/sitemap.html.in | 2 +- 5 files changed, 3 insertions(+), 100 deletions(-) delete mode 100755 docs/ChangeLog.awk delete mode 100644 docs/ChangeLog.xsl diff --git a/docs/ChangeLog.awk b/docs/ChangeLog.awk deleted file mode 100755 index d9d92fc..0000000 --- a/docs/ChangeLog.awk +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/awk -f -function translate(str) { - while (sub(/&/, "#amp;", str) == 1); - while (sub(/#amp;/, "\\&", str) == 1); # fun isn't it ? - while (sub(/</, "\\<", str) == 1); - while (sub(/>/, "\\>", str) == 1); - sub(/[0-9][0-9][0-9][0-9][0-9]+/, "<bug number='&'/>", str) - return(str) -} -BEGIN { - nb_entry = 0 - in_entry = 0 - in_item = 0 - print "<?xml version='1.0' encoding='ISO-8859-1'?>" - print "<log>" - } -END { - if (in_item == 1) printf("%s</item>\n", translate(item)) - if (in_entry == 1) print " </entry>" - print "</log>" - } -/^[ \t]*$/ { next } -/^[A-Za-z0-9]/ { - match($0, "\(.*\) \([A-Z]+\) \([0-9][0-9][0-9][0-9]\) \(.*\) <\(.*\)>", loge) - if (in_item == 1) printf("%s</item>\n", translate(item)) - if (in_entry == 1) print " </entry>" - nb_entry = nb_entry + 1 - if (nb_entry > 50) { - in_entry = 0 - in_item = 0 - exit - } - in_entry = 1 - in_item = 0 - printf(" <entry date='%s' timezone='%s' year='%s'\n who='%s' email='%s'>\n", loge[1], loge[2], loge[3], loge[4], loge[5]) - } -/^[ \t]*\*/ { - if (in_item == 1) printf("%s</item>\n", translate(item)) - in_item = 1 - printf(" <item>") - match($0, "[ \t]*. *\(.*\)", loge) - item = loge[1] - } -/^[ \t]*[a-zA-Z0-9\#]/ { - if (in_item == 1) { - match($0, "[ \t]*\(.*\)[ \t]*", loge) - item = sprintf("%s %s", item, loge[1]) - } - } diff --git a/docs/ChangeLog.xsl b/docs/ChangeLog.xsl deleted file mode 100644 index f2c6816..0000000 --- a/docs/ChangeLog.xsl +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0"?> -<!-- this stylesheet builds the ChangeLog.html --> -<xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - - <!-- Generate XHTML-1.0 transitional --> - <xsl:output method="xml" encoding="UTF-8" indent="yes" - doctype-public="-//W3C//DTD XHTML 1.0//EN" - doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/> - - <xsl:template match="item"> - <li><xsl:apply-templates/></li> - </xsl:template> - - <xsl:template match="entry"> - <p> - <span class="author"><xsl:value-of select="@who"/> </span> - <span class="date"><xsl:value-of select="@date"/> </span> - <span class="timezone"><xsl:value-of select="@timezone"/> </span> - </p> - <ul> - <xsl:apply-templates select="item"/> - </ul> - </xsl:template> - - <xsl:template match="log"> - <html> - <body> - <h1>Log of recent changes to libvirt</h1> - <div id="changelog"> - <xsl:apply-templates select="entry"/> - </div> - </body> - </html> - </xsl:template> - -</xsl:stylesheet> diff --git a/docs/Makefile.am b/docs/Makefile.am index 13ab0c2..ae13c46 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -73,13 +73,12 @@ fig = \ EXTRA_DIST= \ apibuild.py \ - site.xsl newapi.xsl news.xsl page.xsl ChangeLog.xsl \ + site.xsl newapi.xsl news.xsl page.xsl \ $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \ $(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \ $(xml) $(fig) $(png) \ $(patches) \ sitemap.html.in \ - ChangeLog.awk \ todo.pl todo.cfg-example MAINTAINERCLEANFILES = $(dot_html) $(apihtml) $(devhelphtml) @@ -90,16 +89,6 @@ api: libvirt-api.xml libvirt-refs.xml web: $(dot_html) html/index.html devhelp/index.html -ChangeLog.xml: ../ChangeLog ChangeLog.awk - $(AWK) -f ChangeLog.awk < $< > $@ - -ChangeLog.html.in: ChangeLog.xml ChangeLog.xsl - @if [ -x $(XSLTPROC) ] ; then \ - echo "Generating $@"; \ - name=`echo $@ | sed -e 's/.tmp//'`; \ - $(XSLTPROC) --nonet $(top_srcdir)/docs/ChangeLog.xsl $< > $@ \ - || { rm $@ && exit 1; }; fi - todo.html.in: todo.pl if [ -f todo.cfg ]; then \ echo "Generating $@"; \ diff --git a/docs/news.html.in b/docs/news.html.in index 4a9329d..bbf1e8b 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -6,7 +6,7 @@ <body> <h1 >Releases</h1> <p>Here is the list of official releases, it is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list -and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> +and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> to gauge progress.</p> <h3>0.8.4: Sep 10 2010</h3> <ul> <li> Features: diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 5f46b59..f09b2c0 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -13,7 +13,7 @@ <span>Details of new features and bugs fixed in each release</span> <ul> <li> - <a href="ChangeLog.html">Changelog</a> + <a href="http://libvirt.org/git/?p=libvirt.git;a=log">Git log</a> <span>Latest commit messages from the source repository </span> </li> </ul> -- 1.7.3
On Fri, Oct 22, 2010 at 05:10:39PM +1100, Justin Clift wrote:
We instead point to the live git log URL for the few links still needing to point to something. --- docs/ChangeLog.awk | 49 ------------------------------------------------- docs/ChangeLog.xsl | 37 ------------------------------------- docs/Makefile.am | 13 +------------ docs/news.html.in | 2 +- docs/sitemap.html.in | 2 +- 5 files changed, 3 insertions(+), 100 deletions(-) delete mode 100755 docs/ChangeLog.awk delete mode 100644 docs/ChangeLog.xsl
ACK Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
On 10/22/2010 10:11 PM, Daniel P. Berrange wrote:
On Fri, Oct 22, 2010 at 05:10:39PM +1100, Justin Clift wrote:
We instead point to the live git log URL for the few links still needing to point to something. <snip>
ACK
Thanks Daniel, pushed.
participants (3)
-
Daniel P. Berrange -
Eric Blake -
Justin Clift