Re: VC++ psql build broken
"Dave Page" <[email protected]>
| Newsgroups | gmane.comp.db.postgresql.devel.win32,gmane.comp.db.postgresql.devel.patches |
|---|---|
| Message-ID | <E7F85A1B5FF8D44C8A1AF6885BC9A0E43063B4@ratbert.vale-housing.co.uk> |
> -----Original Message----- > From: Bruce Momjian [mailto:[email protected]] > Sent: 10 September 2004 17:41 > To: [email protected] > Cc: Dave Page; PgSQL Win32 developers > Subject: Re: [pgsql-hackers-win32] VC++ psql build broken > > > Now that I think of it, flex will not work because there is > no *.mak rule to run it. You would have to run it manually, > or write a *.mak rule for it. If someone does, please do > bcc.make too. Patch attached. It works find under VC++, but the Borland mod is an untested copy/paste. Unfortunately, psql still doesn't build giving the errors below. I should point out that I have no interest in psql but am happy to keep testing the build. I do wonder if there is any need to maintain these makefiles at all now it builds under Mingw - it's not like psql is a library like libpq that vc++ or bcc needs to link to (which I do need). Regards, Dave. cd ..\..\bin\psql nmake /f win32.mak Microsoft (R) Program Maintenance Utility Version 6.00.8168.0 Copyright (C) Microsoft Corp 1988-1998. All rights reserved. flex.exe -Cfe -opsqlscan.c psqlscan.l echo #define PGBINDIR "" >"..\..\port\pg_config_paths.h" echo #define PGSHAREDIR "" >>"..\..\port\pg_config_paths.h" echo #define SYSCONFDIR "" >>"..\..\port\pg_config_paths.h" echo #define INCLUDEDIR "" >>"..\..\port\pg_config_paths.h" echo #define PKGINCLUDEDIR "" >>"..\..\port\pg_config_paths.h" echo #define INCLUDEDIRSERVER "" >>"..\..\port\pg_config_paths.h" echo #define LIBDIR "" >>"..\..\port\pg_config_paths.h" echo #define PKGLIBDIR "" >>"..\..\port\pg_config_paths.h" echo #define LOCALEDIR "" >>"..\..\port\pg_config_paths.h" cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nma03280. sprompt.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmb03280. getopt.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmc03280. getopt_long.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmd03280. path.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nme03280. command.c C:\PROGRA~1\MICROS~3\VC98\INCLUDE\io.h(176) : error C2375: 'pgrename' : redefini tion; different linkage ..\..\include\port.h(167) : see declaration of 'pgrename' C:\PROGRA~1\MICROS~3\VC98\INCLUDE\io.h(244) : error C2375: 'pgunlink' : redefini tion; different linkage ..\..\include\port.h(168) : see declaration of 'pgunlink' common.c C:\PROGRA~1\MICROS~3\VC98\INCLUDE\io.h(176) : error C2375: 'pgrename' : redefini tion; different linkage ..\..\include\port.h(167) : see declaration of 'pgrename' C:\PROGRA~1\MICROS~3\VC98\INCLUDE\io.h(244) : error C2375: 'pgunlink' : redefini tion; different linkage ..\..\include\port.h(168) : see declaration of 'pgunlink' common.c(536) : warning C4018: '<' : signed/unsigned mismatch help.c input.c stringutils.c mainloop.c mainloop.c(253) : warning C4018: '==' : signed/unsigned mismatch copy.c C:\PROGRA~1\MICROS~3\VC98\INCLUDE\io.h(176) : error C2375: 'pgrename' : redefini tion; different linkage ..\..\include\port.h(167) : see declaration of 'pgrename' C:\PROGRA~1\MICROS~3\VC98\INCLUDE\io.h(244) : error C2375: 'pgunlink' : redefini tion; different linkage ..\..\include\port.h(168) : see declaration of 'pgunlink' startup.c C:\PROGRA~1\MICROS~3\VC98\INCLUDE\io.h(176) : error C2375: 'pgrename' : redefini tion; different linkage ..\..\include\port.h(167) : see declaration of 'pgrename' C:\PROGRA~1\MICROS~3\VC98\INCLUDE\io.h(244) : error C2375: 'pgunlink' : redefini tion; different linkage ..\..\include\port.h(168) : see declaration of 'pgunlink' prompt.c C:\PROGRA~1\MICROS~3\VC98\INCLUDE\io.h(176) : error C2375: 'pgrename' : redefini tion; different linkage ..\..\include\port.h(167) : see declaration of 'pgrename' C:\PROGRA~1\MICROS~3\VC98\INCLUDE\io.h(244) : error C2375: 'pgunlink' : redefini tion; different linkage ..\..\include\port.h(168) : see declaration of 'pgunlink' variables.c large_obj.c print.c print.c(1238) : warning C4090: 'function' : different 'const' qualifiers print.c(1238) : warning C4022: 'free' : pointer mismatch for actual parameter 1 print.c(1239) : warning C4090: 'function' : different 'const' qualifiers print.c(1239) : warning C4022: 'free' : pointer mismatch for actual parameter 1 describe.c psqlscan.c tab-complete.c mbprint.c NMAKE : fatal error U1077: 'cl.exe' : return code '0x2' Stop. NMAKE : fatal error U1077: 'C:\PROGRA~1\MICROS~3\VC98\BIN\NMAKE.EXE' : return co de '0x2' Stop. ---------------------------(end of broadcast)--------------------------- TIP 2: you can get off all lists at once with the unregister command (send "unregister YourEmailAddressHere" to [email protected])
psql_win32_makefiles.diff
(application/octet-stream, 1.6 KB)
Index: bcc32.mak
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/bin/psql/bcc32.mak,v
retrieving revision 1.9
diff -u -r1.9 bcc32.mak
--- bcc32.mak 10 Sep 2004 09:45:21 -0000 1.9
+++ bcc32.mak 11 Sep 2004 21:31:13 -0000
@@ -37,6 +37,7 @@
CPP=bcc32.exe
PERL=perl.exe
+FLEX=flex.exe
!IF "$(CFG)" == "Debug"
DEBUG=1
@@ -53,7 +54,7 @@
.c.obj:
$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<
-ALL : sql_help.h "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
+ALL : sql_help.h psqlscan "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
CLEAN :
-@erase "$(INTDIR)\command.obj"
@@ -158,3 +159,6 @@
"sql_help.h": create_help.pl
$(PERL) create_help.pl $(REFDOCDIR) $@
+
+psqlscan:
+ $(FLEX) -Cfe -opsqlscan.c psqlscan.l
Index: win32.mak
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/bin/psql/win32.mak,v
retrieving revision 1.21
diff -u -r1.21 win32.mak
--- win32.mak 10 Sep 2004 09:45:21 -0000 1.21
+++ win32.mak 11 Sep 2004 21:31:13 -0000
@@ -8,6 +8,7 @@
CPP=cl.exe
PERL=perl.exe
+FLEX=flex.exe
OUTDIR=.\Release
INTDIR=.\Release
@@ -16,7 +17,7 @@
OutDir=.\Release
# End Custom Macros
-ALL : sql_help.h "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
+ALL : sql_help.h psqlscan "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
CLEAN :
-@erase "$(INTDIR)\command.obj"
@@ -129,3 +130,6 @@
sql_help.h: create_help.pl
$(PERL) create_help.pl $(REFDOCDIR) $@
+
+psqlscan:
+ $(FLEX) -Cfe -opsqlscan.c psqlscan.l