Rename from gawklib to gawkextlib.

ChangeLog

@@ -1,3 +1,13 @@
+2012-07-22         Andrew J. Schorr     <[email protected]>
+
+	* gawklib.h: Rename to gawkextlib.h.
+	* gawkextlib.h: Rename _GAWK_LIB_H to _GAWKEXTLIB_H.
+	* strhash.c, varinit.c: Include gawkextlib.h instead of gawklib.h.
+	* README: Change package name, and add rpmbuild instructions.
+	* configure.ac: Change package name to gawkextlib.
+	* Makefile.am: Rename libgawklib to libgawkextlib, and rename
+	header file gawklib.h to gawkextlib.h.
+
 2012-07-21         Andrew J. Schorr     <[email protected]>
 
 	* configure.ac: Bump version.

Makefile.am

@@ -7,10 +7,10 @@ ACLOCAL_AMFLAGS = -I m4
 # This insures that make flags get passed down to child makes.
 AM_MAKEFLAGS = 'CFLAGS=$(CFLAGS)' 'LDFLAGS=$(LDFLAGS)'
 
-lib_LTLIBRARIES = libgawklib.la
+lib_LTLIBRARIES = libgawkextlib.la
 
-libgawklib_la_SOURCES	= strhash.c varinit.c
-libgawklib_la_LDFLAGS	= -no-undefined
+libgawkextlib_la_SOURCES	= strhash.c varinit.c
+libgawkextlib_la_LDFLAGS	= -no-undefined
 
 # Stuff to include in the dist that doesn't need it's own
 # Makefile.am files
@@ -21,7 +21,7 @@ EXTRA_DIST = \
 	update-autotools \
 	*ChangeLog
 
-# Build explicitly in "." in order to build gawklib first
+# Build explicitly in "." in order to build gawkextlib first
 SUBDIRS = \
 	. \
 	awklib \
@@ -31,7 +31,7 @@ SUBDIRS = \
 	packaging \
 	test
 
-include_HEADERS = gawklib.h
+include_HEADERS = gawkextlib.h
 
 # This is for my development & testing.
 efence: gawk

README

@@ -1,5 +1,5 @@
-This is gawklib.  It contains several shared library extension packages
-for gawk, as well as libgawklib containing some APIs that are useful
+This is gawkextlib.  It contains several shared library extension packages
+for gawk, as well as libgawkextlib containing some APIs that are useful
 for extension packages.
 
 This package contains the following gawk shared libraries:
