PL/Python integration: support in create/droplang, add CVS keywords,

remove useless files, beat some sense into Makefile.  For me it builds
and sort of runs, so it's a start.

Author: petere

src/bin/scripts/createlang.sh

@@ -7,7 +7,7 @@
 # Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.24 2001/05/09 22:08:19 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.25 2001/05/12 01:30:30 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -209,9 +209,15 @@ case "$langname" in
 		handler="plperl_call_handler"
 		object="plperl"
 		;;
+	plpython)
+		lancomp="PL/Python"
+		trusted="TRUSTED "
+		handler="plpython_call_handler"
+		object="plpython"
+		;;
 	*)
 		echo "$CMDNAME: unsupported language '$langname'" 1>&2
-		echo "Supported languages are 'plpgsql', 'pltcl', 'pltclu', and 'plperl'." 1>&2
+		echo "Supported languages are 'plpgsql', 'pltcl', 'pltclu', 'plperl', and 'plpython'." 1>&2
 		exit 1
         ;;
 esac

src/bin/scripts/droplang

@@ -7,7 +7,7 @@
 # Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.14 2001/05/09 22:08:19 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.15 2001/05/12 01:30:30 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -177,9 +177,13 @@ case "$langname" in
 		lancomp="PL/Perl"
 		handler="plperl_call_handler"
                 ;;
+	plpython)
+		lancomp="PL/Python"
+		handler="plpython_call_handler"
+                ;;
 	*)
 		echo "$CMDNAME: unsupported language '$langname'" 1>&2
-		echo "Supported languages are 'plpgsql', 'pltcl', 'pltclu', and 'plperl'." 1>&2
+		echo "Supported languages are 'plpgsql', 'pltcl', 'pltclu', 'plperl', and 'plpython'." 1>&2
 		exit 1
                 ;;
 esac

src/pl/Makefile

@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.19 2001/05/10 03:00:11 momjian Exp $
+# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.20 2001/05/12 01:30:30 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -22,12 +22,12 @@ ifeq ($(with_perl), yes)
 DIRS += plperl
 endif
 
+# Doesn't build portably yet.
 #ifeq ($(with_python), yes)
 #DIRS += plpython
 #endif
 
 all install installdirs uninstall depend distprep:
-	@echo "PL/Python disabled until merged into our Makefile system, bjm 2001-05-09"
 	@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
 
 clean distclean maintainer-clean:

src/pl/plpython/Makefile

@@ -1,69 +1,60 @@
+# $Header: /cvsroot/pgsql/src/pl/plpython/Makefile,v 1.4 2001/05/12 01:30:30 petere Exp $
 
-# cflags.  pick your favorite
-#
-CC=gcc
-CFLAGS=-g -O0 -Wall -Wmissing-declarations -fPIC
+subdir = src/pl/plpython
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
-# build info for python, alter as needed
-#
+# These things ought to go into $(top_srcdir)/config/python.m4 sometime.
 
-# python headers
-#
-#INCPYTHON=/usr/include/python1.5
-INCPYTHON=/usr/include/python2.0
+PYTHON_VERSION := $(shell $(PYTHON) -c  'import sys; print sys.version[:3]')
+PYTHON_INCLUDE := $(shell $(PYTHON) -c 'import sys; print sys.prefix')/include/python$(PYTHON_VERSION)
 
-# python shared library
-#
-#LIBPYTHON=python1.5
-LIBPYTHON=python2.0
+override CPPFLAGS := -I$(srcdir) -I$(PYTHON_INCLUDE) $(CPPFLAGS)
 
-# if python is someplace odd
-#
-LIBPYTHONPATH=/usr/lib
+PYTHON_LIB := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')/lib/python$(PYTHON_VERSION)
 
-# python 2 seems to want libdb
-# various db libs are still messed on my system
-#
-#LIBPYTHONEXTRA=/usr/lib/libdb2.so.2.7.7
-#LIBPYTHONEXTRA=-ldb2
+NAME = plpython
+SO_MAJOR_VERSION = 0
+SO_MINOR_VERSION = 0
+OBJS = plpython.o
 
-LDPYTHON=-L$(LIBPYTHONPATH) -l$(LIBPYTHON) $(LIBPYTHONEXTRA)
+# This static version might work on most ELF systems...
+SHLIB_LINK += $(PYTHON_LIB)/config/libpython$(PYTHON_VERSION).a
+# ...otherwise you need a shared version, but you need to build that yourself.
+#SHLIB_LINK += -lpython$(PYTHON_VERSION)
 
-# build info for postgres
-#
+# Python uses this.  Should become a configure check.
+SHLIB_LINK += -lpthread
 
-# postgres headers.  the installed include directory doesn't work for me
-#
-#INCPOSTGRES=/usr/include/postgres
-INCPOSTGRES=/home/andrew/builds/postgresql/src/include
+# Python 2 seems to want libdb.
+#SHLIB_LINK += -ldb2
 
-# hopefully you won't need this utter crap...
-# but if you can't patch the appropriate dynloader file, try this.  you
-# may have to add other modules.
-#
-#DLDIR=/usr/lib/python1.5/lib-dynload
-#DLHACK=$(DLDIR)/arraymodule.so $(DLDIR)/timemodule.so $(DLDIR)/cmathmodule.so $(DLDIR)/errnomodule.so $(DLDIR)/mathmodule.so $(DLDIR)/md5module.so $(DLDIR)/operator.so
-# $(DLDIR)/shamodule.so
 
-# shouldn't need to alter anything below here
+# Hopefully you won't need this utter crap.  But if you can't patch
+# the appropriate dynloader file, try this.  You may have to add other
+# modules.
 #
-INCLUDES=-I$(INCPYTHON) -I$(INCPOSTGRES) -I./
+#DLDIR=$(PYTHON_LIB)/lib-dynload
+#DLHACK=$(DLDIR)/arraymodule.so $(DLDIR)/timemodule.so $(DLDIR)/cmathmodule.so $(DLDIR)/errnomodule.so $(DLDIR)/mathmodule.so $(DLDIR)/md5module.so $(DLDIR)/operator.so $(DLDIR)/shamodule.so
+#SHLIB_LINK += $(DLDIR)
+
+include $(top_srcdir)/src/Makefile.shlib
 
-# dynamic linker flags.  
-#
-#LDFLAGS=--shared -Wl,-Bshareable -Wl,-E -Wl,-soname,$@
-LDFLAGS=--shared -Wl,-E -Wl,-soname,$@
 
-.PHONY: clean
+all: all-lib
 
-all: plpython.so 
+install: all installdirs
+	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(libdir)/plpython$(DLSUFFIX)
 
-plpython.o: plpython.c plpython.h
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
 
-plpython.so: plpython.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LDPYTHON) $(DLHACK) -ldl -lpthread -lm
+uninstall:
+	rm -f $(DESTDIR)$(libdir)/plpython$(DLSUFFIX)
 
-clean:
-	rm -f plpython.so *.o
+clean distclean maintainer-clean: clean-lib
+	rm -f $(OBJS)
+	@rm -f error.diff feature.diff error.output feature.output test.log
 
+installcheck:
+	PATH=$(bindir):$$PATH $(SHELL) $(srcdir)/test.sh