From 3b278e0c39335cace4c79b25b6f63a296d0dd17b Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Sun, 2 Jul 2017 15:03:33 -0700 Subject: [PATCH] pgsql plugin: Added debian/; pucked. --- src/pgsql/ChangeLog | 6 +++++- src/pgsql/Makefile.am | 6 +++--- src/pgsql/NEWS | 8 ++++---- src/pgsql/README | 13 +++---------- src/pgsql/configure.ac | 32 ++++++++++++++++++++++---------- src/pgsql/debian/changelog | 5 +++++ src/pgsql/debian/compat | 1 + src/pgsql/debian/control | 18 ++++++++++++++++++ src/pgsql/debian/copyright | 34 ++++++++++++++++++++++++++++++++++ src/pgsql/debian/docs | 2 ++ src/pgsql/debian/postinst.in | 11 +++++++++++ src/pgsql/debian/prerm.in | 11 +++++++++++ src/pgsql/debian/rules | 12 ++++++++++++ src/pgsql/debian/source/format | 1 + src/pgsql/debian/watch | 2 ++ src/pgsql/make.scm | 2 +- src/pgsql/pgsql.pkg | 8 +------- 17 files changed, 136 insertions(+), 36 deletions(-) create mode 100644 src/pgsql/debian/changelog create mode 100644 src/pgsql/debian/compat create mode 100644 src/pgsql/debian/control create mode 100644 src/pgsql/debian/copyright create mode 100644 src/pgsql/debian/docs create mode 100755 src/pgsql/debian/postinst.in create mode 100755 src/pgsql/debian/prerm.in create mode 100755 src/pgsql/debian/rules create mode 100644 src/pgsql/debian/source/format create mode 100644 src/pgsql/debian/watch diff --git a/src/pgsql/ChangeLog b/src/pgsql/ChangeLog index 36e60c087..eae5e01b2 100644 --- a/src/pgsql/ChangeLog +++ b/src/pgsql/ChangeLog @@ -2,4 +2,8 @@ Please see the git commit log: -$ git log origin/master -- src/pgsql/ | more +$ git clone git://git.savannah.gnu.org/mit-scheme.git whatever +$ cd whatever/ +$ git remote add puck git://birchwood-abbey.net/~matt/mit-scheme.git +$ git fetch puck pucked +$ git log puck/pucked -- src/pgsql/ | more diff --git a/src/pgsql/Makefile.am b/src/pgsql/Makefile.am index e572281a5..5cafd2b19 100644 --- a/src/pgsql/Makefile.am +++ b/src/pgsql/Makefile.am @@ -97,14 +97,14 @@ EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian install-data-hook: ( echo '(add-plugin "pgsql" "@MIT_SCHEME_PROJECT@"'; \ - echo ' ""'; \ + echo ' "$(DESTDIR)$(infodir)"'; \ echo ' "$(DESTDIR)$(scmlibdir)"'; \ echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode install-html: install-html-am ( echo '(add-plugin "pgsql" "@MIT_SCHEME_PROJECT@"'; \ - echo ' ""'; \ + echo ' "$(DESTDIR)$(infodir)"'; \ echo ' "$(DESTDIR)$(scmlibdir)"'; \ echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode @@ -115,7 +115,7 @@ uninstall-info-am: uninstall-hook: ( echo '(remove-plugin "pgsql" "@MIT_SCHEME_PROJECT@"'; \ - echo ' ""'; \ + echo ' "$(DESTDIR)$(infodir)"'; \ echo ' "$(DESTDIR)$(scmlibdir)"'; \ echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode diff --git a/src/pgsql/NEWS b/src/pgsql/NEWS index 123fa8c94..88eacb341 100644 --- a/src/pgsql/NEWS +++ b/src/pgsql/NEWS @@ -1,4 +1,4 @@ -mit-scheme-pgsql NEWS -- history of user-visible changes. +mit-scheme-pucked-pgsql NEWS -- history of user-visible changes. Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -22,7 +22,7 @@ along with MIT/GNU Scheme; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -mit-scheme-pgsql 0.1 - Matt Birkholz, 2017-07-02 -================================================ +mit-scheme-pucked-pgsql 0.1 - Matt Birkholz, 2017-07-02 +======================================================= -Now a plugin using libtool and automake. +Stole v0.1 from MIT/GNU Scheme. diff --git a/src/pgsql/README b/src/pgsql/README index 53471fd7c..b7c3669ba 100644 --- a/src/pgsql/README +++ b/src/pgsql/README @@ -1,8 +1,7 @@ -The POSTGRES option. +The PGSQL option. -This plugin creates a (pgsql) package, a drop-in replacement for the -microcode module based (runtime postgresql) package. It is built in the -customary GNU way: +This plugin creates a (pgsql) package. It is built in the customary +GNU way: ./configure ... make all check install @@ -10,12 +9,6 @@ customary GNU way: To use: (load-option 'pgsql) - (import-pgsql) - -Import-pgsql will modify the REPL's current environment by adding -bindings linked to the plugin's exports. They are not exported to the -global environment because they would conflict with the exports from -(runtime postgresql). To import into a CREF package set, add this to your .pkg file: diff --git a/src/pgsql/configure.ac b/src/pgsql/configure.ac index fdc72ae17..61cadf85a 100644 --- a/src/pgsql/configure.ac +++ b/src/pgsql/configure.ac @@ -1,22 +1,26 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([MIT/GNU Scheme pgsql plugin], - [0.1], - [bug-mit-scheme@gnu.org], - [mit-scheme-pgsql]) +AC_INIT([MIT/GNU Scheme Pucked pgsql plugin], + [0.1.1], + [matt@birchwood-abbey.net], + [mit-scheme-pucked-pgsql]) AC_CONFIG_SRCDIR([pgsql.pkg]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_COPYRIGHT( -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017 Matthew Birkholz + +This file is part of a gdbm plugin for MIT/GNU Scheme Pucked, +an experimental version of MIT/GNU Scheme. + +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 Massachusetts Institute of Technology -This file is part of MIT/GNU Scheme. - MIT/GNU Scheme 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 2 of the License, or (at @@ -35,13 +39,17 @@ USA. AH_TOP([/* +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017 Matthew Birkholz + +This file is part of a gdbm plugin for MIT/GNU Scheme Pucked, +an experimental version of MIT/GNU Scheme. + Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 Massachusetts Institute of Technology -This file is part of MIT/GNU Scheme. - MIT/GNU Scheme 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 2 of the License, or (at @@ -108,7 +116,7 @@ fi AC_DEFINE([HAVE_LIBPQ_FE_H], [1], [Define to 1 if you have the header file.]) -MIT_SCHEME_PROJECT=mit-scheme +MIT_SCHEME_PROJECT=mit-scheme-pucked : ${MIT_SCHEME_EXE=mit-scheme} MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ echo " (system-library-directory-pathname)))" ) \ @@ -145,6 +153,10 @@ done MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS} ${MIT_SCHEME_PKD}: stamp-scheme" +# Install plugin docs in Scheme's docdir subdirectories. +htmldir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)/html' +pdfdir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)/pdf' + AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_CFLAGS]) AC_SUBST([MIT_SCHEME_EXE]) diff --git a/src/pgsql/debian/changelog b/src/pgsql/debian/changelog new file mode 100644 index 000000000..779315530 --- /dev/null +++ b/src/pgsql/debian/changelog @@ -0,0 +1,5 @@ +mit-scheme-pucked-pgsql (0.1.1) birchwood; urgency=low + + * Stole v0.1 from MIT/GNU Scheme. + + -- Matt Birkholz Sun, 2 Jul 2017 00:00:00 -0700 diff --git a/src/pgsql/debian/compat b/src/pgsql/debian/compat new file mode 100644 index 000000000..ec635144f --- /dev/null +++ b/src/pgsql/debian/compat @@ -0,0 +1 @@ +9 diff --git a/src/pgsql/debian/control b/src/pgsql/debian/control new file mode 100644 index 000000000..b26922030 --- /dev/null +++ b/src/pgsql/debian/control @@ -0,0 +1,18 @@ +Source: mit-scheme-pucked-pgsql +Section: lisp +Priority: optional +Maintainer: Matt Birkholz +Build-Depends: debhelper (>= 9), autotools-dev, libltdl-dev, + mit-scheme-pucked (>= 9.2.7), + libpq-dev +Standards-Version: 3.9.4 +Homepage: http://birchwood-abbey.net/~matt/Scheme/ +Vcs-Git: git://birchwood-abbey.net/~matt/mit-scheme.git +Vcs-Browser: http://birchwood-abbey.net/gitweb/?p=mit-scheme.git;a=summary + +Package: mit-scheme-pucked-pgsql +Architecture: any +Depends: mit-scheme-pucked (>= 9.2.7), ${shlibs:Depends}, ${misc:Depends} +Description: PostgreSQL plugin for MIT/GNU Scheme Pucked + This package provides mit-scheme-pucked with a dynamically loadable + wrapper of the PostgreSQL C API as implemented by libpq. diff --git a/src/pgsql/debian/copyright b/src/pgsql/debian/copyright new file mode 100644 index 000000000..c96ba3d61 --- /dev/null +++ b/src/pgsql/debian/copyright @@ -0,0 +1,34 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: mit-scheme-pucked-pgsql +Source: http://birchwood-abbey.net/~matt/Scheme/ + +Files: * +Copyright: +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017 Matthew Birkholz +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, + 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, + 2017 Massachusetts Institute of Technology +License: GPL-2+ + This package is a PostgreSQL plugin for MIT/GNU Scheme Pucked, + an experimental version of MIT/GNU Scheme. + . + MIT/GNU Scheme 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 2 of the + License, or (at your option) any later version. + . + MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in + "/usr/share/common-licenses/GPL-2". diff --git a/src/pgsql/debian/docs b/src/pgsql/debian/docs new file mode 100644 index 000000000..50bd824bb --- /dev/null +++ b/src/pgsql/debian/docs @@ -0,0 +1,2 @@ +NEWS +README diff --git a/src/pgsql/debian/postinst.in b/src/pgsql/debian/postinst.in new file mode 100755 index 000000000..5518a995e --- /dev/null +++ b/src/pgsql/debian/postinst.in @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +( echo '(add-plugin "@PLUGIN@" "@PROJECT@"'; \ + echo ' "@INFODIR@"'; \ + echo ' (system-library-directory-pathname)'; \ + echo ' "@SCMDOCDIR@")' ) \ +| /usr/bin/mit-scheme-pucked --batch-mode + +exit 0 diff --git a/src/pgsql/debian/prerm.in b/src/pgsql/debian/prerm.in new file mode 100755 index 000000000..9a5caedd3 --- /dev/null +++ b/src/pgsql/debian/prerm.in @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +( echo '(remove-plugin "@PLUGIN@" "@PROJECT@"'; \ + echo ' "@INFODIR@"'; \ + echo ' (system-library-directory-pathname)'; \ + echo ' "@SCMDOCDIR@")' ) \ +| mit-scheme-pucked --batch-mode + +exit 0 diff --git a/src/pgsql/debian/rules b/src/pgsql/debian/rules new file mode 100755 index 000000000..b3e23f076 --- /dev/null +++ b/src/pgsql/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f + +export MIT_SCHEME_EXE=mit-scheme-pucked + +%: debian/postinst debian/prerm + dh $@ + +debian/%: debian/%.in + sed -e 's|@SCMDOCDIR@|/usr/share/doc/mit-scheme-pucked|g' \ + -e 's|@INFODIR@|/usr/share/info|g' \ + -e 's|@PROJECT@|mit-scheme-pucked|g' \ + -e 's|@PLUGIN@|pgsql|g' < $< > $@ diff --git a/src/pgsql/debian/source/format b/src/pgsql/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/src/pgsql/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/src/pgsql/debian/watch b/src/pgsql/debian/watch new file mode 100644 index 000000000..f5b64e282 --- /dev/null +++ b/src/pgsql/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://birchwood-abbey.net/~matt/Scheme/mit-scheme-pucked-pgsql-([0-9.]+)\.tar\.gz debian uupdate diff --git a/src/pgsql/make.scm b/src/pgsql/make.scm index 9279ec5f6..76654c8ad 100644 --- a/src/pgsql/make.scm +++ b/src/pgsql/make.scm @@ -6,4 +6,4 @@ (lambda () (load-package-set "pgsql"))) -(add-subsystem-identification! "PGSQL" '(0 1)) \ No newline at end of file +(add-subsystem-identification! "PGSQL" '(0 1 1)) \ No newline at end of file diff --git a/src/pgsql/pgsql.pkg b/src/pgsql/pgsql.pkg index b0e264bb5..8d0f99db7 100644 --- a/src/pgsql/pgsql.pkg +++ b/src/pgsql/pgsql.pkg @@ -35,8 +35,6 @@ USA. ustring-cp-size ustring?) (export () - import-pgsql) - (export (pgsql global) call-with-pgsql-conn close-pgsql-conn condition-type:pgsql-connection-error @@ -95,8 +93,4 @@ USA. pgsql-result-status pgsql-tuples-ok poll-pgsql-conn - poll-pgsql-reset)) - -(define-package (pgsql global) - ;; Just to get cref to analyze whether all exports are defined. - ) \ No newline at end of file + poll-pgsql-reset)) \ No newline at end of file -- 2.25.1