@@ -8,7 +8,7 @@ This package contains the following gawk shared libraries:
    gd
    mpfr (but please compare to using gawk's new -M flag)
 
-The libgawklib library contains the strhash API used by pgsql and gd,
+The libgawkextlib library contains the strhash API used by pgsql and gd,
 and the gawk_varinit API to make it easy to initialize variables (used
 by XML and MPFR).
 
@@ -32,9 +32,13 @@ Using git:
 
 Or it may be easier from a tarball if you do not have current autotools
 installed:
-   tar xf gawklib-<version>.tar.gz
+   tar xf gawkextlib-<version>.tar.gz
    cd gawlib-<version>
 
 Either way, the steps to build are the same:
    ./configure --with-gawk=/tmp/newgawk --prefix=/tmp/newgawk
    make && make check && make install
+
+N.B. On an rpm-based system, if gawk and gawk-devel rpms have been installed
+(which is unlikely, since they don't really exist yet), you can simply say:
+   rpmbuild -tb gawkextlib-<version>.tar.gz

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([Gawk Libraries], 0.2.0, [email protected], gawklib)
+AC_INIT([Gawk Extension Libraries], 0.3.0, [email protected], gawkextlib)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -233,7 +233,7 @@ AC_CONFIG_FILES(Makefile
 	doc/Makefile
 	extension/Makefile
 	packaging/Makefile
-	packaging/gawklib.spec
+	packaging/gawkextlib.spec
 	po/Makefile.in
 	test/Makefile)
 AC_OUTPUT

doc/ChangeLog

@@ -1,3 +1,10 @@
+2012-07-22         Andrew J. Schorr     <[email protected]>
+
+	* Makefile.am: Rename xmlgawk to gawkextlib.
+	* xmlgawk.texi: Rename as gawkextlib.texi.
+	* gawkextlib.texi: Replace xmlgawk with gawkextlib in a few places.
+	Much more work remains to be done on the documentation.
+
 2012-07-09         Andrew J. Schorr     <[email protected]>
 
 	* ChangeLog: Purge entries carried over from gawk.

doc/Makefile.am

@@ -1,6 +1,6 @@
 ## process this file with automake to produce Makefile.in
 
-info_TEXINFOS = xmlgawk.texi
+info_TEXINFOS = gawkextlib.texi
 
 EXTRA_DIST = *ChangeLog \
 	lflashlight.eps rflashlight.eps \
@@ -13,16 +13,16 @@ EXTRA_DIST = *ChangeLog \
 	rss_inq.pdf soap_error.pdf soap_reply.pdf soap_request.pdf
 
 # Get rid of generated files when cleaning
-CLEANFILES = *.ps *.html *.dvi *~ xmlgawk.pdf
+CLEANFILES = *.ps *.html *.dvi *~ gawkextlib.pdf
 
 MAKEINFO = @MAKEINFO@ --no-split --force
 
 TROFF = groff -t -Tps -U
 SEDME = sed -e "s/^level0 restore/level0 restore flashme 100 72 moveto (Copyright `date '+%m-%d-%y %T'`, FSF, Inc. (all)) show/" \
 		-e "s/^\/level0 save def/\/level0 save def 30 -48 translate/"
 
-postscript: xmlgawk.ps
+postscript: gawkextlib.ps
 
-xmlgawk.ps: xmlgawk.dvi
-	dvips -o xmlgawk.ps xmlgawk.dvi
+gawkextlib.ps: gawkextlib.dvi
+	dvips -o gawkextlib.ps gawkextlib.dvi
 

doc/xmlgawk.texi → doc/gawkextlib.texi

@@ -1,6 +1,6 @@
 \input texinfo   @c -*-texinfo-*-
 @c %**start of header (This is for running Texinfo on a region.)
-@setfilename xmlgawk.info
+@setfilename gawkextlib.info
 @comment include version.texi
 
 @set TITLE XML Processing With @command{gawk}
@@ -47,37 +47,37 @@ This file documents the XML processing extension in GNU @command{awk}.
 
 @dircategory Text creation and manipulation
 @direntry
-* xgawk: (xmlgawk).		A text scanning and processing language.
+* xgawk: (gawkextlib).		A text scanning and processing language.
 @end direntry
 
 @dircategory Programming
 @direntry
-* xgawk: (xmlgawk).		A text scanning and processing language.
+* xgawk: (gawkextlib).		A text scanning and processing language.
 @end direntry
 
 @dircategory XML text processing system
 @direntry
-* xmlgawk: (xmlgawk).		XML Processing With @command{gawk}.
+* xmlgawk: (gawkextlib).		XML Processing With @command{gawk}.
 @end direntry
 
 @dircategory Databases
 @direntry
-* xgawk-pgsql: (xmlgawk)PostgreSQL API Reference.		The xgawk PostgreSQL interface.
+* gawkext-pgsql: (gawkextlib)PostgreSQL API Reference.		The xgawk PostgreSQL interface.
 @end direntry
 
 @dircategory Programming
 @direntry
-* xgawk-time: (xmlgawk)Time Extension Reference.		The xgawk time extension.
+* gawkext-time: (gawkextlib)Time Extension Reference.		The xgawk time extension.
 @end direntry
 
 @dircategory Programming
 @direntry
-* xgawk-gd: (xmlgawk)GD Graphics Extension Reference.		The xgawk graphics extension.
+* gawkext-gd: (gawkextlib)GD Graphics Extension Reference.		The xgawk graphics extension.
 @end direntry
 
 @dircategory Programming
 @direntry
-* xgawk-mpfr: (xmlgawk)MPFR Extension Reference.		The xgawk MPFR extension.
+* gawkext-mpfr: (gawkextlib)MPFR Extension Reference.		The xgawk MPFR extension.
 @end direntry
 
 @iftex
@@ -6440,7 +6440,7 @@ like this and @command{xgawk} will be installed under @file{/tmp}.
 @end example
 
 The manual (the document at hand) can be produced in various formats
-from the file @file{doc/xmlgawk.texi}. Notice that your build
+from the file @file{doc/gawkextlib.texi}. Notice that your build
 environment needs a modern implementation (@file{texinfo-4.9})
 of texinfo to be able to produce these derived document files.
 But you can also download these files (most recent version in A4 page size)

extension/ChangeLog

@@ -1,3 +1,9 @@
+2012-07-22         Andrew J. Schorr     <[email protected]>
+
+	* Makefile.am: Rename from gawklib to gawkextlib.
+	* common.h: Include gawkextlib.h instead of gawklib.h.
+	* testpgsql.awk: Turn off execute bit.
+
 2012-07-20         Andrew J. Schorr     <[email protected]>
 
 	* xml_interface.c: Make XMLEVENT and XMLNAME read-write so that

extension/Makefile.am

@@ -39,22 +39,22 @@ xml_enc_handler.lo: xml_enc_converted.touch
 
 MY_MODULE_FLAGS = -module -avoid-version -no-undefined
 
-GAWKLIB = ../libgawklib.la
+GAWKEXTLIB = ../libgawkextlib.la
 
 xml_la_SOURCES		= xml_puller.c xml_interface.c xml_enc_handler.c
-xml_la_LIBADD		= -lexpat $(GAWKLIB)
+xml_la_LIBADD		= -lexpat $(GAWKEXTLIB)
 xml_la_LDFLAGS		= $(MY_MODULE_FLAGS)
 
 pgsql_la_SOURCES	= pgsql.c
-pgsql_la_LIBADD		= -lpq $(GAWKLIB)
+pgsql_la_LIBADD		= -lpq $(GAWKEXTLIB)
 pgsql_la_LDFLAGS	= $(MY_MODULE_FLAGS)
 
 gd_la_SOURCES		= gd.c
-gd_la_LIBADD		= -lgd $(GAWKLIB)
+gd_la_LIBADD		= -lgd $(GAWKEXTLIB)
 gd_la_LDFLAGS		= $(MY_MODULE_FLAGS)
 
 mpfr_la_SOURCES		= mpfr.c
-mpfr_la_LIBADD		= -lmpfr -lgmp $(GAWKLIB)
+mpfr_la_LIBADD		= -lmpfr -lgmp $(GAWKEXTLIB)
 mpfr_la_LDFLAGS		= $(MY_MODULE_FLAGS)
 
 # Extra files to remove when cleaning

extension/common.h

@@ -2,7 +2,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "gawklib.h"
+#include "gawkextlib.h"
 
 static const gawk_api_t *api;	/* for convenience macros to work */
 static awk_ext_id_t *ext_id;

gawklib.h → gawkextlib.h

@@ -10,8 +10,8 @@
    to declare the size_t type, typically <unistd.h>.  We do not do that
    here to avoid platform-specific code. */
 
-#ifndef _GAWK_LIB_H
-#define _GAWK_LIB_H
+#ifndef _GAWKEXTLIB_H
+#define _GAWKEXTLIB_H
 
 #include <gawkapi.h>
 
@@ -82,4 +82,4 @@ extern awk_bool_t gawk_api_varinit_array(const gawk_api_t *a, awk_ext_id_t id,
 #define gawk_varinit_array(N, F, C) \
 	gawk_api_varinit_array(api, ext_id, N, F, C)
 
-#endif /* _GAWK_LIB_H */
+#endif /* _GAWKEXTLIB_H */

packaging/.gitignore

@@ -1,3 +1,3 @@
 Makefile
 Makefile.in
-gawklib.spec
+gawkextlib.spec

packaging/ChangeLog

@@ -1,3 +1,11 @@
+2012-07-22         Andrew J. Schorr     <[email protected]>
+
+	* gawklib.spec.in: Rename to gawkextlib.spec.in.
+	* gawkextlib.spec.in: Rename packages to use gawkextlib prefix
+	instead of gawklib, and individual libraries will use a gawkext-
+	prefix instead of gawk-.  Also add some more examples as doc files.
+	* .gitignore: Replace gawklib.spec with gawkextlib.spec.
+
 2012-07-21         Andrew J. Schorr     <[email protected]>
 
 	* gawklib.spec.in: Fix %setup command, and gawklib-devel now requires

packaging/gawklib.spec.in → packaging/gawkextlib.spec.in

@@ -15,7 +15,7 @@ Requires:	gawk
 libraries.
 
 %package -n %{name}-devel
-Summary:	Header files and libraries for gawklib development
+Summary:	Header files and libraries for gawkextlib development
 Requires:	%{name} = %{version}-%{release}
 Requires:	gawk-devel
 
@@ -24,44 +24,44 @@ The %{name}-devel package contains the header files and libraries
 needed to develop gawk shared library extensions that use %{name}
 facilities.
 
-%package -n gawk-xml
+%package -n gawkext-xml
 Summary:	XML support for gawk
 BuildRequires:	gawk-devel, expat-devel
 Requires:	%{name} = %{version}-%{release}
 Requires:	expat
 
-%description -n gawk-xml
+%description -n gawkext-xml
 The gawk-xml package contains the gawk XML shared library extension,
 as well as the xmlgawk script and some awk include libraries for enhanced
 XML processing.
 
-%package -n gawk-pgsql
+%package -n gawkext-pgsql
 Summary:	PostgreSQL library for gawk
 BuildRequires:	gawk-devel, postgresql-devel
 Requires:	%{name} = %{version}-%{release}
 Requires:	postgresql-libs
 
-%description -n gawk-pgsql
+%description -n gawkext-pgsql
 The gawk-pgsql package contains the gawk pgsql shared library extension
 that provides an interface to PostgreSQL database servers.
 
-%package -n gawk-gd
+%package -n gawkext-gd
 Summary:	GD library for gawk
 BuildRequires:	gawk-devel, gd-devel
 Requires:	%{name} = %{version}-%{release}
 Requires:	gd
 
-%description -n gawk-gd
+%description -n gawkext-gd
 The gawk-gd package contains the gawk gd shared library extension
 for using the gd graphics library.
 
-%package -n gawk-mpfr
+%package -n gawkext-mpfr
 Summary:	MPFR library for gawk
 BuildRequires:	gawk-devel, mpfr-devel
 Requires:	%{name} = %{version}-%{release}
 Requires:	mpfr
 
-%description -n gawk-mpfr
+%description -n gawkext-mpfr
 The gawk-mpfr package contains the gawk MPFR shared library extension
 for accessing the MPFR library.  Please compare this to using gawk's -M
 option to perform all calculations using MPFR.
@@ -101,6 +101,7 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING NEWS
+%doc extension/*.awk extension/*.xml test/pgtest.awk test/*mpfr*.awk
 %{_libdir}/lib%{name}.so.*
 %{_infodir}/*.info*
 
@@ -109,25 +110,28 @@ fi
 %{_libdir}/lib%{name}.so
 %{_includedir}/%{name}.h
 
-%files -n gawk-xml
+%files -n gawkext-xml
 %defattr(-,root,root,-)
 %{_libdir}/gawk/xml.so
 %{_bindir}/xmlgawk
 %{_datadir}/awk/*
 
-%files -n gawk-pgsql
+%files -n gawkext-pgsql
 %defattr(-,root,root,-)
 %{_libdir}/gawk/pgsql.so
 
-%files -n gawk-gd
+%files -n gawkext-gd
 %defattr(-,root,root,-)
 %{_libdir}/gawk/gd.so
 
-%files -n gawk-mpfr
+%files -n gawkext-mpfr
 %defattr(-,root,root,-)
 %{_libdir}/gawk/mpfr.so
 
 %changelog
+* Sun Jul 22 2012 Andrew Schorr <[email protected]> - 0.3.0-1
+- Rename from gawklib to gawkextlib.
+
 * Sat Jul 21 2012 Andrew Schorr <[email protected]> - 0.2.0-1
 - This version has been tested and should work.
 

po/.gitignore

@@ -18,4 +18,4 @@ quot.sed
 remove-potcdate.sin
 stamp-po
 Makevars.template
-gawklib.pot
+gawkextlib.pot

po/ChangeLog

@@ -1,3 +1,8 @@
+2012-07-22         Andrew J. Schorr     <[email protected]>
+
+	* .gitignore: Rename gawklib.pot to gawkextlib.pot.
+	* *.po: Update for new release.
+
 2012-07-21         Andrew J. Schorr     <[email protected]>
 
 	* *.po: Update for new release.