From ef393e733e9c91f0534f27741fcbac42cd9912fc Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Mon, 5 Mar 2007 14:18:38 +0000 Subject: [PATCH] Remove old-style win32 client-only visual c++ build infrastructure for everything except libpq. We need to keep libpq to build static libraries and to use PQtrace with clients using older versions of MSVC. --- src/bcc32.mak | 12 +- src/bin/pg_config/win32.mak | 119 ------------------ src/bin/pg_dump/win32.mak | 208 ------------------------------ src/bin/psql/bcc32.mak | 243 ------------------------------------ src/bin/psql/win32.mak | 192 ---------------------------- src/win32.mak | 19 +-- 6 files changed, 6 insertions(+), 787 deletions(-) delete mode 100644 src/bin/pg_config/win32.mak delete mode 100644 src/bin/pg_dump/win32.mak delete mode 100644 src/bin/psql/bcc32.mak delete mode 100644 src/bin/psql/win32.mak diff --git a/src/bcc32.mak b/src/bcc32.mak index 784ad68b0a..35aba705e6 100644 --- a/src/bcc32.mak +++ b/src/bcc32.mak @@ -1,8 +1,7 @@ -# $PostgreSQL: pgsql/src/bcc32.mak,v 1.4 2006/10/06 18:53:53 tgl Exp $ +# $PostgreSQL: pgsql/src/bcc32.mak,v 1.5 2007/03/05 14:18:38 mha Exp $ # Makefile for Borland C++ 5.5 (or compat) -# Top-file makefile for Win32 parts of postgresql. -# Note that most parts are not ported to Win32! +# Top-file makefile for building Win32 libpq with Borland C++. !IF "$(CFG)" != "Release" && "$(CFG)" != "Debug" !MESSAGE Invalid configuration "$(CFG)" specified. @@ -13,7 +12,7 @@ !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "Release" (Win32 Release ) +!MESSAGE "Release" (Win32 Release) !MESSAGE "Debug" (Win32 Debug) !MESSAGE !ENDIF @@ -31,8 +30,6 @@ ALL: cd .. cd interfaces\libpq make -N -DCFG=$(CFG) /f bcc32.mak - cd ..\..\bin\psql - make -N -DCFG=$(CFG) /f bcc32.mak cd ..\.. echo All Win32 parts have been built! @@ -40,9 +37,6 @@ CLEAN: cd interfaces\libpq make -N -DCFG=Release /f bcc32.mak CLEAN make -N -DCFG=Debug /f bcc32.mak CLEAN - cd ..\..\bin\psql - make -N -DCFG=Release /f bcc32.mak CLEAN - make -N -DCFG=Debug /f bcc32.mak CLEAN cd ..\.. echo All Win32 parts have been cleaned! diff --git a/src/bin/pg_config/win32.mak b/src/bin/pg_config/win32.mak deleted file mode 100644 index a0fccf321f..0000000000 --- a/src/bin/pg_config/win32.mak +++ /dev/null @@ -1,119 +0,0 @@ -# Makefile for Microsoft Visual C++ 5.0 (or compat) - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe - -!IFDEF DEBUG -OPT=/Od /Zi /MDd -LOPT=/DEBUG -DEBUGDEF=/D _DEBUG -OUTDIR=.\Debug -INTDIR=.\Debug -!ELSE -OPT=/O2 /MD -LOPT= -DEBUGDEF=/D NDEBUG -OUTDIR=.\Release -INTDIR=.\Release -!ENDIF - -ALL : "..\..\port\pg_config_paths.h" "$(OUTDIR)\pg_config.exe" - -CLEAN : - -@erase "$(INTDIR)\pg_config.obj" - -@erase "$(INTDIR)\pgstrcasecmp.obj" - -@erase "$(OUTDIR)\path.obj" - -@erase "$(OUTDIR)\strlcpy.obj" - -@erase "$(INTDIR)\exec.obj" - -@erase "$(INTDIR)\snprintf.obj" - -@erase "$(OUTDIR)\pg_config.exe" - -@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 "" >>$@ - echo #define DOCDIR "" >>$@ - echo #define MANDIR "" >>$@ - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo $(OPT) /W3 /EHsc /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\ - "_MBCS" /Fp"$(INTDIR)\pg_config.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \ - /I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \ - /I ..\..\include\port\win32_msvc /D "FRONTEND" \ - /D "_CRT_SECURE_NO_DEPRECATE" - -CPP_OBJS=$(INTDIR)/ -CPP_SBRS=. - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ - advapi32.lib shell32.lib shfolder.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ - odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\pg_config.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_config.exe" -LINK32_OBJS= \ - "$(INTDIR)\pg_config.obj" \ - "$(INTDIR)\pgstrcasecmp.obj" \ - "$(OUTDIR)\path.obj" \ - "$(OUTDIR)\strlcpy.obj" \ - "$(INTDIR)\exec.obj" \ - "$(INTDIR)\snprintf.obj" \ -!IFDEF DEBUG - "..\..\interfaces\libpq\Debug\libpqddll.lib" -!ELSE - "..\..\interfaces\libpq\Release\libpqdll.lib" -!ENDIF - -"$(OUTDIR)\pg_config.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -"$(OUTDIR)\path.obj" : "$(OUTDIR)" ..\..\port\path.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\path.c -<< - -"$(OUTDIR)\strlcpy.obj" : "$(OUTDIR)" ..\..\port\strlcpy.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\strlcpy.c -<< - -"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\pgstrcasecmp.c -<< - -"$(INTDIR)\exec.obj" : ..\..\port\exec.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\exec.c -<< - -"$(INTDIR)\snprintf.obj" : ..\..\port\snprintf.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\snprintf.c -<< - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - diff --git a/src/bin/pg_dump/win32.mak b/src/bin/pg_dump/win32.mak deleted file mode 100644 index 71f608bacd..0000000000 --- a/src/bin/pg_dump/win32.mak +++ /dev/null @@ -1,208 +0,0 @@ -# Makefile for Microsoft Visual C++ 5.0 (or compat) - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -PERL=perl.exe -FLEX=flex.exe -YACC=bison.exe -MV=move - -!IFDEF DEBUG -OPT=/Od /Zi /MDd -LOPT=/DEBUG -DEBUGDEF=/D _DEBUG -OUTDIR=.\Debug -INTDIR=.\Debug -!ELSE -OPT=/O2 /MD -LOPT= -DEBUGDEF=/D NDEBUG -OUTDIR=.\Release -INTDIR=.\Release -!ENDIF - -REFDOCDIR= ../../../doc/src/sgml/ref - -CPP_PROJ=/nologo $(OPT) /W3 /EHsc /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\ - "_MBCS" /Fp"$(INTDIR)\pg_dump.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \ - /I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \ - /I ..\..\include\port\win32_msvc /I ..\..\backend \ - /D "FRONTEND" /D "_CRT_SECURE_NO_DEPRECATE" - -CPP_OBJS=$(INTDIR)/ -CPP_SBRS=. - -ALL : ..\..\backend\parser\parse.h "..\..\port\pg_config_paths.h" \ - "$(OUTDIR)\pg_dump.exe" "$(OUTDIR)\pg_dumpall.exe" "$(OUTDIR)\pg_restore.exe" - -CLEAN : - -@erase "$(INTDIR)\pg_backup_archiver.obj" - -@erase "$(INTDIR)\pg_backup_db.obj" - -@erase "$(INTDIR)\pg_backup_custom.obj" - -@erase "$(INTDIR)\pg_backup_files.obj" - -@erase "$(INTDIR)\pg_backup_null.obj" - -@erase "$(INTDIR)\pg_backup_tar.obj" - -@erase "$(INTDIR)\dumputils.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\pg_dump_sort.obj" - -@erase "$(INTDIR)\keywords.obj" - -@erase "$(INTDIR)\exec.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\getopt_long.obj" - -@erase "$(INTDIR)\path.obj" - -@erase "$(INTDIR)\strlcpy.obj" - -@erase "$(INTDIR)\pgstrcasecmp.obj" - -@erase "$(INTDIR)\sprompt.obj" - -@erase "$(INTDIR)\snprintf.obj" - -@erase "$(INTDIR)\qsort.obj" -# -@erase "$(INTDIR)\pg_dump.pch" - -@erase "$(OUTDIR)\pg_dump.obj" - -@erase "$(OUTDIR)\pg_dump.exe" - -@erase "$(INTDIR)\pg_dumpall.obj" - -@erase "$(OUTDIR)\pg_dumpall.exe" - -@erase "$(INTDIR)\pg_restore.obj" - -@erase "$(OUTDIR)\pg_restore.exe" -# -@erase "$(INTDIR)\..\..\port\pg_config_paths.h" -# -@erase "$(INTDIR)\..\..\backend\parser\parse.h" -# -@erase "$(INTDIR)\..\..\backend\parser\gram.c" - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ - advapi32.lib shfolder.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ - odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no -LINK32_FLAGS_DMP= \ - /pdb:"$(OUTDIR)\pg_dump.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_dump.exe" -LINK32_FLAGS_ALL= \ - /pdb:"$(OUTDIR)\pg_dumpall.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_dumpall.exe" -LINK32_FLAGS_RES= \ - /pdb:"$(OUTDIR)\pg_restore.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_restore.exe" - -LINK32_OBJS= \ - "$(INTDIR)\pg_backup_archiver.obj" \ - "$(INTDIR)\pg_backup_db.obj" \ - "$(INTDIR)\pg_backup_custom.obj" \ - "$(INTDIR)\pg_backup_files.obj" \ - "$(INTDIR)\pg_backup_null.obj" \ - "$(INTDIR)\pg_backup_tar.obj" \ - "$(INTDIR)\dumputils.obj" \ - "$(INTDIR)\keywords.obj" \ - "$(INTDIR)\exec.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\getopt_long.obj" \ - "$(INTDIR)\path.obj" \ - "$(INTDIR)\strlcpy.obj" \ - "$(INTDIR)\pgstrcasecmp.obj" \ - "$(INTDIR)\sprompt.obj" \ - "$(INTDIR)\snprintf.obj" \ - "$(INTDIR)\qsort.obj" - -LINK32_OBJS_DMP= \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\pg_dump_sort.obj" \ - "$(INTDIR)\pg_dump.obj" -LINK32_OBJS_RES= "$(INTDIR)\pg_restore.obj" -LINK32_OBJS_ALL= "$(INTDIR)\pg_dumpall.obj" - -!IFDEF DEBUG -LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Debug\libpqddll.lib" -!ELSE -LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib" -!ENDIF - -"..\..\port\pg_config_paths.h": - 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 "" >>$@ - echo #define DOCDIR "" >>$@ - echo #define MANDIR "" >>$@ - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -"$(OUTDIR)\pg_dump.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32_OBJS_DMP) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_FLAGS_DMP) $(LINK32_OBJS) $(LINK32_OBJS_DMP) -<< - -"$(OUTDIR)\pg_dumpall.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32_OBJS_ALL) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_FLAGS_ALL) $(LINK32_OBJS) $(LINK32_OBJS_ALL) -<< - -"$(OUTDIR)\pg_restore.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32_OBJS_RES) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_FLAGS_RES) $(LINK32_OBJS) $(LINK32_OBJS_RES) -<< - -"$(INTDIR)\keywords.obj" : ..\..\backend\parser\keywords.c - $(CPP) @<< - $(CPP_PROJ) ..\..\backend\parser\keywords.c -<< - -"$(INTDIR)\exec.obj" : ..\..\port\exec.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\exec.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)\strlcpy.obj" : "$(INTDIR)" ..\..\port\strlcpy.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\strlcpy.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 -<< - -"$(INTDIR)\snprintf.obj" : "$(INTDIR)" ..\..\port\snprintf.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\snprintf.c -<< - -"$(INTDIR)\qsort.obj" : "$(INTDIR)" ..\..\port\qsort.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\qsort.c -<< - -..\..\backend\parser\parse.h : ..\..\backend\parser\gram.y - $(YACC) -y -d ..\..\backend\parser\gram.y - $(MV) ..\..\backend\parser\y.tab.h ..\..\backend\parser\parse.h - $(MV) ..\..\backend\parser\y.tab.c ..\..\backend\parser\gram.c - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - diff --git a/src/bin/psql/bcc32.mak b/src/bin/psql/bcc32.mak deleted file mode 100644 index 9115a136b6..0000000000 --- a/src/bin/psql/bcc32.mak +++ /dev/null @@ -1,243 +0,0 @@ -# Makefile for Borland C++ 5.5 - -# Borland C++ base install directory goes here -# 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 -!IF "$(CFG)" == "" -CFG=Release -!MESSAGE No configuration specified. Defaulting to Release with STATIC libraries. -!MESSAGE To use dynamic link libraries add -DDLL_LIBS to make command line. -!MESSAGE -!ELSE -!MESSAGE Configuration "$(CFG)" -!MESSAGE -!ENDIF - -!IF "$(CFG)" != "Release" && "$(CFG)" != "Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running MAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE make -N -DCFG=[Release | Debug] -f bcc32.mak -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Release" (Win32 Release EXE) -!MESSAGE "Debug" (Win32 Debug EXE) -!MESSAGE -!ERROR An invalid configuration was specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=bcc32.exe -PERL=perl.exe -FLEX=flex.exe - -!IF "$(CFG)" == "Debug" -DEBUG=1 -OUTDIR=.\Debug -INTDIR=.\Debug -!else -OUTDIR=.\Release -INTDIR=.\Release -!endif -REFDOCDIR=../../../doc/src/sgml/ref - -CPP_PROJ = -I$(BCB)\include;..\..\include;..\..\interfaces\libpq;..\..\include\port\win32;..\..\include\port\win32_msvc;..\pg_dump;..\..\backend \ - -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) - -USERDEFINES = WIN32;_CONSOLE;_MBCS - -ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe" - -CLEAN : - -@erase "$(INTDIR)\command.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\describe.obj" - -@erase "$(INTDIR)\help.obj" - -@erase "$(INTDIR)\input.obj" - -@erase "$(INTDIR)\large_obj.obj" - -@erase "$(INTDIR)\mainloop.obj" - -@erase "$(INTDIR)\mbprint.obj" - -@erase "$(INTDIR)\print.obj" - -@erase "$(INTDIR)\prompt.obj" - -@erase "$(INTDIR)\psqlscan.obj" - -@erase "$(INTDIR)\startup.obj" - -@erase "$(INTDIR)\stringutils.obj" - -@erase "$(INTDIR)\tab-complete.obj" - -@erase "$(INTDIR)\variables.obj" - -@erase "$(INTDIR)\exec.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\getopt_long.obj" - -@erase "$(INTDIR)\snprintf.obj" - -@erase "$(INTDIR)\path.obj" - -@erase "$(INTDIR)\strlcpy.obj" - -@erase "$(INTDIR)\pgstrcasecmp.obj" - -@erase "$(INTDIR)\sprompt.obj" - -@erase "$(INTDIR)\dumputils.obj" - -@erase "$(INTDIR)\keywords.obj" - -@erase "$(INTDIR)\psql.ilc" - -@erase "$(INTDIR)\psql.ild" - -@erase "$(INTDIR)\psql.tds" - -@erase "$(INTDIR)\psql.ils" - -@erase "$(INTDIR)\psql.ilf" - -@erase "$(OUTDIR)\psql.exe" - -@erase "$(INTDIR)\..\..\port\pg_config_paths.h" - -LINK32=ilink32.exe -LINK32_FLAGS=-L$(BCB)\lib;.\$(LIBPG_DIR) -x -v -LINK32_OBJS= \ - "$(INTDIR)\command.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\describe.obj" \ - "$(INTDIR)\help.obj" \ - "$(INTDIR)\input.obj" \ - "$(INTDIR)\large_obj.obj" \ - "$(INTDIR)\mainloop.obj" \ - "$(INTDIR)\mbprint.obj" \ - "$(INTDIR)\print.obj" \ - "$(INTDIR)\prompt.obj" \ - "$(INTDIR)\psqlscan.obj" \ - "$(INTDIR)\startup.obj" \ - "$(INTDIR)\stringutils.obj" \ - "$(INTDIR)\tab-complete.obj" \ - "$(INTDIR)\variables.obj" \ - "$(INTDIR)\exec.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\getopt_long.obj" \ - "$(INTDIR)\snprintf.obj" \ - "$(INTDIR)\path.obj" \ - "$(INTDIR)\strlcpy.obj" \ - "$(INTDIR)\pgstrcasecmp.obj" \ - "$(INTDIR)\sprompt.obj" \ - "$(INTDIR)\dumputils.obj" \ - "$(INTDIR)\keywords.obj" - -!IFDEF DEBUG -LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Debug\blibpqddll.lib" -!ELSE -LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Release\blibpqdll.lib" -!ENDIF - -# Have to use \# so # isn't treated as a comment, but MSVC doesn't like this -"..\..\port\pg_config_paths.h": bcc32.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 "" >>$@ - echo \#define DOCDIR "" >>$@ - echo \#define MANDIR "" >>$@ - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(LINK32_OBJS) - $(LINK32) @&&! - $(LINK32_FLAGS) + - c0x32.obj $(LINK32_OBJS), + - $@,, + - import32.lib $(LIBRARIES),, -! - -"$(INTDIR)\exec.obj" : ..\..\port\exec.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\exec.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)\snprintf.obj" : "$(INTDIR)" ..\..\port\snprintf.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\snprintf.c -<< - -"$(INTDIR)\path.obj" : "$(INTDIR)" ..\..\port\path.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\path.c -<< - -"$(INTDIR)\strlcpy.obj" : "$(INTDIR)" ..\..\port\strlcpy.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\strlcpy.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 -<< - -"$(INTDIR)\dumputils.obj" : "$(INTDIR)" ..\pg_dump\dumputils.c - $(CPP) @<< - $(CPP_PROJ) ..\pg_dump\dumputils.c -<< - -"$(INTDIR)\keywords.obj" : "$(INTDIR)" ..\..\backend\parser\keywords.c - $(CPP) @<< - $(CPP_PROJ) ..\..\backend\parser\keywords.c -<< - -"sql_help.h": create_help.pl - $(PERL) create_help.pl $(REFDOCDIR) $@ - -psqlscan.c : psqlscan.l - $(FLEX) -Cfe -opsqlscan.c psqlscan.l - -.c.obj: - $(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $< - diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak deleted file mode 100644 index f0fe208fe5..0000000000 --- a/src/bin/psql/win32.mak +++ /dev/null @@ -1,192 +0,0 @@ -# Makefile for Microsoft Visual C++ 5.0 (or compat) - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -PERL=perl.exe -FLEX=flex.exe - -!IFDEF DEBUG -OPT=/Od /Zi /MDd -LOPT=/DEBUG -DEBUGDEF=/D _DEBUG -OUTDIR=.\Debug -INTDIR=.\Debug -!ELSE -OPT=/O2 /MD -LOPT= -DEBUGDEF=/D NDEBUG -OUTDIR=.\Release -INTDIR=.\Release -!ENDIF - -REFDOCDIR= ../../../doc/src/sgml/ref - -CPP_PROJ=/nologo $(OPT) /W3 /EHsc /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\ - "_MBCS" /Fp"$(INTDIR)\psql.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \ - /I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \ - /I ..\..\include\port\win32_msvc /I ..\pg_dump /I ..\..\backend \ - /D "FRONTEND" /D "_CRT_SECURE_NO_DEPRECATE" - -CPP_OBJS=$(INTDIR)/ -CPP_SBRS=. - -ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe" - -CLEAN : - -@erase "$(INTDIR)\command.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\describe.obj" - -@erase "$(INTDIR)\help.obj" - -@erase "$(INTDIR)\input.obj" - -@erase "$(INTDIR)\large_obj.obj" - -@erase "$(INTDIR)\mainloop.obj" - -@erase "$(INTDIR)\mbprint.obj" - -@erase "$(INTDIR)\print.obj" - -@erase "$(INTDIR)\prompt.obj" - -@erase "$(INTDIR)\psqlscan.obj" - -@erase "$(INTDIR)\startup.obj" - -@erase "$(INTDIR)\stringutils.obj" - -@erase "$(INTDIR)\tab-complete.obj" - -@erase "$(INTDIR)\variables.obj" - -@erase "$(INTDIR)\exec.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\getopt_long.obj" - -@erase "$(INTDIR)\snprintf.obj" - -@erase "$(INTDIR)\path.obj" - -@erase "$(INTDIR)\strlcpy.obj" - -@erase "$(INTDIR)\pgstrcasecmp.obj" - -@erase "$(INTDIR)\sprompt.obj" - -@erase "$(INTDIR)\dumputils.obj" - -@erase "$(INTDIR)\keywords.obj" - -@erase "$(INTDIR)\*psql.pch" - -@erase "$(OUTDIR)\psql.exe" - -@erase "$(INTDIR)\..\..\port\pg_config_paths.h" - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ - advapi32.lib shfolder.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ - odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\psql.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\psql.exe" -LINK32_OBJS= \ - "$(INTDIR)\command.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\describe.obj" \ - "$(INTDIR)\help.obj" \ - "$(INTDIR)\input.obj" \ - "$(INTDIR)\large_obj.obj" \ - "$(INTDIR)\mainloop.obj" \ - "$(INTDIR)\mbprint.obj" \ - "$(INTDIR)\print.obj" \ - "$(INTDIR)\prompt.obj" \ - "$(INTDIR)\psqlscan.obj" \ - "$(INTDIR)\startup.obj" \ - "$(INTDIR)\stringutils.obj" \ - "$(INTDIR)\tab-complete.obj" \ - "$(INTDIR)\variables.obj" \ - "$(INTDIR)\exec.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\getopt_long.obj" \ - "$(INTDIR)\snprintf.obj" \ - "$(INTDIR)\path.obj" \ - "$(INTDIR)\strlcpy.obj" \ - "$(INTDIR)\pgstrcasecmp.obj" \ - "$(INTDIR)\sprompt.obj" \ - "$(INTDIR)\dumputils.obj" \ - "$(INTDIR)\keywords.obj" - -!IFDEF DEBUG -LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Debug\libpqddll.lib" -!ELSE -LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib" -!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 "" >>$@ - echo #define DOCDIR "" >>$@ - echo #define MANDIR "" >>$@ - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -"$(INTDIR)\exec.obj" : ..\..\port\exec.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\exec.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)\snprintf.obj" : "$(INTDIR)" ..\..\port\snprintf.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\snprintf.c -<< - -"$(INTDIR)\path.obj" : "$(INTDIR)" ..\..\port\path.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\path.c -<< - -"$(INTDIR)\strlcpy.obj" : "$(INTDIR)" ..\..\port\strlcpy.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\strlcpy.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 -<< - -"$(INTDIR)\dumputils.obj" : "$(INTDIR)" ..\pg_dump\dumputils.c - $(CPP) @<< - $(CPP_PROJ) ..\pg_dump\dumputils.c -<< - -"$(INTDIR)\keywords.obj" : "$(INTDIR)" ..\..\backend\parser\keywords.c - $(CPP) @<< - $(CPP_PROJ) ..\..\backend\parser\keywords.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:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - diff --git a/src/win32.mak b/src/win32.mak index d7061dd3ef..ba8569fcbd 100644 --- a/src/win32.mak +++ b/src/win32.mak @@ -1,8 +1,7 @@ -# $PostgreSQL: pgsql/src/win32.mak,v 1.14 2006/08/08 22:44:05 momjian Exp $ +# $PostgreSQL: pgsql/src/win32.mak,v 1.15 2007/03/05 14:18:38 mha Exp $ -# Makefile for Microsoft Visual C++ 5.0 (or compat) -# Top-file makefile for Win32 parts of postgresql. -# Note that most parts are not ported to Win32! +# Top-file makefile for building Win32 libpq with Visual C++ 6.0. +# (see src/tools/msvc for tools to build with Visual C++ 2005 and newer) !IF "$(OS)" == "Windows_NT" NULL= @@ -17,24 +16,12 @@ ALL: cd .. cd interfaces\libpq nmake /f win32.mak $(MAKEMACRO) - cd ..\..\bin\psql - nmake /f win32.mak $(MAKEMACRO) - cd ..\..\bin\pg_dump - nmake /f win32.mak $(MAKEMACRO) - cd ..\..\bin\pg_config - nmake /f win32.mak $(MAKEMACRO) cd ..\.. echo All Win32 parts have been built! CLEAN: cd interfaces\libpq nmake /f win32.mak CLEAN - cd ..\..\bin\psql - nmake /f win32.mak CLEAN - cd ..\..\bin\pg_dump - nmake /f win32.mak CLEAN - cd ..\..\bin\pg_config - nmake /f win32.mak CLEAN cd ..\.. echo All Win32 parts have been cleaned! -- 2.40.0