Skip to content

Commit a51f81a

Browse files
committed
Rename from gawklib to gawkextlib.
1 parent 65df4b8 commit a51f81a

35 files changed

+113
-178
lines changed

ChangeLog

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2012-07-22 Andrew J. Schorr <[email protected]>
2+
3+
* gawklib.h: Rename to gawkextlib.h.
4+
* gawkextlib.h: Rename _GAWK_LIB_H to _GAWKEXTLIB_H.
5+
* strhash.c, varinit.c: Include gawkextlib.h instead of gawklib.h.
6+
* README: Change package name, and add rpmbuild instructions.
7+
* configure.ac: Change package name to gawkextlib.
8+
* Makefile.am: Rename libgawklib to libgawkextlib, and rename
9+
header file gawklib.h to gawkextlib.h.
10+
111
2012-07-21 Andrew J. Schorr <[email protected]>
212

313
* configure.ac: Bump version.

Makefile.am

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ ACLOCAL_AMFLAGS = -I m4
77
# This insures that make flags get passed down to child makes.
88
AM_MAKEFLAGS = 'CFLAGS=$(CFLAGS)' 'LDFLAGS=$(LDFLAGS)'
99

10-
lib_LTLIBRARIES = libgawklib.la
10+
lib_LTLIBRARIES = libgawkextlib.la
1111

12-
libgawklib_la_SOURCES = strhash.c varinit.c
13-
libgawklib_la_LDFLAGS = -no-undefined
12+
libgawkextlib_la_SOURCES = strhash.c varinit.c
13+
libgawkextlib_la_LDFLAGS = -no-undefined
1414

1515
# Stuff to include in the dist that doesn't need it's own
1616
# Makefile.am files
@@ -21,7 +21,7 @@ EXTRA_DIST = \
2121
update-autotools \
2222
*ChangeLog
2323

24-
# Build explicitly in "." in order to build gawklib first
24+
# Build explicitly in "." in order to build gawkextlib first
2525
SUBDIRS = \
2626
. \
2727
awklib \
@@ -31,7 +31,7 @@ SUBDIRS = \
3131
packaging \
3232
test
3333

34-
include_HEADERS = gawklib.h
34+
include_HEADERS = gawkextlib.h
3535

3636
# This is for my development & testing.
3737
efence: gawk

README

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
This is gawklib. It contains several shared library extension packages
2-
for gawk, as well as libgawklib containing some APIs that are useful
1+
This is gawkextlib. It contains several shared library extension packages
2+
for gawk, as well as libgawkextlib containing some APIs that are useful
33
for extension packages.
44

