Author: bdonlan
Date: 2005-01-07 17:44:06 -0500 (Fri, 07 Jan 2005)
New Revision: 538
Added:
trunk/web/findvalidator.sh
Modified:
/
trunk/web/Makefile
trunk/web/README
trunk/web/clients/index.thtml
Log:
Add Time::Piece dependency to README
Add Image::Size to README
Fix typo in clients/index.thtml
Use xmllint if validate is unavailable
Property changes on:
___________________________________________________________________
Name: svk:merge
- 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local:11218
+ 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local:11225
Modified: trunk/web/Makefile
===================================================================
--- trunk/web/Makefile 2005-01-07 21:50:59 UTC (rev 537)
+++ trunk/web/Makefile 2005-01-07 22:44:06 UTC (rev 538)
@@ -19,7 +19,7 @@
FIX = ./bin/fixhtml
RSYNC = rsync
TIDY = tidy
-VALIDATE = validate
+VALIDATE = $(shell sh findvalidator.sh)
TAR = tar
SFUSER = $(shell cat ~/.sfuser)
Modified: trunk/web/README
===================================================================
--- trunk/web/README 2005-01-07 21:50:59 UTC (rev 537)
+++ trunk/web/README 2005-01-07 22:44:06 UTC (rev 538)
@@ -1,8 +1,10 @@
We require a few standard tools to build the haver website:
* perl
+ * Time::Piece
+ * Image::Size
* Template Toolkit, from CPAN as Template. (libtemplate-perl)
* XML::DOM (libxml-dom-perl)
- * validate (wdg-html-validator)
+ * validate (wdg-html-validator) or xmllint
* html tidy.
* GNU Make
* rsync
Modified: trunk/web/clients/index.thtml
===================================================================
--- trunk/web/clients/index.thtml 2005-01-07 21:50:59 UTC (rev 537)
+++ trunk/web/clients/index.thtml 2005-01-07 22:44:06 UTC (rev 538)
@@ -10,7 +10,7 @@
<a href="javer">Javer</a>, developed by
<a href="https://gna.org/users/bdonlan/";>Bryan Donlan</a>,
<a href="havernet/">HaverNet</a>, developed by <a
href="https://gna.org/users/elasticmuffin/";>Muffin</a>,
- and an unnamed cilent using Term::Visual, developed by
+ and an unnamed client using Term::Visual, developed by
<a href="https://gna.org/users/nornagon";>Nornagon</a>.
</p>
Added: trunk/web/findvalidator.sh
===================================================================
--- trunk/web/findvalidator.sh 2005-01-07 21:50:59 UTC (rev 537)
+++ trunk/web/findvalidator.sh 2005-01-07 22:44:06 UTC (rev 538)
@@ -0,0 +1,6 @@
+#!/bin/sh
+which validator 2>/dev/null && exit 0
+if which xmllint &>/dev/null; then
+ which xmllint | tr -d "\n"
+ echo " --valid --noout"
+fi
Property changes on: trunk/web/findvalidator.sh
___________________________________________________________________
Name: svk:executable
+ *
Name: svn:eol-style
+ native
