[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun AUTHORS ChangeLog ...
From: |
Pavel Kharitonov |
Subject: |
trans-coord/gnun/server/gnun AUTHORS ChangeLog ... |
Date: |
Mon, 24 Oct 2011 06:24:09 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Pavel Kharitonov <ineiev> 11/10/24 06:24:09
Modified files:
gnun/server/gnun: AUTHORS ChangeLog Makefile.am NEWS README
config.mk config.mk.in configure.ac
Added files:
gnun/server/gnun: expand-m4-includes expand-m4-includes.in
Log message:
Replace m4 with a sed script.
The macro procesor was used just to expand includes,
and its other features conflict with GNUN intentions.
* configure.ac: Don't detect m4.
* config.mk.in: Update comment about m4.
* expand-m4-includes.in: New script.
* Makefile.am: Add `expand-m4-includes' script; expand @M4@
as path to expand-m4-includes.
* NEWS, README: Update.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/AUTHORS?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.208&r2=1.209
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/Makefile.am?cvsroot=trans-coord&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/README?cvsroot=trans-coord&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/config.mk?cvsroot=trans-coord&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/config.mk.in?cvsroot=trans-coord&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?cvsroot=trans-coord&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/expand-m4-includes?cvsroot=trans-coord&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/expand-m4-includes.in?cvsroot=trans-coord&rev=1.1
Patches:
Index: AUTHORS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/AUTHORS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AUTHORS 16 Sep 2011 11:42:23 -0000 1.3
+++ AUTHORS 24 Oct 2011 06:24:08 -0000 1.4
@@ -5,14 +5,15 @@
Pavel Kharitonov <address@hidden>
- Add dtd/html5.dtd (based on W3C DTD),
+ Add dtd/html5.dtd (based on W3C DTD), expand-m4-includes.in,
languages.txt (compiled from www.gnu.org pages),
- translinks-head.html,
- translinks-tail.html.
+ translinks-head.html, translinks-tail.html.
- Some changes in GNUmakefile and gnun-validate-html, dtd/README.
+ Some changes in GNUmakefile, gnun-validate-html, README,
+ dtd/README.
- Tiny changes in validate-html-notify.in, Makefile.am, dtd/Makefile.am.
+ Tiny changes in Makefile.am, config.mk.in, configure.ac,
+ dtd/Makefile.am, validate-html-notify.in.
Brett Smith <address@hidden>
"Distribution Terms" section in doc/web-trans.texi
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -b -r1.208 -r1.209
--- ChangeLog 21 Oct 2011 11:46:06 -0000 1.208
+++ ChangeLog 24 Oct 2011 06:24:08 -0000 1.209
@@ -1,3 +1,18 @@
+2011-10-24 Pavel Kharitonov <address@hidden>
+
+ Replace m4 with a sed script.
+
+ The macro procesor was used
+ just to expand includes, and its other features conflict
+ with GNUN intentions.
+
+ * configure.ac: Don't detect m4.
+ * config.mk.in: Update comment about m4.
+ * expand-m4-includes.in: New script.
+ * Makefile.am: Add `expand-m4-includes' script; expand @M4@
+ as path to expand-m4-includes.
+ * NEWS, README: Update.
+
2011-10-21 Pavel Kharitonov <address@hidden>
* gnun-validate-html.in: Support checking from arbitrary
Index: Makefile.am
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- Makefile.am 16 Sep 2011 11:42:24 -0000 1.20
+++ Makefile.am 24 Oct 2011 06:24:08 -0000 1.21
@@ -30,7 +30,7 @@
endif
noinst_SCRIPTS = stamp-config.mk
-pkglibexec_SCRIPTS = validate-html-notify
+pkglibexec_SCRIPTS = expand-m4-includes validate-html-notify
if HAVE_GUILE
pkglibexec_SCRIPTS += make-prototype
@@ -50,10 +50,10 @@
-e 's|@address@hidden|$(pkglibexecdir)|g' \
-e 's|@address@hidden|$(AWK)|g' \
-e 's|@address@hidden|$(GREP)|g' \
- -e 's|@address@hidden|$(M4)|g' \
+ -e 's|@address@hidden|$(pkglibexecdir)/expand-m4-includes|g' \
-e 's|@address@hidden|$(SED)|g'
-gnun-validate-html validate-html-notify: Makefile
+expand-m4-includes gnun-validate-html validate-html-notify: Makefile
$(AM_V_at)rm -f $@ address@hidden
$(AM_V_GEN)$(edit) '$(srcdir)/address@hidden' >address@hidden
$(AM_V_at)chmod +x address@hidden
@@ -76,6 +76,8 @@
dist_sysconf_DATA = gnun.conf
dist_pkgdata_DATA = GNUmakefile
-EXTRA_DIST = gnun-validate-html.in validate-html-notify.in
+EXTRA_DIST = expand-m4-includes.in gnun-validate-html.in \
+ validate-html-notify.in
-CLEANFILES = gnun-validate-html validate-html-notify stamp-config.mk
+CLEANFILES = expand-m4-includes gnun-validate-html validate-html-notify \
+ stamp-config.mk
Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- NEWS 21 Oct 2011 11:46:06 -0000 1.35
+++ NEWS 24 Oct 2011 06:24:08 -0000 1.36
@@ -1,6 +1,6 @@
GNUnited Nations NEWS - User visible changes.
-* Changes in GNUnited Nations 0.5 (2011-??-??)
+* Changes in GNUnited Nations 0.5 (201?-??-??)
** Links to translations are generated outside of `make-prototype'
based on presence of translations rather than copied from
@@ -43,6 +43,10 @@
For more details, see the manuals ('(gnun)Runtime Variables' and
'(web-trans)Mailing Lists') and/or the homepage.
+** Eliminate dependency on m4. GNUN only used single feature
+ of the macro processor, and other features of m4 conflicted with
+ GNUN purposes.
+
** Bugs fixed in 0.5.
*** GRACE period counts from the first incomplete translation.
Index: README
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- README 26 Jul 2009 14:36:49 -0000 1.8
+++ README 24 Oct 2011 06:24:08 -0000 1.9
@@ -3,10 +3,8 @@
GNU Make >= 3.81 (prereleases of 3.81 also work)
GNU Sed
GNU Gettext (>= 0.16)
-GNU M4 (>= 1.4.5)
GNU Guile (>= 1.6)
GNU Awk
Po4a 0.34
Libxml2 (>= 2.6.24, needed for XHTML validation only)
-W3C XHMTL 1.0 DTDs (needed for XHTML validation only)
CVS (>= 1.12.9, needed if VCS operations are enabled)
Index: config.mk
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/config.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- config.mk 16 Sep 2011 15:03:02 -0000 1.5
+++ config.mk 24 Oct 2011 06:24:08 -0000 1.6
@@ -8,7 +8,7 @@
SED := sed
GREP := grep
EGREP := grep -E
-M4 := m4 -P
+M4 := ./expand-m4-includes
MSGFMT := msgfmt
MSGMERGE := msgmerge
PO4A_GETTEXTIZE := po4a-gettextize
Index: config.mk.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/config.mk.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- config.mk.in 2 Aug 2010 13:54:11 -0000 1.5
+++ config.mk.in 24 Oct 2011 06:24:08 -0000 1.6
@@ -8,8 +8,8 @@
SED := @SED@
GREP := @GREP@
EGREP := @EGREP@
-# BSD M4 does not accept GNU long options.
-M4 := @M4@ -P
+# We actually use our sed script rather than a real m4.
+M4 := @M4@
MSGFMT := @MSGFMT@
MSGMERGE := @MSGMERGE@
PO4A_GETTEXTIZE := @PO4A_GETTEXTIZE@
Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- configure.ac 21 Jan 2011 19:14:07 -0000 1.24
+++ configure.ac 24 Oct 2011 06:24:08 -0000 1.25
@@ -48,9 +48,6 @@
AC_ARG_VAR([EGREP], [the `egrep' program])
AC_PROG_EGREP
-AC_ARG_VAR([M4], [the M4 macro processor command])
-AC_CHECK_PROGS([M4], [m4 gm4])
-
AC_ARG_VAR([MSGFMT], [the `msgfmt' program])
AC_CHECK_PROGS([MSGFMT], [msgfmt gmsgfmt])
AC_ARG_VAR([MSGMERGE], [the `msgmerge' program])
@@ -128,10 +125,7 @@
AS_IF([test -n "$CVS" || test -n "$SVN" || test -n "$BZR"],
[have_vcs=yes], [have_vcs=no])
-# Do not bother checking for xmllint if m4 is not present.
-AS_IF([test -n "$M4"],
- [AC_CHECK_PROG([have_xmllint], [xmllint], [yes], [no])],
- [have_xmllint=no])
+AC_CHECK_PROG([have_xmllint], [xmllint], [yes], [no])
if test "$have_xmllint" = yes; then
AC_MSG_CHECKING([if XHTML DTDs are installed])
have_dtds=no
Index: expand-m4-includes
===================================================================
RCS file: expand-m4-includes
diff -N expand-m4-includes
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ expand-m4-includes 24 Oct 2011 06:24:08 -0000 1.1
@@ -0,0 +1,38 @@
+#! /bin/sed -f
+
+# Copyright (C) 2011 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/>.
+
+# Expand m4 include statements.
+#
+# Historically GNUN used m4 for that job, but m4 syntax is too rich,
+# and the macro processor doesn't work well with ASCII arts like
+# http://www.gnu.org/graphics/alternative-ascii.html (in particular,
+# it removes some quotes).
+
+# Separate m4_include directives from the rest text with `\n's
+s/\(\<m4_include(`[^']\+')\)/\n\1\n/g;
+:cycle; t cycle;
+# Select the next part.
+h; s/\n.*$//; t expand;
+# No more parts: just print the rest of the line.
+p; d;
+# If the part contains m4_include directive, expand it
+# recursively; print the result
+:expand; s%^\<m4_include(`\([^']\+\)')$%./expand-m4-includes "\1"%e; p;
+# Remove processed part and proceed with the rest.
+g; s/^[^\n]*\n//; b cycle
Index: expand-m4-includes.in
===================================================================
RCS file: expand-m4-includes.in
diff -N expand-m4-includes.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ expand-m4-includes.in 24 Oct 2011 06:24:08 -0000 1.1
@@ -0,0 +1,38 @@
+#! @SED@ -f
+
+# Copyright (C) 2011 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/>.
+
+# Expand m4 include statements.
+#
+# Historically GNUN used m4 for that job, but m4 syntax is too rich,
+# and the macro processor doesn't work well with ASCII arts like
+# http://www.gnu.org/graphics/alternative-ascii.html (in particular,
+# it removes some quotes).
+
+# Separate m4_include directives from the rest text with `\n's
+s/\(\<m4_include(`[^']\+')\)/\n\1\n/g;
+:cycle; t cycle;
+# Select the next part.
+h; s/\n.*$//; t expand;
+# No more parts: just print the rest of the line.
+p; d;
+# If the part contains m4_include directive, expand it
+# recursively; print the result
+:expand; s%^\<m4_include(`\([^']\+\)')address@hidden@ "\1"%e; p;
+# Remove processed part and proceed with the rest.
+g; s/^[^\n]*\n//; b cycle
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- trans-coord/gnun/server/gnun AUTHORS ChangeLog ...,
Pavel Kharitonov <=