55
This package contains the following gawk shared libraries:
@@ -8,7 +8,7 @@ This package contains the following gawk shared libraries:
88
gd
99
mpfr (but please compare to using gawk's new -M flag)
1010

11-
The libgawklib library contains the strhash API used by pgsql and gd,
11+
The libgawkextlib library contains the strhash API used by pgsql and gd,
1212
and the gawk_varinit API to make it easy to initialize variables (used
1313
by XML and MPFR).
1414

@@ -32,9 +32,13 @@ Using git:
3232

3333
Or it may be easier from a tarball if you do not have current autotools
3434
installed:
35-
tar xf gawklib-<version>.tar.gz
35+
tar xf gawkextlib-<version>.tar.gz
3636
cd gawlib-<version>
3737

3838
Either way, the steps to build are the same:
3939
./configure --with-gawk=/tmp/newgawk --prefix=/tmp/newgawk
4040
make && make check && make install
41+
42+
N.B. On an rpm-based system, if gawk and gawk-devel rpms have been installed
43+
(which is unlikely, since they don't really exist yet), you can simply say:
44+
rpmbuild -tb gawkextlib-<version>.tar.gz

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl Process this file with autoconf to produce a configure script.
22

3-
AC_INIT([Gawk Libraries], 0.2.0, [email protected], gawklib)
3+
AC_INIT([Gawk Extension Libraries], 0.3.0, [email protected], gawkextlib)
44

55
AC_CONFIG_MACRO_DIR([m4])
66
AC_CONFIG_AUX_DIR([build-aux])
@@ -233,7 +233,7 @@ AC_CONFIG_FILES(Makefile
233233
doc/Makefile
234234
extension/Makefile
235235
packaging/Makefile
236-
packaging/gawklib.spec
236+
packaging/gawkextlib.spec
237237
po/Makefile.in
238238
test/Makefile)
239239
AC_OUTPUT

doc/ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2012-07-22 Andrew J. Schorr <[email protected]>
2+
3+
* Makefile.am: Rename xmlgawk to gawkextlib.
4+
* xmlgawk.texi: Rename as gawkextlib.texi.
5+
* gawkextlib.texi: Replace xmlgawk with gawkextlib in a few places.
6+
Much more work remains to be done on the documentation.
7+
18
2012-07-09 Andrew J. Schorr <[email protected]>
29

310
* ChangeLog: Purge entries carried over from gawk.

doc/Makefile.am

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## process this file with automake to produce Makefile.in
22

3-
info_TEXINFOS = xmlgawk.texi
3+
info_TEXINFOS = gawkextlib.texi
44

55
EXTRA_DIST = *ChangeLog \
66
lflashlight.eps rflashlight.eps \
@@ -13,16 +13,16 @@ EXTRA_DIST = *ChangeLog \
1313
rss_inq.pdf soap_error.pdf soap_reply.pdf soap_request.pdf
1414

1515
# Get rid of generated files when cleaning
16-
CLEANFILES = *.ps *.html *.dvi *~ xmlgawk.pdf
16+
CLEANFILES = *.ps *.html *.dvi *~ gawkextlib.pdf
1717

1818
MAKEINFO = @MAKEINFO@ --no-split --force
1919

2020
TROFF = groff -t -Tps -U
2121
SEDME = sed -e "s/^level0 restore/level0 restore flashme 100 72 moveto (Copyright `date '+%m-%d-%y %T'`, FSF, Inc. (all)) show/" \
2222
-e "s/^\/level0 save def/\/level0 save def 30 -48 translate/"
2323

24-
postscript: xmlgawk.ps
24+
postscript: gawkextlib.ps
2525

26-
xmlgawk.ps: xmlgawk.dvi
27-
dvips -o xmlgawk.ps xmlgawk.dvi
26+
gawkextlib.ps: gawkextlib.dvi
27+
dvips -o gawkextlib.ps gawkextlib.dvi
2828

doc/xmlgawk.texi renamed to doc/gawkextlib.texi

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
\input texinfo @c -*-texinfo-*-
22
@c %**start of header (This is for running Texinfo on a region.)
3-
@setfilename xmlgawk.info
3+
@setfilename gawkextlib.info
44
@comment include version.texi
55

66
@set TITLE XML Processing With @command{gawk}
@@ -47,37 +47,37 @@ This file documents the XML processing extension in GNU @command{awk}.
4747

4848
@dircategory Text creation and manipulation
4949
@direntry
50-
* xgawk: (xmlgawk). A text scanning and processing language.
50+
* xgawk: (gawkextlib). A text scanning and processing language.
5151
@end direntry
5252

5353
@dircategory Programming
5454
@direntry
55-
* xgawk: (xmlgawk). A text scanning and processing language.
55+
* xgawk: (gawkextlib). A text scanning and processing language.
5656
@end direntry
5757

5858
@dircategory XML text processing system
5959
@direntry
60-
* xmlgawk: (xmlgawk). XML Processing With @command{gawk}.
60+
* xmlgawk: (gawkextlib). XML Processing With @command{gawk}.
6161
@end direntry
6262

6363
@dircategory Databases
6464
@direntry
65-
* xgawk-pgsql: (xmlgawk)PostgreSQL API Reference. The xgawk PostgreSQL interface.
65+
* gawkext-pgsql: (gawkextlib)PostgreSQL API Reference. The xgawk PostgreSQL interface.
6666
@end direntry
6767

6868
@dircategory Programming
6969
@direntry
70-
* xgawk-time: (xmlgawk)Time Extension Reference. The xgawk time extension.
70+
* gawkext-time: (gawkextlib)Time Extension Reference. The xgawk time extension.
7171
@end direntry
7272

7373
@dircategory Programming
7474
@direntry
75-
* xgawk-gd: (xmlgawk)GD Graphics Extension Reference. The xgawk graphics extension.
75+
* gawkext-gd: (gawkextlib)GD Graphics Extension Reference. The xgawk graphics extension.
7676
@end direntry
7777

7878
@dircategory Programming
7979
@direntry
80-
* xgawk-mpfr: (xmlgawk)MPFR Extension Reference. The xgawk MPFR extension.
80+
* gawkext-mpfr: (gawkextlib)MPFR Extension Reference. The xgawk MPFR extension.
8181
@end direntry
8282

8383
@iftex
@@ -6440,7 +6440,7 @@ like this and @command{xgawk} will be installed under @file{/tmp}.
64406440
@end example
64416441

64426442
The manual (the document at hand) can be produced in various formats
6443-
from the file @file{doc/xmlgawk.texi}. Notice that your build
6443+
from the file @file{doc/gawkextlib.texi}. Notice that your build
64446444
environment needs a modern implementation (@file{texinfo-4.9})
64456445
of texinfo to be able to produce these derived document files.
64466446
But you can also download these files (most recent version in A4 page size)

extension/ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2012-07-22 Andrew J. Schorr <[email protected]>
2+
3+
* Makefile.am: Rename from gawklib to gawkextlib.
4+
* common.h: Include gawkextlib.h instead of gawklib.h.
5+
* testpgsql.awk: Turn off execute bit.
6+
17
2012-07-20 Andrew J. Schorr <[email protected]>
28

39
* xml_interface.c: Make XMLEVENT and XMLNAME read-write so that

extension/Makefile.am

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,22 @@ xml_enc_handler.lo: xml_enc_converted.touch
3939

4040
MY_MODULE_FLAGS = -module -avoid-version -no-undefined
4141

42-
GAWKLIB = ../libgawklib.la
42+
GAWKEXTLIB = ../libgawkextlib.la
4343

4444
xml_la_SOURCES = xml_puller.c xml_interface.c xml_enc_handler.c
45-
xml_la_LIBADD = -lexpat $(GAWKLIB)
45+
xml_la_LIBADD = -lexpat $(GAWKEXTLIB)
4646
xml_la_LDFLAGS = $(MY_MODULE_FLAGS)
4747

4848
pgsql_la_SOURCES = pgsql.c
49-
pgsql_la_LIBADD = -lpq $(GAWKLIB)
49+
pgsql_la_LIBADD = -lpq $(GAWKEXTLIB)
5050
pgsql_la_LDFLAGS = $(MY_MODULE_FLAGS)
5151

5252
gd_la_SOURCES = gd.c
53-
gd_la_LIBADD = -lgd $(GAWKLIB)
53+
gd_la_LIBADD = -lgd $(GAWKEXTLIB)
5454
gd_la_LDFLAGS = $(MY_MODULE_FLAGS)
5555

5656
mpfr_la_SOURCES = mpfr.c
57-
mpfr_la_LIBADD = -lmpfr -lgmp $(GAWKLIB)
57+
mpfr_la_LIBADD = -lmpfr -lgmp $(GAWKEXTLIB)
5858
mpfr_la_LDFLAGS = $(MY_MODULE_FLAGS)
5959

6060
# Extra files to remove when cleaning

extension/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <string.h>
33
#include <stdlib.h>
44
#include <unistd.h>
5-
#include "gawklib.h"
5+
#include "gawkextlib.h"
66

77
static const gawk_api_t *api; /* for convenience macros to work */
88
static awk_ext_id_t *ext_id;

0 commit comments

Comments
 (0)