[Pypgsql-checkins] CVS: pypgsql setup.py,1.11,1.12 PgSQL.py,1.28,NONE

[Billy G. A. <bal...@us...>]

Update of /cvsroot/pypgsql/pypgsql
In directory usw-pr-cvs1:/tmp/cvs-serv12800

Modified Files:
	setup.py 
Removed Files:
	PgSQL.py 
Log Message:
13OCT2001 bga	Re-arranged how the PgSQL and libpq modules are accessed.
		There is now a pyPgSQL package the encapulates PgSQL and libpq.
		Also, libpq is now a package (of pyPgSQL) that contains the
		libpqmodule.so file.  This was done so that support for
		pickling of the Pg* types/objects could be added.


Index: setup.py
===================================================================
RCS file: /cvsroot/pypgsql/pypgsql/setup.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** setup.py	2001/09/20 03:52:32	1.11
--- setup.py	2001/10/13 20:58:22	1.12
***************
*** 88,95 ****
  optional_libs = [ "pq" ]
  
! sources = [ "libpqmodule.c",  "pgboolean.c",    "pgint2object.c",
!             "pgint8object.c", "pgversion.c",    "pglargeobject.c",
! 	    "pgnotify.c",     "pgconnection.c", "pgresult.c",
! 	    "pymemstrdup.c"						]
  
  if sys.platform == "win32":
--- 88,96 ----
  optional_libs = [ "pq" ]
  
! sources = [ "libpqmodule.c",  "pgboolean.c",
! 	    "pgint2object.c", "pgint8object.c",
! 	    "pgversion.c",    "pglargeobject.c",
! 	    "pgnotify.c",     "pgconnection.c",
! 	    "pgresult.c",     "pymemstrdup.c" ]
  
  if sys.platform == "win32":
***************
*** 111,121 ****
      data_files = [ "libpq.dll" ]    # [] for static linking
  
!     sources = sources + [ "windows/strtoll.c", "windows/strtoull.c",
  			  "windows/strtok.c" ]
  
!     modname="libpq"
  else:
      if sys.platform[:6] == "cygwin":
! 	sources = sources + [ "windows/strtoll.c", "windows/strtoull.c", 
  			      "windows/strtok.c" ]
  	include_dirs  = [ "/usr/include/postgresql" ]
--- 112,124 ----
      data_files = [ "libpq.dll" ]    # [] for static linking
  
!     sources = sources + [ "windows/strtoll.c",
! 			  "windows/strtoull.c",
  			  "windows/strtok.c" ]
  
!     modname="pyPgSQL.libpq.libpq"
  else:
      if sys.platform[:6] == "cygwin":
! 	sources = sources + [ "windows/strtoll.c",
! 			      "windows/strtoull.c", 
  			      "windows/strtok.c" ]
  	include_dirs  = [ "/usr/include/postgresql" ]
***************
*** 128,132 ****
      pypgsql_rt_dirs = library_dirs
  
!     modname="libpqmodule"
  
  setup (
--- 131,135 ----
      pypgsql_rt_dirs = library_dirs
  
!     modname="pyPgSQL.libpq.libpqmodule"
  
  setup (
***************
*** 137,143 ****
      author = "Billy G. Allie",
      author_email = "bal...@so...",
!     url = "http://www.sourceforge.net/projects/pypgsql/",
      licence = "Python",
!     py_modules = [ "PgSQL" ],
      ext_modules = [Extension(
          name=modname,
--- 140,146 ----
      author = "Billy G. Allie",
      author_email = "bal...@so...",
!     url = "http://pypgsql.sourceforge.net/",
      licence = "Python",
!     packages = [ "pyPgSQL", "pyPgSQL.libpq" ],
      ext_modules = [Extension(
          name=modname,

--- PgSQL.py DELETED ---