mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-17 19:30:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve MS VC builds for psql by handlling flex properly and prevent

Browse Source 
rename prototype conflict.
This commit is contained in:
Bruce Momjian 2004-09-27 20:37:20 +00:00
parent a6cb7fd60a
commit f6b896b17a
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/psql/bcc32.mak
View File

@ -37,6 +37,7 @@ NULL=nul
CPP=bcc32.exe CPP=bcc32.exe
PERL=perl.exe PERL=perl.exe
FLEX=flex.exe
!IF "$(CFG)" == "Debug" !IF "$(CFG)" == "Debug"
DEBUG=1 DEBUG=1
@ -53,7 +54,7 @@ REFDOCDIR=../../../doc/src/sgml/ref
.c.obj: .c.obj:
$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $< $(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<
ALL : sql_help.h "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe" ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
CLEAN : CLEAN :
-@erase "$(INTDIR)\command.obj" -@erase "$(INTDIR)\command.obj"
@ -158,3 +159,6 @@ path.obj : "$(OUTDIR)" ..\..\port\path.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
$(FLEX) -Cfe -opsqlscan.c psqlscan.l

8
src/bin/psql/win32.mak
View File

@ -8,6 +8,7 @@ NULL=nul
CPP=cl.exe CPP=cl.exe
PERL=perl.exe PERL=perl.exe
FLEX=flex.exe
OUTDIR=.\Release OUTDIR=.\Release
INTDIR=.\Release INTDIR=.\Release
@ -16,7 +17,7 @@ REFDOCDIR= ../../../doc/src/sgml/ref
OutDir=.\Release OutDir=.\Release
# End Custom Macros # End Custom Macros
ALL : sql_help.h "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe" ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
CLEAN : CLEAN :
-@erase "$(INTDIR)\command.obj" -@erase "$(INTDIR)\command.obj"
@ -127,5 +128,8 @@ LINK32_OBJS= \
$(CPP_PROJ) $< $(CPP_PROJ) $<
<< <<
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
$(FLEX) -Cfe -opsqlscan.c psqlscan.l

7
src/include/port.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2004, 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/include/port.h,v 1.61 2004/09/09 14:18:20 momjian Exp $ * $PostgreSQL: pgsql/src/include/port.h,v 1.62 2004/09/27 20:37:20 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -168,6 +168,11 @@ extern int pgrename(const char *from, const char *to);
extern int pgunlink(const char *path); extern int pgunlink(const char *path);
extern int pgsymlink(const char *oldpath, const char *newpath); extern int pgsymlink(const char *oldpath, const char *newpath);
/* Include this first so later includes don't see these defines */
#ifdef _MSC_VER
#include <io.h>
#endif
#define rename(from, to) pgrename(from, to) #define rename(from, to) pgrename(from, to)
#define unlink(path) pgunlink(path) #define unlink(path) pgunlink(path)
#define symlink(oldpath, newpath) pgsymlink(oldpath, newpath) #define symlink(oldpath, newpath) pgsymlink(oldpath, newpath)