| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Because we currently don't support `gnulib-tool' directly but add
everything to the CVS repository, and many internal details of the
gnulib setup has changed, it is necessary to do redo the import.
. Temporarily rename `src/libs/gnulib' to `src/libs/gnulib.old'.
. Call
gnulib-tool --create-testdir \
--dir=src/libs/gnulib \
wcwidth
. Manually move directories `src/libs/gnulib/gl{lib,m4}' to
`src/libs/gnulib/{lib,m4}', and do `s/gllib/lib/' and `s/glm4/m4/'
in all files to `convert' the gnulib testbed to a standard gnulib
configuration as maintained by gnulib-tool. Additionally, remove
the directory `src/libs/gnulib/gltests' and the references to
`gltests' in all files.
(All of this could be done with a script, but I hope that this is
eventually replaced with migrating groff as a whole to gnulib and
its setup).
. Call
gnulib-tool --add-import \
--dir=src/libs/gnulib \
wcwidth
to update everything.
. Merge the changed, new, and deleted files into `gnulib.old',
delete `gnulib', rename `gnulib.old' to `gnulib', then commit.
|
|
|
This is a huge patch, mainly by adding the gnulib infrastructure in
a separate directory tree (in `src/libs/gnulib/lib') for its
`wcwidth' module. However, the actual changes to native groff
source files are just a few lines.
* Makefile.comm (INCLUDES): Updated.
(LIBGNU): Define.
* Makefile.in (NOMAKEDIRS): Updated.
(GNULLIBDIRS): Define.
(DISTDIRS): Add GNULLIBDIRS.
($LIBDIRS): Depend on GNULLIBDIRS.
($GNULLIBDIRS): New target.
* src/libs/libgroff/font.cpp (font::get_width, font::load)
[is_unicode]: Use `wcwidth'.
* src/roff/troff/Makefile.sub (XLIBS): Add LIBGNU.
* src/roff/troff/input.cpp (main): Set LC_CTYPE.
* src/devices/grotty/Makefile.sub (XLIBS): Add LIBGNU.
* src/devices/grotty/tty.cpp (main): Set LC_CTYPE.
* src/libs/gnulib/*: New files. The import was done as follows:
. Call
gnulib-tool --create-testdir \
--dir=src/libs/gnulib \
wcwidth
to get a testbed.
. Manually move directories src/libs/gl{lib,m4} to
src/libs/{lib,m4}, and do s/gllib/lib/ and s/glm4/m4/ everywhere
to `convert' the gnulib testbed to a standard gnulib
configuration as maintained by gnulib-tool.
. Call
gnulib-tool --add-import \
--dir=src/libs/gnulib \
wcwidth
to update everything.
|
