pypgsql-checkins

[<gha...@us...>]

Update of /cvsroot/pypgsql/pypgsql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14887

Modified Files:
	libpqmodule.h pgconnection.c pgversion.c setup.py 
Log Message:
26SEP2005 gh  Changed win32 build process to use MSVC.NET (needed
              for Python 2.4, and add an additonal needed library
              for PostgreSQL 8.

	      Other trivial fixes to allow compilation with MSVC.NET to
              finally build win32 binaries for Python 2.4.


Index: libpqmodule.h
===================================================================
RCS file: /cvsroot/pypgsql/pypgsql/libpqmodule.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** libpqmodule.h	16 Jun 2003 11:59:41 -0000	1.10
--- libpqmodule.h	26 Sep 2005 08:08:17 -0000	1.11
***************
*** 44,49 ****
--- 44,51 ----
  #include <winsock.h>
  #include <windows.h>
+ #ifdef __MINGW__
  #include "win32.h"
  #endif
+ #endif
  
  #define MODULE_NAME	"libpq"

Index: pgconnection.c
===================================================================
RCS file: /cvsroot/pypgsql/pypgsql/pgconnection.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** pgconnection.c	16 May 2005 03:31:03 -0000	1.23
--- pgconnection.c	26 Sep 2005 08:08:17 -0000	1.24
***************
*** 100,103 ****
--- 100,107 ----
  #include "libpqmodule.h"
  
+ #ifdef _MSC_VER
+ #define strcasecmp lstrcmpiA
+ #endif
+ 
  /*******************************************************\
  | Notice Processor - Adds database notices to a list	|

Index: pgversion.c
===================================================================
RCS file: /cvsroot/pypgsql/pypgsql/pgversion.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** pgversion.c	1 Mar 2005 21:06:44 -0000	1.22
--- pgversion.c	26 Sep 2005 08:08:17 -0000	1.23
***************
*** 32,35 ****
--- 32,37 ----
  | Date      Ini Description						|
  | --------- --- ------------------------------------------------------- |
+ | 26SEP2005 gh  Minor fix for stricter C compilers (move variable       |
+ |               declaration to start of function).                      |
  | 06OCT2004 bga [Bug #786712 & #816729] Allowed for a version string	|
  |		containing the words "alpha" and "beta".		|
***************
*** 164,167 ****
--- 166,170 ----
  {
      char *last;
+     int i;
  
      /*******************************************************************\
***************
*** 181,185 ****
       * alpha, beta, etc versions of PostgreSQL
       */
-     int i;
      for (i = 1; token[i] != 0; i++) {
  	if (!isdigit(token[i])) {
--- 184,187 ----

Index: setup.py
===================================================================
RCS file: /cvsroot/pypgsql/pypgsql/setup.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** setup.py	6 Mar 2005 04:56:26 -0000	1.24
--- setup.py	26 Sep 2005 08:08:17 -0000	1.25
***************
*** 45,48 ****
--- 45,52 ----
  # Date      Ini Description						|
  # --------- --- ------------------------------------------------------- |
+ # 26SEP2005 gh  Changed win32 build process to use MSVC.NET (needed     |
+ #               for Python 2.4, and add an additonal needed library     |
+ #               for PostgreSQL 8.                                       |
+ #		[Bug #1154791]						|
  # 05MAR2004 bga Added /usr/include/postgresql to includes.		|
  #		[Bug #1154791]						|
***************
*** 140,144 ****
      elif sys.platform == "win32":
  	# This works with the PostgreSQL source tree, so it's a bit ugly ...
! 	# Lines commented out are for using MSVC instead of mingw
  	win_pg_build_root = os.getenv("PG_SRC", "../postgresql")
  
--- 144,148 ----
      elif sys.platform == "win32":
  	# This works with the PostgreSQL source tree, so it's a bit ugly ...
! 	# Lines commented out are for using mingw instead of MSVC.NET.
  	win_pg_build_root = os.getenv("PG_SRC", "../postgresql")
  
***************
*** 149,156 ****
  			 "src/interfaces/libpq"]]
  
! 	library_dirs = [win_pg_build_root + "/src/interfaces/libpq"]
! 	#library_dirs = [win_pg_build_root + "/src/interfaces/libpq/Release"]
! 	optional_libs += ["wsock32", "advapi32"]
! 	#optional_libs = ["libpq", "wsock32", "advapi32"]
  	modname="pyPgSQL.libpq.libpq"
      else:
--- 153,160 ----
  			 "src/interfaces/libpq"]]
  
! 	#library_dirs = [win_pg_build_root + "/src/interfaces/libpq"]
! 	library_dirs = [win_pg_build_root + "/src/interfaces/libpq/Release"]
! 	#optional_libs += ["wsock32", "advapi32"]
! 	optional_libs = ["libpq", "wsock32", "advapi32", "shfolder"]
  	modname="pyPgSQL.libpq.libpq"
      else: