[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun ChangeLog Makefile...
|
From: |
Yavor Doganov |
|
Subject: |
trans-coord/gnun/server/gnun ChangeLog Makefile... |
|
Date: |
Sat, 22 Nov 2008 21:29:10 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Yavor Doganov <yavor> 08/11/22 21:29:10
Modified files:
gnun/server/gnun: ChangeLog Makefile.am gnun.texi make-prototype
validate-html-notify validate-html-notify.in
Added files:
gnun/server/gnun: gnun-validate-html gnun-validate-html.in
Removed files:
gnun/server/gnun: validate-html validate-html.in
Log message:
* Makefile.am (bin_SCRIPTS): Set to `gnun-validate-html'.
(validate-html): Rename as...
(gnun-validate-html): ...to avoid clashes and confusion.
(EXTRA_DIST, CLEANFILES): Use the new name.
* validate-html-notify.in: Adjust for the new program name.
* gnun-validate-html.in: New file.
* validate-html.in: Delete.
* gnun.texi (Webmaster Tips, validate-html-notify): Refer to
`gnun-validate-html'.
(validate-html): Rename as...
(gnun-validate-html): ...for consistency.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/Makefile.am?cvsroot=trans-coord&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun.texi?cvsroot=trans-coord&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/make-prototype?cvsroot=trans-coord&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/validate-html-notify?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/validate-html-notify.in?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-validate-html?cvsroot=trans-coord&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-validate-html.in?cvsroot=trans-coord&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/validate-html?cvsroot=trans-coord&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/validate-html.in?cvsroot=trans-coord&r1=1.4&r2=0
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- ChangeLog 21 Nov 2008 21:51:03 -0000 1.111
+++ ChangeLog 22 Nov 2008 21:29:08 -0000 1.112
@@ -1,3 +1,17 @@
+2008-11-22 Yavor Doganov <address@hidden>
+
+ * Makefile.am (bin_SCRIPTS): Set to `gnun-validate-html'.
+ (validate-html): Rename as...
+ (gnun-validate-html): ...to avoid clashes and confusion.
+ (EXTRA_DIST, CLEANFILES): Use the new name.
+ * validate-html-notify.in: Adjust for the new program name.
+ * gnun-validate-html.in: New file.
+ * validate-html.in: Delete.
+ * gnun.texi (Webmaster Tips, validate-html-notify): Refer to
+ `gnun-validate-html'.
+ (validate-html): Rename as...
+ (gnun-validate-html): ...for consistency.
+
2008-11-21 Yavor Doganov <address@hidden>
* Makefile.am (EXTRA_DIST): Remove COPYING.DOC.
Index: Makefile.am
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Makefile.am 21 Nov 2008 21:51:03 -0000 1.5
+++ Makefile.am 22 Nov 2008 21:29:08 -0000 1.6
@@ -23,7 +23,7 @@
pkglibexecdir = $(libexecdir)/$(PACKAGE)
-bin_SCRIPTS = validate-html
+bin_SCRIPTS = gnun-validate-html
noinst_SCRIPTS = stamp-config.mk
pkglibexec_SCRIPTS = validate-html-notify
dist_pkglibexec_SCRIPTS = make-prototype mailfail
@@ -36,7 +36,7 @@
-e 's|@address@hidden|$(prefix)|g' \
-e 's|@address@hidden|$(pkglibexecdir)|g'
-validate-html validate-html-notify: Makefile
+gnun-validate-html validate-html-notify: Makefile
rm -f $@ address@hidden
$(edit) '$(srcdir)/address@hidden' >address@hidden
chmod +x address@hidden
@@ -47,7 +47,7 @@
mv $<.tmp $<
touch $@
-validate-html: $(srcdir)/validate-html.in
+gnun-validate-html: $(srcdir)/gnun-validate-html.in
validate-html-notify: $(srcdir)/validate-html-notify.in
info_TEXINFOS = gnun.texi
@@ -56,6 +56,6 @@
doc_DATA = TODO
EXTRA_DIST = GNUmakefile gnun.mk GNUmakefile.team \
- validate-html.in validate-html-notify.in
+ gnun-validate-html.in validate-html-notify.in
-CLEANFILES = validate-html validate-html-notify stamp-config.mk
+CLEANFILES = gnun-validate-html validate-html-notify stamp-config.mk
Index: gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/gnun.texi,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- gnun.texi 3 Nov 2008 17:40:22 -0000 1.39
+++ gnun.texi 22 Nov 2008 21:29:09 -0000 1.40
@@ -1528,18 +1528,16 @@
fails if the original article contains such characters---but we are
ready to fix any errors a webmaster makes.
-The script @command{validate-html} is useful for webmasters who want to
-verify if their (potentially intrusive) changes result in a valid
-markup. It is recommended to make a symlink somewhere in your
address@hidden (like @file{~/bin})---that way you will automatically use the
-latest version, provided that you regularly update your working copy.
-Before committing your changes, you can check if it is valid by running
+The script @command{gnun-validate-html} is useful for webmasters who
+want to verify if their (potentially intrusive) changes result in a
+valid markup. Before committing your changes, you can check if it is
+valid by running
@example
-validate-html philosophy/not-ipr.html
+gnun-validate-html philosophy/not-ipr.html
@end example
address@hidden, for more information.
address@hidden, for more information.
@c Emacs Lisp code goes here...
@@ -1599,7 +1597,7 @@
@menu
* make-prototype::
-* validate-html::
+* gnun-validate-html::
* mailfail::
* validate-html-notify::
@end menu
@@ -1665,8 +1663,8 @@
Print usage information on stdout.
@end table
address@hidden validate-html
address@hidden The @command{validate-html} Script
address@hidden gnun-validate-html
address@hidden The @command{gnun-validate-html} Script
@cindex validation, XHTML
This is a Bash script whose purpose is to ``validate'' both the
@@ -1738,10 +1736,10 @@
@node validate-html-notify
@subsection The @command{validate-html-notify} Script
-This script is a wrapper around @command{validate-html}
-(@pxref{validate-html}); it is necessary because it is hard to capture
-the output of the program from a program that itself captures the output
-of another program that it runs.
+This script is a wrapper around @command{gnun-validate-html}
+(@pxref{gnun-validate-html}); it is necessary because it is hard to
+capture the output of the program from a program that itself captures
+the output of another program that it runs.
Usage:
Index: make-prototype
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/make-prototype,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- make-prototype 20 Feb 2008 09:11:08 -0000 1.1
+++ make-prototype 22 Nov 2008 21:29:09 -0000 1.2
@@ -1,6 +1,7 @@
#!/usr/bin/guile \
-e main --debug -s
!#
+;; make-prototype. Generated from make-prototype.in by configure.
;; Copyright (C) 2007, 2008 Free Software Foundation, Inc.
Index: validate-html-notify
===================================================================
RCS file:
/sources/trans-coord/trans-coord/gnun/server/gnun/validate-html-notify,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- validate-html-notify 27 Feb 2008 13:24:51 -0000 1.2
+++ validate-html-notify 22 Nov 2008 21:29:09 -0000 1.3
@@ -19,14 +19,14 @@
# Usage:
#
-# ./validate-html-notify [--dry-run] RCPT FILE
+# validate-html-notify [--dry-run] RCPT FILE
#
# Example:
#
-# ./validate-html-notify address@hidden article.html
+# validate-html-notify address@hidden article.html
function usage() {
- echo 1>&2 Usage: ./validate-html-notify [--dry-run] RCPT FILE
+ echo 1>&2 Usage: validate-html-notify [--dry-run] RCPT FILE
exit 1
}
@@ -49,4 +49,4 @@
SUBJ="[GNUN Error] ${FILE#../../} is not valid XHTML"
-./mailfail $DRY_RUN "$RCPT" "$SUBJ" ./validate-html "$FILE"
+./mailfail $DRY_RUN "$RCPT" "$SUBJ" ./gnun-validate-html "$FILE"
Index: validate-html-notify.in
===================================================================
RCS file:
/sources/trans-coord/trans-coord/gnun/server/gnun/validate-html-notify.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- validate-html-notify.in 6 Nov 2008 21:35:31 -0000 1.3
+++ validate-html-notify.in 22 Nov 2008 21:29:10 -0000 1.4
@@ -19,14 +19,14 @@
# Usage:
#
-# ./validate-html-notify [--dry-run] RCPT FILE
+# validate-html-notify [--dry-run] RCPT FILE
#
# Example:
#
-# ./validate-html-notify address@hidden article.html
+# validate-html-notify address@hidden article.html
function usage() {
- echo 1>&2 Usage: ./validate-html-notify [--dry-run] RCPT FILE
+ echo 1>&2 Usage: validate-html-notify [--dry-run] RCPT FILE
exit 1
}
@@ -49,4 +49,4 @@
SUBJ="[GNUN Error] ${FILE#../../} is not valid XHTML"
address@hidden@/mailfail $DRY_RUN "$RCPT" "$SUBJ" validate-html "$FILE"
address@hidden@/mailfail $DRY_RUN "$RCPT" "$SUBJ" gnun-validate-html "$FILE"
Index: gnun-validate-html
===================================================================
RCS file: gnun-validate-html
diff -N gnun-validate-html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnun-validate-html 22 Nov 2008 21:29:09 -0000 1.1
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# Copyright (C) 2008 Free Software Foundation, Inc.
+
+# This file is part of GNUnited Nations.
+
+# GNUnited Nations is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+
+# GNUnited Nations is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNUnited Nations. If not, see <http://www.gnu.org/licenses/>.
+
+function version () {
+cat <<EOF
+gnun-validate-html (GNUnited Nations) 0.1
+Copyright (C) 2008 Free Software Foundation, Inc.
+You may redistribute copies of GNUnited Nations
+under the terms of the GNU General Public License.
+For more information about these matters, see the file named COPYING.
+EOF
+}
+
+function usage () {
+cat <<EOF
+Usage: gnun-validate-html OPTION | FILE
+
+Options:
+ --version Just print version info and return
+ --help Print this usage information message
+
+Report bugs to address@hidden
+EOF
+}
+
+set -e
+set -o pipefail
+
+case "$1" in
+ --help )
+ usage
+ exit 0
+ ;;
+ --version )
+ version
+ exit 0
+ ;;
+ * )
+ ;;
+esac
+
+if [ $# -ne 1 ]; then
+ echo 1>&2 Error: FILE argument is required. See --help for details.
+ exit 1
+fi
+
+ROOT=../..
+DTD=$HOME/dtd
+
+# Create two tempfiles and mark them for deletion on exit.
+TMP1=`mktemp -t gnun.1.XXXXXX`
+TMP2=`mktemp -t gnun.2.XXXXXX`
+trap "rm -f $TMP1 $TMP2" EXIT
+
+# Expand input file's #include directives and save the result in
+# $TMP1.
+cat $1 | sed "s/<\!--#include virtual=\"\/\?\(.*\)\" -->/include(\`\1')/g" \
+ | m4 -EE -I $ROOT > $TMP1
+
+# Execute xmllint on $TMP1 and save it's output to $TMP2.
+set +o pipefail
+set +e
+cat $TMP1 | xmllint --path "$DTD" --valid --nonet --noout - 2> $TMP2
+LINTSTATUS=$?
+set -e
+set -o pipefail
+
+# Parse xmllint's error output (if any) and print it by inserting
+# additional context line after every occurrence of "line X" where X
+# is a decimal number. It is helpful to show the contents of those
+# mentioned lines, since xmllint runs on intermediate input file (with
+# expanded #include directives) and the translator can not easily look
+# up for references in it.
+cat $TMP2 | sed '
+ /line [[:digit:]]\+/ {
+ p
+ s=^.*line \([[:digit:]]\+\).*$=head -n \1 '"$TMP1"' | tail -n 1=
+ e
+ }'
+
+# Exit with xmlint's original exit status.
+exit $LINTSTATUS
Index: gnun-validate-html.in
===================================================================
RCS file: gnun-validate-html.in
diff -N gnun-validate-html.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnun-validate-html.in 22 Nov 2008 21:29:09 -0000 1.1
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# Copyright (C) 2008 Free Software Foundation, Inc.
+
+# This file is part of GNUnited Nations.
+
+# GNUnited Nations is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+
+# GNUnited Nations is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNUnited Nations. If not, see <http://www.gnu.org/licenses/>.
+
+function version () {
+cat <<EOF
+gnun-validate-html (@PACKAGE_NAME@) @PACKAGE_VERSION@
+Copyright (C) 2008 Free Software Foundation, Inc.
+You may redistribute copies of @PACKAGE_NAME@
+under the terms of the GNU General Public License.
+For more information about these matters, see the file named COPYING.
+EOF
+}
+
+function usage () {
+cat <<EOF
+Usage: gnun-validate-html OPTION | FILE
+
+Options:
+ --version Just print version info and return
+ --help Print this usage information message
+
+Report bugs to @PACKAGE_BUGREPORT@
+EOF
+}
+
+set -e
+set -o pipefail
+
+case "$1" in
+ --help )
+ usage
+ exit 0
+ ;;
+ --version )
+ version
+ exit 0
+ ;;
+ * )
+ ;;
+esac
+
+if [ $# -ne 1 ]; then
+ echo 1>&2 Error: FILE argument is required. See --help for details.
+ exit 1
+fi
+
+ROOT=../..
address@hidden@
+
+# Create two tempfiles and mark them for deletion on exit.
+TMP1=`mktemp -t gnun.1.XXXXXX`
+TMP2=`mktemp -t gnun.2.XXXXXX`
+trap "rm -f $TMP1 $TMP2" EXIT
+
+# Expand input file's #include directives and save the result in
+# $TMP1.
+cat $1 | sed "s/<\!--#include virtual=\"\/\?\(.*\)\" -->/include(\`\1')/g" \
+ | m4 -EE -I $ROOT > $TMP1
+
+# Execute xmllint on $TMP1 and save it's output to $TMP2.
+set +o pipefail
+set +e
+cat $TMP1 | xmllint --path "$DTD" --valid --nonet --noout - 2> $TMP2
+LINTSTATUS=$?
+set -e
+set -o pipefail
+
+# Parse xmllint's error output (if any) and print it by inserting
+# additional context line after every occurrence of "line X" where X
+# is a decimal number. It is helpful to show the contents of those
+# mentioned lines, since xmllint runs on intermediate input file (with
+# expanded #include directives) and the translator can not easily look
+# up for references in it.
+cat $TMP2 | sed '
+ /line [[:digit:]]\+/ {
+ p
+ s=^.*line \([[:digit:]]\+\).*$=head -n \1 '"$TMP1"' | tail -n 1=
+ e
+ }'
+
+# Exit with xmlint's original exit status.
+exit $LINTSTATUS
Index: validate-html
===================================================================
RCS file: validate-html
diff -N validate-html
--- validate-html 2 Nov 2008 18:50:31 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2008 Free Software Foundation, Inc.
-
-# This file is part of GNUnited Nations.
-
-# GNUnited Nations is free software: you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# GNUnited Nations is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with GNUnited Nations. If not, see <http://www.gnu.org/licenses/>.
-
-set -e
-set -o pipefail
-
-if [ $# -ne 1 ]; then
- echo 1>&2 Error: The script requires a FILE as argument.
- exit 1
-fi
-
-ROOT=../..
-DTD=$HOME/dtd
-
-# Create two tempfiles and mark them for deletion on exit.
-TMP1=`mktemp -t gnun.1.XXXXXX`
-TMP2=`mktemp -t gnun.2.XXXXXX`
-trap "rm -f $TMP1 $TMP2" EXIT
-
-# Expand input file's #include directives and save the result in
-# $TMP1.
-cat $1 | sed "s/<\!--#include virtual=\"\/\?\(.*\)\" -->/include(\`\1')/g" \
- | m4 -EE -I $ROOT > $TMP1
-
-# Execute xmllint on $TMP1 and save it's output to $TMP2.
-set +o pipefail
-set +e
-cat $TMP1 | xmllint --path "$DTD" --valid --nonet --noout - 2> $TMP2
-LINTSTATUS=$?
-set -e
-set -o pipefail
-
-# Parse xmllint's error output (if any) and print it by inserting
-# additional context line after every occurrence of "line X" where X
-# is a decimal number. It is helpful to show the contents of those
-# mentioned lines, since xmllint runs on intermediate input file (with
-# expanded #include directives) and the translator can not easily look
-# up for references in it.
-cat $TMP2 | sed '
- /line [[:digit:]]\+/ {
- p
- s=^.*line \([[:digit:]]\+\).*$=head -n \1 '"$TMP1"' | tail -n 1=
- e
- }'
-
-# Exit with xmlint's original exit status.
-exit $LINTSTATUS
Index: validate-html.in
===================================================================
RCS file: validate-html.in
diff -N validate-html.in
--- validate-html.in 16 Nov 2008 10:33:56 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,98 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2008 Free Software Foundation, Inc.
-
-# This file is part of GNUnited Nations.
-
-# GNUnited Nations is free software: you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# GNUnited Nations is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with GNUnited Nations. If not, see <http://www.gnu.org/licenses/>.
-
-function version () {
-cat <<EOF
-validate-html (@PACKAGE_NAME@) @PACKAGE_VERSION@
-Copyright (C) 2008 Free Software Foundation, Inc.
-You may redistribute copies of @PACKAGE_NAME@
-under the terms of the GNU General Public License.
-For more information about these matters, see the file named COPYING.
-EOF
-}
-
-function usage () {
-cat <<EOF
-Usage: validate-html OPTION | FILE
-
-Options:
- --version Just print version info and return
- --help Print this usage information message
-
-Report bugs to @PACKAGE_BUGREPORT@
-EOF
-}
-
-set -e
-set -o pipefail
-
-case "$1" in
- --help )
- usage
- exit 0
- ;;
- --version )
- version
- exit 0
- ;;
- * )
- ;;
-esac
-
-if [ $# -ne 1 ]; then
- echo 1>&2 Error: FILE argument is required. See --help for details.
- exit 1
-fi
-
-ROOT=../..
address@hidden@
-
-# Create two tempfiles and mark them for deletion on exit.
-TMP1=`mktemp -t gnun.1.XXXXXX`
-TMP2=`mktemp -t gnun.2.XXXXXX`
-trap "rm -f $TMP1 $TMP2" EXIT
-
-# Expand input file's #include directives and save the result in
-# $TMP1.
-cat $1 | sed "s/<\!--#include virtual=\"\/\?\(.*\)\" -->/include(\`\1')/g" \
- | m4 -EE -I $ROOT > $TMP1
-
-# Execute xmllint on $TMP1 and save it's output to $TMP2.
-set +o pipefail
-set +e
-cat $TMP1 | xmllint --path "$DTD" --valid --nonet --noout - 2> $TMP2
-LINTSTATUS=$?
-set -e
-set -o pipefail
-
-# Parse xmllint's error output (if any) and print it by inserting
-# additional context line after every occurrence of "line X" where X
-# is a decimal number. It is helpful to show the contents of those
-# mentioned lines, since xmllint runs on intermediate input file (with
-# expanded #include directives) and the translator can not easily look
-# up for references in it.
-cat $TMP2 | sed '
- /line [[:digit:]]\+/ {
- p
- s=^.*line \([[:digit:]]\+\).*$=head -n \1 '"$TMP1"' | tail -n 1=
- e
- }'
-
-# Exit with xmlint's original exit status.
-exit $LINTSTATUS