Skip to content

P
Postgres FD Implementation
Commit 7cebfdf2 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Backpatch BCC compile changes to 8.0.X for psql.

parent 18b5ef5a
Hide whitespace changes
Inline Side-by-side
Showing with 243 additions and 218 deletions
src/bin/psql/bcc32.mak
View file @ 7cebfdf2
# Makefile for Borland C++ 5.5 # Makefile for Borland C++ 5.5
# Borland C++ base install directory goes here # Borland C++ base install directory goes here
# BCB=d:\Borland\Bcc55 # BCB=c:\Borland\Bcc55
!IF "$(BCB)" == ""
!MESSAGE You must edit bcc32.mak and define BCB at the top
!ERROR missing BCB
!ENDIF
!IF "$(__NMAKE__)" == ""
!MESSAGE You must use the -N compatibility flag, e.g. make -N -f bcc32.make
!ERROR missing -N
!ENDIF
!MESSAGE Building PSQL.EXE ... !MESSAGE Building PSQL.EXE ...
!MESSAGE !MESSAGE
...@@ -19,7 +30,7 @@ CFG=Release ...@@ -19,7 +30,7 @@ CFG=Release
!MESSAGE You can specify a configuration when running MAKE !MESSAGE You can specify a configuration when running MAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE make -DCFG=[Release | Debug] /f bcc32.mak !MESSAGE make -N -DCFG=[Release | Debug] -f bcc32.mak
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
...@@ -49,10 +60,29 @@ INTDIR=.\Release ...@@ -49,10 +60,29 @@ INTDIR=.\Release
!endif !endif
REFDOCDIR=../../../doc/src/sgml/ref REFDOCDIR=../../../doc/src/sgml/ref
CPP_PROJ = -I$(BCB)\include;..\..\include;..\..\interfaces\libpq;..\..\include\port\win32 \
-c -D$(USERDEFINES) -DFRONTEND -n"$(INTDIR)" -tWM -tWC -q -5 -a8 -pc -X -w-use \
-w-par -w-pia -w-csu -w-aus -w-ccc
!IFDEF DEBUG
CPP_PROJ = $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG
LIBPG_DIR = Debug
!ELSE
CPP_PROJ = $(CPP_PROJ) -O -Oi -OS -DNDEBUG
LIBPG_DIR = Release
!ENDIF
!IFDEF DLL_LIBS
CPP_PROJ = $(CPP_PROJ) -D_RTLDLL
LIBRARIES = cw32mti.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpqdll.lib
!ELSE
CPP_PROJ = $(CPP_PROJ) -DBCC32_STATIC
LIBRARIES = cw32mt.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpq.lib
!ENDIF
.path.obj = $(INTDIR) .path.obj = $(INTDIR)
.c.obj: USERDEFINES = WIN32;_CONSOLE;_MBCS;HAVE_STRDUP
$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<
ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe" ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
...@@ -86,68 +116,51 @@ CLEAN : ...@@ -86,68 +116,51 @@ CLEAN :
-@erase "$(OUTDIR)\psql.exe" -@erase "$(OUTDIR)\psql.exe"
-@erase "$(INTDIR)\..\..\port\pg_config_paths.h" -@erase "$(INTDIR)\..\..\port\pg_config_paths.h"
"..\..\port\pg_config_paths.h": win32.mak LINK32=ilink32.exe
echo #define PGBINDIR "" >$@ LINK32_FLAGS=-L$(BCB)\lib;.\$(LIBPG_DIR) -x -v
echo #define PGSHAREDIR "" >>$@ LINK32_OBJS= \
echo #define SYSCONFDIR "" >>$@ "$(INTDIR)\command.obj" \
echo #define INCLUDEDIR "" >>$@ "$(INTDIR)\common.obj" \
echo #define PKGINCLUDEDIR "" >>$@ "$(INTDIR)\copy.obj" \
echo #define INCLUDEDIRSERVER "" >>$@ "$(INTDIR)\describe.obj" \
echo #define LIBDIR "" >>$@ "$(INTDIR)\help.obj" \
echo #define PKGLIBDIR "" >>$@ "$(INTDIR)\input.obj" \
echo #define LOCALEDIR "" >>$@ "$(INTDIR)\large_obj.obj" \
"$(INTDIR)\mainloop.obj" \
"$(OUTDIR)" : "$(INTDIR)\mbprint.obj" \
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" "$(INTDIR)\print.obj" \
"$(INTDIR)\prompt.obj" \
USERDEFINES = WIN32;_CONSOLE;_MBCS;HAVE_STRDUP "$(INTDIR)\psqlscan.obj" \
"$(INTDIR)\startup.obj" \
# --------------------------------------------------------------------------- "$(INTDIR)\stringutils.obj" \
CPP_PROJ = -I$(BCB)\include;..\..\include;..\..\interfaces\libpq;..\..\include\port\win32 \ "$(INTDIR)\tab-complete.obj" \
-c -D$(USERDEFINES) -DFRONTEND -tWM -tWC -q -5 -a8 -pc -X -w-use -w-par -w-pia \ "$(INTDIR)\variables.obj" \
-w-csu -w-aus -w-ccc "$(INTDIR)\exec.obj" \
"$(INTDIR)\getopt.obj" \
"$(INTDIR)\getopt_long.obj" \
"$(INTDIR)\path.obj" \
"$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\sprompt.obj"
!IFDEF DEBUG !IFDEF DEBUG
CPP_PROJ = $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Debug\blibpqddll.lib"
LIBPG_DIR = Debug
!ELSE !ELSE
CPP_PROJ = $(CPP_PROJ) -O -Oi -OS -DNDEBUG LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Release\blibpqdll.lib"
LIBPG_DIR = Release
!ENDIF !ENDIF
!IFDEF DLL_LIBS "..\..\port\pg_config_paths.h": win32.mak
CPP_PROJ = $(CPP_PROJ) -D_RTLDLL echo \#define PGBINDIR "" >$@
LIBRARIES = cw32mti.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpqdll.lib echo \#define PGSHAREDIR "" >>$@
!ELSE echo \#define SYSCONFDIR "" >>$@
CPP_PROJ = $(CPP_PROJ) -DBCC32_STATIC echo \#define INCLUDEDIR "" >>$@
LIBRARIES = cw32mt.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpq.lib echo \#define PKGINCLUDEDIR "" >>$@
!ENDIF echo \#define INCLUDEDIRSERVER "" >>$@
echo \#define LIBDIR "" >>$@
echo \#define PKGLIBDIR "" >>$@
echo \#define LOCALEDIR "" >>$@
LINK32=ilink32.exe "$(OUTDIR)" :
LINK32_FLAGS=-L$(BCB)\lib;.\$(LIBPG_DIR) -x -v if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
LINK32_OBJS= \
command.obj \
common.obj \
copy.obj \
describe.obj \
help.obj \
input.obj \
large_obj.obj \
mainloop.obj \
mbprint.obj
print.obj \
prompt.obj \
startup.obj \
stringutils.obj \
tab-complete.obj \
variables.obj \
exec.obj \
getopt.obj \
getopt_long.obj \
path.obj \
pgstrcasecmp.obj \
sprompt.obj \
"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(LINK32_OBJS) "$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(LINK32_OBJS)
$(LINK32) @&&! $(LINK32) @&&!
...@@ -157,15 +170,42 @@ LINK32_OBJS= \ ...@@ -157,15 +170,42 @@ LINK32_OBJS= \
import32.lib $(LIBRARIES),, import32.lib $(LIBRARIES),,
! !
exec.obj : "$(OUTDIR)" ..\..\port\exec.c "$(INTDIR)\exec.obj" : ..\..\port\exec.c
getopt.obj : "$(OUTDIR)" ..\..\port\getopt.c $(CPP) @<<
getopt_long.obj : "$(OUTDIR)" ..\..\port\getopt_long.c $(CPP_PROJ) ..\..\port\exec.c
path.obj : "$(OUTDIR)" ..\..\port\path.c <<
pgstrcasecmp.obj : "$(OUTDIR)" ..\..\port\pgstrcasecmp.c
sprompt.obj : "$(OUTDIR)" ..\..\port\sprompt.c "$(INTDIR)\getopt.obj" : "$(INTDIR)" ..\..\port\getopt.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\getopt.c
<<
"$(INTDIR)\getopt_long.obj" : "$(INTDIR)" ..\..\port\getopt_long.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\getopt_long.c
<<
"$(INTDIR)\path.obj" : "$(INTDIR)" ..\..\port\path.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\path.c
<<
"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c
<<
"$(INTDIR)\sprompt.obj" : "$(INTDIR)" ..\..\port\sprompt.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\sprompt.c
<<
"sql_help.h": create_help.pl "sql_help.h": create_help.pl
$(PERL) create_help.pl $(REFDOCDIR) $@ $(PERL) create_help.pl $(REFDOCDIR) $@
psqlscan.c : psqlscan.l psqlscan.c : psqlscan.l
$(FLEX) -Cfe -opsqlscan.c psqlscan.l $(FLEX) -Cfe -opsqlscan.c psqlscan.l
.c.obj:
$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<
src/bin/psql/command.c
View file @ 7cebfdf2
...@@ -3,11 +3,15 @@ ...@@ -3,11 +3,15 @@
* *
* Copyright (c) 2000-2005, PostgreSQL Global Development Group * Copyright (c) 2000-2005, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.142 2005/03/16 21:27:23 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.143 2005/04/29 13:42:20 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "command.h" #include "command.h"
#ifdef WIN32_CLIENT_ONLY /* needed for BCC */
#undef mkdir
#endif
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
#ifdef HAVE_PWD_H #ifdef HAVE_PWD_H
......
src/bin/psql/startup.c
View file @ 7cebfdf2
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2005, PostgreSQL Global Development Group * Copyright (c) 2000-2005, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.113 2005/02/22 04:40:58 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.114 2005/04/29 13:42:20 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "getopt_long.h" #include "getopt_long.h"
#ifndef HAVE_INT_OPTRESET #ifndef HAVE_INT_OPTRESET
int optreset; extern int optreset;
#endif #endif
#include <locale.h> #include <locale.h>
......
src/bin/psql/win32.mak
View file @ 7cebfdf2
...@@ -26,6 +26,14 @@ INTDIR=.\Release ...@@ -26,6 +26,14 @@ INTDIR=.\Release
REFDOCDIR= ../../../doc/src/sgml/ref REFDOCDIR= ../../../doc/src/sgml/ref
CPP_PROJ=/nologo $(OPT) /W3 /GX /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
/I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \
/D "HAVE_STRDUP" /D "FRONTEND"
CPP_OBJS=$(INTDIR)/
CPP_SBRS=.
ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe" ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
CLEAN : CLEAN :
...@@ -55,28 +63,6 @@ CLEAN : ...@@ -55,28 +63,6 @@ CLEAN :
-@erase "$(OUTDIR)\psql.exe" -@erase "$(OUTDIR)\psql.exe"
-@erase "$(INTDIR)\..\..\port\pg_config_paths.h" -@erase "$(INTDIR)\..\..\port\pg_config_paths.h"
"..\..\port\pg_config_paths.h": win32.mak
echo #define PGBINDIR "" >$@
echo #define PGSHAREDIR "" >>$@
echo #define SYSCONFDIR "" >>$@
echo #define INCLUDEDIR "" >>$@
echo #define PKGINCLUDEDIR "" >>$@
echo #define INCLUDEDIRSERVER "" >>$@
echo #define LIBDIR "" >>$@
echo #define PKGLIBDIR "" >>$@
echo #define LOCALEDIR "" >>$@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP_PROJ=/nologo $(OPT) /W3 /GX /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
/I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \
/D "HAVE_STRDUP" /D "FRONTEND"
CPP_OBJS=$(INTDIR)/
CPP_SBRS=.
LINK32=link.exe LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
advapi32.lib shfolder.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ advapi32.lib shfolder.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
...@@ -104,13 +90,28 @@ LINK32_OBJS= \ ...@@ -104,13 +90,28 @@ LINK32_OBJS= \
"$(INTDIR)\getopt_long.obj" \ "$(INTDIR)\getopt_long.obj" \
"$(INTDIR)\path.obj" \ "$(INTDIR)\path.obj" \
"$(INTDIR)\pgstrcasecmp.obj" \ "$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\sprompt.obj" \ "$(INTDIR)\sprompt.obj"
!IFDEF DEBUG !IFDEF DEBUG
"..\..\interfaces\libpq\Debug\libpqddll.lib" LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Debug\libpqddll.lib"
!ELSE !ELSE
"..\..\interfaces\libpq\Release\libpqdll.lib" LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib"
!ENDIF !ENDIF
"..\..\port\pg_config_paths.h": win32.mak
echo \#define PGBINDIR "" >$@
echo \#define PGSHAREDIR "" >>$@
echo \#define SYSCONFDIR "" >>$@
echo \#define INCLUDEDIR "" >>$@
echo \#define PKGINCLUDEDIR "" >>$@
echo \#define INCLUDEDIRSERVER "" >>$@
echo \#define LIBDIR "" >>$@
echo \#define PKGLIBDIR "" >>$@
echo \#define LOCALEDIR "" >>$@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) "$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<< $(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS) $(LINK32_FLAGS) $(LINK32_OBJS)
...@@ -121,17 +122,17 @@ LINK32_OBJS= \ ...@@ -121,17 +122,17 @@ LINK32_OBJS= \
$(CPP_PROJ) ..\..\port\exec.c $(CPP_PROJ) ..\..\port\exec.c
<< <<
"$(OUTDIR)\getopt.obj" : "$(OUTDIR)" ..\..\port\getopt.c "$(INTDIR)\getopt.obj" : "$(INTDIR)" ..\..\port\getopt.c
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) ..\..\port\getopt.c $(CPP_PROJ) ..\..\port\getopt.c
<< <<
"$(OUTDIR)\getopt_long.obj" : "$(OUTDIR)" ..\..\port\getopt_long.c "$(INTDIR)\getopt_long.obj" : "$(INTDIR)" ..\..\port\getopt_long.c
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) ..\..\port\getopt_long.c $(CPP_PROJ) ..\..\port\getopt_long.c
<< <<
"$(OUTDIR)\path.obj" : "$(OUTDIR)" ..\..\port\path.c "$(INTDIR)\path.obj" : "$(INTDIR)" ..\..\port\path.c
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) ..\..\port\path.c $(CPP_PROJ) ..\..\port\path.c
<< <<
...@@ -141,23 +142,20 @@ LINK32_OBJS= \ ...@@ -141,23 +142,20 @@ LINK32_OBJS= \
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c $(CPP_PROJ) ..\..\port\pgstrcasecmp.c
<< <<
"$(OUTDIR)\sprompt.obj" : "$(OUTDIR)" ..\..\port\sprompt.c "$(INTDIR)\sprompt.obj" : "$(INTDIR)" ..\..\port\sprompt.c
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) ..\..\port\sprompt.c $(CPP_PROJ) ..\..\port\sprompt.c
<< <<
"sql_help.h" : create_help.pl
$(PERL) create_help.pl $(REFDOCDIR) $@
psqlscan.c : psqlscan.l
$(FLEX) -Cfe -opsqlscan.c psqlscan.l
.c{$(CPP_OBJS)}.obj:: .c{$(CPP_OBJS)}.obj::
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) $< $(CPP_PROJ) $<
<< <<
.cpp{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
sql_help.h : create_help.pl
$(PERL) create_help.pl $(REFDOCDIR) $@
psqlscan.c: psqlscan.l
$(FLEX) -Cfe -opsqlscan.c psqlscan.l
src/interfaces/libpq/Makefile
View file @ 7cebfdf2
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.131 2005/03/25 00:34:28 tgl Exp $ # $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.132 2005/04/29 13:42:21 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -145,7 +145,8 @@ uninstall: uninstall-lib ...@@ -145,7 +145,8 @@ uninstall: uninstall-lib
rm -f $(DESTDIR)$(includedir)/libpq-fe.h $(DESTDIR)$(includedir_internal)/libpq-int.h $(DESTDIR)$(includedir_internal)/pqexpbuffer.h rm -f $(DESTDIR)$(includedir)/libpq-fe.h $(DESTDIR)$(includedir_internal)/libpq-int.h $(DESTDIR)$(includedir_internal)/pqexpbuffer.h
clean distclean: clean-lib clean distclean: clean-lib
rm -f $(OBJS) crypt.c getaddrinfo.c inet_aton.c noblock.c pgstrcasecmp.c snprintf.c strerror.c open.c thread.c md5.c ip.c encnames.c wchar.c pthread.h # pg_config_paths.h might be left over from a Win32 client-only build
rm -f $(OBJS) pg_config_paths.h crypt.c getaddrinfo.c inet_aton.c noblock.c pgstrcasecmp.c snprintf.c strerror.c open.c thread.c md5.c ip.c encnames.c wchar.c pthread.h
maintainer-clean: distclean maintainer-clean: distclean
rm -f $(srcdir)/libpqdll.def $(srcdir)/libpqddll.def $(srcdir)/blibpqdll.def $(srcdir)/libpq.rc rm -f $(srcdir)/libpqdll.def $(srcdir)/libpqddll.def $(srcdir)/blibpqdll.def $(srcdir)/libpq.rc
src/interfaces/libpq/bcc32.mak
View file @ 7cebfdf2
...@@ -4,7 +4,17 @@ ...@@ -4,7 +4,17 @@
# and a Win32 dynamic library libpq.dll with import library libpqdll.lib # and a Win32 dynamic library libpq.dll with import library libpqdll.lib
# Borland C++ base install directory goes here # Borland C++ base install directory goes here
# BCB=d:\Borland\Bcc55 # BCB=c:\Borland\Bcc55
!IF "$(BCB)" == ""
!MESSAGE You must edit bcc32.mak and define BCB at the top
!ERROR misssing BCB
!ENDIF
!IF "$(__NMAKE__)" == ""
!MESSAGE You must use the -N compatibility flag, e.g. make -N -f bcc32.make
!ERROR missing -N
!ENDIF
!MESSAGE Building the Win32 DLL and Static Library... !MESSAGE Building the Win32 DLL and Static Library...
!MESSAGE !MESSAGE
...@@ -22,7 +32,7 @@ CFG=Release ...@@ -22,7 +32,7 @@ CFG=Release
!MESSAGE You can specify a configuration when running MAKE !MESSAGE You can specify a configuration when running MAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE make -DCFG=[Release | Debug] /f bcc32.mak !MESSAGE make -N -DCFG=[Release | Debug] -f bcc32.mak
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
...@@ -52,7 +62,7 @@ OUTFILENAME=blibpq ...@@ -52,7 +62,7 @@ OUTFILENAME=blibpq
USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP; USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP;
CPP=bcc32.exe CPP=bcc32.exe
CPP_PROJ = -I$(BCB)\include;..\..\include -WD -c -D$(USERDEFINES) -tWM \ CPP_PROJ = -I$(BCB)\include;..\..\include -n"$(INTDIR)" -WD -c -D$(USERDEFINES) -tWM \
-a8 -X -w-use -w-par -w-pia -w-csu -w-aus -w-ccc -a8 -X -w-use -w-par -w-pia -w-csu -w-aus -w-ccc
!IFDEF DEBUG !IFDEF DEBUG
...@@ -61,6 +71,8 @@ CPP_PROJ = $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG ...@@ -61,6 +71,8 @@ CPP_PROJ = $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG
CPP_PROJ = $(CPP_PROJ) -O -Oi -OS -DNDEBUG CPP_PROJ = $(CPP_PROJ) -O -Oi -OS -DNDEBUG
!endif !endif
ALL : config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
CLEAN : CLEAN :
-@erase "$(INTDIR)\getaddrinfo.obj" -@erase "$(INTDIR)\getaddrinfo.obj"
-@erase "$(INTDIR)\pgstrcasecmp.obj" -@erase "$(INTDIR)\pgstrcasecmp.obj"
...@@ -93,6 +105,7 @@ CLEAN : ...@@ -93,6 +105,7 @@ CLEAN :
-@erase "$(OUTDIR)\$(OUTFILENAME).tds" -@erase "$(OUTDIR)\$(OUTFILENAME).tds"
-@erase "$(INTDIR)\pg_config_paths.h" -@erase "$(INTDIR)\pg_config_paths.h"
LIB32=tlib.exe LIB32=tlib.exe
LIB32_FLAGS= LIB32_FLAGS=
LIB32_OBJS= \ LIB32_OBJS= \
...@@ -121,15 +134,6 @@ LIB32_OBJS= \ ...@@ -121,15 +134,6 @@ LIB32_OBJS= \
"$(INTDIR)\pthread-win32.obj" "$(INTDIR)\pthread-win32.obj"
RSC=brcc32.exe
RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res"
LINK32=ilink32.exe
LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v
LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
ALL: config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
config: ..\..\include\pg_config.h pthread.h pg_config_paths.h config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
..\..\include\pg_config.h: ..\..\include\pg_config.h.win32 ..\..\include\pg_config.h: ..\..\include\pg_config.h.win32
...@@ -138,85 +142,91 @@ config: ..\..\include\pg_config.h pthread.h pg_config_paths.h ...@@ -138,85 +142,91 @@ config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
pthread.h: pthread.h.win32 pthread.h: pthread.h.win32
copy pthread.h.win32 pthread.h copy pthread.h.win32 pthread.h
pg_config_paths.h: win32.mak pg_config_paths.h: bcc32.mak
echo #define SYSCONFDIR "" > pg_config_paths.h echo \#define SYSCONFDIR "" > pg_config_paths.h
"$(OUTDIR)" : "$(OUTDIR)" :
@if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
/* @&&! is a Response file, http://users.deltacomm.com/edmulroy/howto8.htm */ RSC=brcc32.exe
RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res"
LINK32=ilink32.exe
LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v
LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
# @<< is a Response file, http://www.opussoftware.com/tutorial/TutMakefile.htm
"$(OUTDIR)\blibpq.dll": "$(OUTDIR)\blibpq.lib" $(LINK32_OBJS) "$(INTDIR)\libpq.res" blibpqdll.def "$(OUTDIR)\blibpq.dll": "$(OUTDIR)\blibpq.lib" $(LINK32_OBJS) "$(INTDIR)\libpq.res" blibpqdll.def
$(LINK32) @&&! $(LINK32) @<<
$(LINK32_FLAGS) + $(LINK32_FLAGS) +
c0d32.obj $(LINK32_OBJS), + c0d32.obj $(LINK32_OBJS), +
$@,, + $@,, +
"$(OUTDIR)\blibpq.lib" import32.lib cw32mti.lib, + "$(OUTDIR)\blibpq.lib" import32.lib cw32mti.lib, +
blibpqdll.def,"$(INTDIR)\libpq.res" blibpqdll.def,"$(INTDIR)\libpq.res"
! <<
implib -w "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@ implib -w "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@
"$(INTDIR)\libpq.res" : "$(INTDIR)" libpq.rc "$(INTDIR)\libpq.res" : "$(INTDIR)" libpq.rc
$(RSC) $(RSC_PROJ) libpq.rc $(RSC) $(RSC_PROJ) libpq.rc
"$(OUTDIR)\blibpq.lib": $(LIB32_OBJS) "$(OUTDIR)\blibpq.lib": $(LIB32_OBJS)
$(LIB32) $@ @&&! $(LIB32) $@ @<<
+-"$(**: =" &^ +-"$(**: =" &^
+-")" +-")"
! <<
"$(INTDIR)\getaddrinfo.obj" : ..\..\port\getaddrinfo.c "$(INTDIR)\getaddrinfo.obj" : ..\..\port\getaddrinfo.c
$(CPP) @&&! $(CPP) @<<
$(CPP_PROJ) ..\..\port\getaddrinfo.c $(CPP_PROJ) ..\..\port\getaddrinfo.c
! <<
"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c "$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c
$(CPP) @&&! $(CPP) @<<
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c $(CPP_PROJ) ..\..\port\pgstrcasecmp.c
! <<
"$(INTDIR)\thread.obj" : ..\..\port\thread.c "$(INTDIR)\thread.obj" : ..\..\port\thread.c
$(CPP) @&&! $(CPP) @<<
$(CPP_PROJ) ..\..\port\thread.c $(CPP_PROJ) ..\..\port\thread.c
! <<
"$(INTDIR)\inet_aton.obj" : ..\..\port\inet_aton.c "$(INTDIR)\inet_aton.obj" : ..\..\port\inet_aton.c
$(CPP) @&&! $(CPP) @<<
$(CPP_PROJ) ..\..\port\inet_aton.c $(CPP_PROJ) ..\..\port\inet_aton.c
! <<
"$(INTDIR)\crypt.obj" : ..\..\port\crypt.c "$(INTDIR)\crypt.obj" : ..\..\port\crypt.c
$(CPP) @&&! $(CPP) @<<
$(CPP_PROJ) ..\..\port\crypt.c $(CPP_PROJ) ..\..\port\crypt.c
! <<
"$(INTDIR)\noblock.obj" : ..\..\port\noblock.c "$(INTDIR)\noblock.obj" : ..\..\port\noblock.c
$(CPP) @&&! $(CPP) @<<
$(CPP_PROJ) ..\..\port\noblock.c $(CPP_PROJ) ..\..\port\noblock.c
! <<
"$(INTDIR)\md5.obj" : ..\..\backend\libpq\md5.c "$(INTDIR)\md5.obj" : ..\..\backend\libpq\md5.c
$(CPP) @&&! $(CPP) @<<
$(CPP_PROJ) ..\..\backend\libpq\md5.c $(CPP_PROJ) ..\..\backend\libpq\md5.c
! <<
"$(INTDIR)\ip.obj" : ..\..\backend\libpq\ip.c "$(INTDIR)\ip.obj" : ..\..\backend\libpq\ip.c
$(CPP) @&&! $(CPP) @<<
$(CPP_PROJ) ..\..\backend\libpq\ip.c $(CPP_PROJ) ..\..\backend\libpq\ip.c
! <<
"$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c "$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
$(CPP) @&&! $(CPP) @<<
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\wchar.c $(CPP_PROJ) /I"." ..\..\backend\utils\mb\wchar.c
! <<
"$(INTDIR)\encnames.obj" : ..\..\backend\utils\mb\encnames.c "$(INTDIR)\encnames.obj" : ..\..\backend\utils\mb\encnames.c
$(CPP) @&&! $(CPP) @<<
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\encnames.c $(CPP_PROJ) /I"." ..\..\backend\utils\mb\encnames.c
! <<
.c.obj: .c.obj:
$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $< $(CPP) $(CPP_PROJ) $<
src/interfaces/libpq/fe-exec.c
View file @ 7cebfdf2
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.166 2004/12/31 22:03:50 pgsql Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.167 2005/04/29 13:42:21 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -2294,7 +2294,7 @@ PQisnonblocking(const PGconn *conn) ...@@ -2294,7 +2294,7 @@ PQisnonblocking(const PGconn *conn)
int int
PQflush(PGconn *conn) PQflush(PGconn *conn)
{ {
return (pqFlush(conn)); return pqFlush(conn);
} }
......
src/interfaces/libpq/pthread-win32.c
View file @ 7cebfdf2
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
* *
* Copyright (c) 2004-2005, PostgreSQL Global Development Group * Copyright (c) 2004-2005, PostgreSQL Global Development Group
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/pthread-win32.c,v 1.4 2005/01/01 20:44:31 tgl Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/pthread-win32.c,v 1.5 2005/04/29 13:42:21 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <windows.h> #include <windows.h>
#include <pthread.h> #include "pthread.h"
HANDLE HANDLE
pthread_self() pthread_self()
......
src/interfaces/libpq/win32.mak
View file @ 7cebfdf2
...@@ -78,6 +78,34 @@ CLEAN : ...@@ -78,6 +78,34 @@ CLEAN :
-@erase "$(INTDIR)\pg_config_paths.h" -@erase "$(INTDIR)\pg_config_paths.h"
LIB32=link.exe -lib
LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\$(OUTFILENAME).lib"
LIB32_OBJS= \
"$(INTDIR)\win32.obj" \
"$(INTDIR)\getaddrinfo.obj" \
"$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\thread.obj" \
"$(INTDIR)\inet_aton.obj" \
"$(INTDIR)\crypt.obj" \
"$(INTDIR)\noblock.obj" \
"$(INTDIR)\md5.obj" \
"$(INTDIR)\ip.obj" \
"$(INTDIR)\fe-auth.obj" \
"$(INTDIR)\fe-protocol2.obj" \
"$(INTDIR)\fe-protocol3.obj" \
"$(INTDIR)\fe-connect.obj" \
"$(INTDIR)\fe-exec.obj" \
"$(INTDIR)\fe-lobj.obj" \
"$(INTDIR)\fe-misc.obj" \
"$(INTDIR)\fe-print.obj" \
"$(INTDIR)\fe-secure.obj" \
"$(INTDIR)\pqexpbuffer.obj" \
"$(INTDIR)\pqsignal.obj" \
"$(INTDIR)\wchar.obj" \
"$(INTDIR)\encnames.obj" \
"$(INTDIR)\pthread-win32.obj"
config: ..\..\include\pg_config.h pthread.h pg_config_paths.h config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
..\..\include\pg_config.h: ..\..\include\pg_config.h.win32 ..\..\include\pg_config.h: ..\..\include\pg_config.h.win32
...@@ -87,7 +115,7 @@ pthread.h: pthread.h.win32 ...@@ -87,7 +115,7 @@ pthread.h: pthread.h.win32
copy pthread.h.win32 pthread.h copy pthread.h.win32 pthread.h
pg_config_paths.h: win32.mak pg_config_paths.h: win32.mak
echo #define SYSCONFDIR "" > pg_config_paths.h echo \#define SYSCONFDIR "" > pg_config_paths.h
"$(OUTDIR)" : "$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
...@@ -107,34 +135,6 @@ CPP_PROJ=$(CPP_PROJ) /D ENABLE_THREAD_SAFETY ...@@ -107,34 +135,6 @@ CPP_PROJ=$(CPP_PROJ) /D ENABLE_THREAD_SAFETY
CPP_SBRS=. CPP_SBRS=.
LIB32=link.exe -lib
LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\$(OUTFILENAME).lib"
LIB32_OBJS= \
"$(INTDIR)\win32.obj" \
"$(INTDIR)\getaddrinfo.obj" \
"$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\thread.obj" \
"$(INTDIR)\inet_aton.obj" \
"$(INTDIR)\crypt.obj" \
"$(INTDIR)\noblock.obj" \
"$(INTDIR)\md5.obj" \
"$(INTDIR)\ip.obj" \
"$(INTDIR)\fe-auth.obj" \
"$(INTDIR)\fe-protocol2.obj" \
"$(INTDIR)\fe-protocol3.obj" \
"$(INTDIR)\fe-connect.obj" \
"$(INTDIR)\fe-exec.obj" \
"$(INTDIR)\fe-lobj.obj" \
"$(INTDIR)\fe-misc.obj" \
"$(INTDIR)\fe-print.obj" \
"$(INTDIR)\fe-secure.obj" \
"$(INTDIR)\pqexpbuffer.obj" \
"$(INTDIR)\pqsignal.obj" \
"$(INTDIR)\wchar.obj" \
"$(INTDIR)\encnames.obj" \
"$(INTDIR)\pthread-win32.obj"
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res" RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
LINK32=link.exe LINK32=link.exe
...@@ -148,7 +148,7 @@ LINK32_OBJS= \ ...@@ -148,7 +148,7 @@ LINK32_OBJS= \
"$(OUTDIR)\libpq.res" "$(OUTDIR)\libpq.res"
/* @<< is a Response file, http://www.opussoftware.com/tutorial/TutMakefile.htm */ # @<< is a Response file, http://www.opussoftware.com/tutorial/TutMakefile.htm
"$(OUTDIR)\$(OUTFILENAME).lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) "$(OUTDIR)\$(OUTFILENAME).lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<< $(LIB32) @<<
...@@ -206,42 +206,14 @@ LINK32_OBJS= \ ...@@ -206,42 +206,14 @@ LINK32_OBJS= \
"$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c "$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\wchar.c $(CPP_PROJ) /I"." ..\..\backend\utils\mb\wchar.c
<< <<
"$(INTDIR)\encnames.obj" : ..\..\backend\utils\mb\encnames.c "$(INTDIR)\encnames.obj" : ..\..\backend\utils\mb\encnames.c
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\encnames.c $(CPP_PROJ) /I"." ..\..\backend\utils\mb\encnames.c
<< <<
.c.obj:
.c{$(CPP_OBJS)}.obj:: $(CPP) $(CPP_PROJ) $<
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment