Thread: VC++ psql build broken
The VC++ build of psql appears to be broken. Libpq is fine however. Regards, Dave. C:\Documents and Settings\dpage\My Documents\CVS\pgsql\src>nmake USE_SSL=1 ENABL E_THREAD_SAFETY=1 DEBUG=1 /f win32.mak Microsoft (R) Program Maintenance Utility Version 6.00.8168.0 Copyright (C) Microsoft Corp 1988-1998. All rights reserved. cd include if not exist pg_config.h copy pg_config.h.win32 pg_config.h cd .. cd interfaces\libpq nmake /f win32.mak Microsoft (R) Program Maintenance Utility Version 6.00.8168.0 Copyright (C) Microsoft Corp 1988-1998. All rights reserved. Building the Win32 static library... cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nma03392. getaddrinfo.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmb03392. pgstrcasecmp.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmc03392. thread.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmd03392. inet_aton.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nme03392. crypt.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmf03392. noblock.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmg03392. dllist.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmh03392. md5.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmi03392. ip.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmj03392. wchar.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmk03392. encnames.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nml03392. win32.c fe-auth.c fe-protocol2.c fe-protocol3.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-print.c fe-secure.c pqexpbuffer.c pthread-win32.c link.exe -lib @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmm03392. Microsoft (R) Library Manager Version 6.00.8447 Copyright (C) Microsoft Corp 1992-1998. All rights reserved. /DEBUG /nologo "/out:.\Debug\libpqd.lib" ".\Debug\win32.obj" ".\Debug\getaddrinf o.obj" ".\Debug\pgstrcasecmp.obj" ".\Debug\thread.obj" ".\Debug\inet_aton.obj" " .\Debug\crypt.obj" ".\Debug\noblock.obj" ".\Debug\dllist.obj" ".\Debug\md5.obj" ".\Debug\ip.obj" ".\Debug\fe-auth.obj" ".\Debug\fe-protocol2.obj" ".\Debug\fe-pr otocol3.obj" ".\Debug\fe-connect.obj" ".\Debug\fe-exec.obj" ".\Debug\fe-lobj.obj " ".\Debug\fe-misc.obj" ".\Debug\fe-print.obj" ".\Debug\fe-secure.obj" ".\Debug\ pqexpbuffer.obj" ".\Debug\wchar.obj" ".\Debug\encnames.obj" ".\Debug\pthread-win 32.obj" LINK : warning LNK4044: unrecognized option "DEBUG"; ignored cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmn03392. libpqdll.c rc.exe /l 0x409 /fo".\Debug\libpq.res" libpq.rc link.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmo03392. Creating library .\Debug\libpqddll.lib and object .\Debug\libpqddll.exp 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. echo "#define PGBINDIR "">pg_config_paths.h "#define PGBINDIR "">pg_config_paths.h echo "#define PGSHAREDIR "" >>pg_config_paths.h "#define PGSHAREDIR "" >>pg_config_paths.h echo "#define SYSCONFDIR "" >>pg_config_paths.h "#define SYSCONFDIR "" >>pg_config_paths.h echo "#define INCLUDEDIR "" >>pg_config_paths.h "#define INCLUDEDIR "" >>pg_config_paths.h echo "#define PKGINCLUDEDIR "" >>pg_config_paths.h "#define PKGINCLUDEDIR "" >>pg_config_paths.h echo "#define INCLUDEDIRSERVER "" >>pg_config_paths.h "#define INCLUDEDIRSERVER "" >>pg_config_paths.h echo "#define LIBDIR "" >>pg_config_paths.h "#define LIBDIR "" >>pg_config_paths.h echo "#define PKGLIBDIR "" >>pg_config_paths.h "#define PKGLIBDIR "" >>pg_config_paths.h echo "#define LOCALEDIR "" >>pg_config_paths.h "#define LOCALEDIR "" >>pg_config_paths.h cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nma03196. sprompt.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmb03196. getopt.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmc03196. getopt_long.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmd03196. path.c ..\..\port\path.c(198) : error C2065: 'PGBINDIR' : undeclared identifier ..\..\port\path.c(198) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(198) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(198) : error C2065: 'PGSHAREDIR' : undeclared identifier ..\..\port\path.c(198) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(198) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 2 ..\..\port\path.c(201) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(201) : warning C4024: 'strncpy' : different types for formal a nd actual parameter 2 ..\..\port\path.c(215) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(215) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(232) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(232) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(232) : error C2065: 'INCLUDEDIR' : undeclared identifier ..\..\port\path.c(232) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(232) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 2 ..\..\port\path.c(235) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(235) : warning C4024: 'strncpy' : different types for formal a nd actual parameter 2 ..\..\port\path.c(249) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(249) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(249) : error C2065: 'PKGINCLUDEDIR' : undeclared identifier ..\..\port\path.c(249) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(249) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 2 ..\..\port\path.c(252) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(252) : warning C4024: 'strncpy' : different types for formal a nd actual parameter 2 ..\..\port\path.c(266) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(266) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(266) : error C2065: 'INCLUDEDIRSERVER' : undeclared identifier ..\..\port\path.c(266) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(266) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 2 ..\..\port\path.c(269) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(269) : warning C4024: 'strncpy' : different types for formal a nd actual parameter 2 ..\..\port\path.c(283) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(283) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(283) : error C2065: 'LIBDIR' : undeclared identifier ..\..\port\path.c(283) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(283) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 2 ..\..\port\path.c(286) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(286) : warning C4024: 'strncpy' : different types for formal a nd actual parameter 2 ..\..\port\path.c(300) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(300) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(300) : error C2065: 'PKGLIBDIR' : undeclared identifier ..\..\port\path.c(300) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(300) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 2 ..\..\port\path.c(303) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(303) : warning C4024: 'strncpy' : different types for formal a nd actual parameter 2 ..\..\port\path.c(319) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(319) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(319) : error C2065: 'LOCALEDIR' : undeclared identifier ..\..\port\path.c(319) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(319) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 2 ..\..\port\path.c(322) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(322) : warning C4024: 'strncpy' : different types for formal a nd actual parameter 2 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. C:\Documents and Settings\dpage\My Documents\CVS\pgsql\src>
Dave Page wrote: > The VC++ build of psql appears to be broken. Libpq is fine however. > ......... > evels of indirection from 'int ' > ..\..\port\path.c(322) : warning C4024: 'strncpy' : different types for > formal and actual parameter 2 This is probably another case of redefining symbols from standard names to internal names, which should be active for backend purposes only. We had the same for libpq some weeks ago. Regards, Andreas
OK, I was creating pg_config_paths.h in the wrong directory. This should fix it. --------------------------------------------------------------------------- Dave Page wrote: > The VC++ build of psql appears to be broken. Libpq is fine however. > > Regards, Dave. > > > C:\Documents and Settings\dpage\My Documents\CVS\pgsql\src>nmake > USE_SSL=1 ENABL > E_THREAD_SAFETY=1 DEBUG=1 /f win32.mak > > Microsoft (R) Program Maintenance Utility Version 6.00.8168.0 > Copyright (C) Microsoft Corp 1988-1998. All rights reserved. > > cd include > if not exist pg_config.h copy pg_config.h.win32 pg_config.h > cd .. > cd interfaces\libpq > nmake /f win32.mak > > Microsoft (R) Program Maintenance Utility Version 6.00.8168.0 > Copyright (C) Microsoft Corp 1988-1998. All rights reserved. > > Building the Win32 static library... > > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nma03392. > getaddrinfo.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmb03392. > pgstrcasecmp.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmc03392. > thread.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmd03392. > inet_aton.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nme03392. > crypt.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmf03392. > noblock.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmg03392. > dllist.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmh03392. > md5.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmi03392. > ip.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmj03392. > wchar.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmk03392. > encnames.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nml03392. > win32.c > fe-auth.c > fe-protocol2.c > fe-protocol3.c > fe-connect.c > fe-exec.c > fe-lobj.c > fe-misc.c > fe-print.c > fe-secure.c > pqexpbuffer.c > pthread-win32.c > link.exe -lib @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmm03392. > Microsoft (R) Library Manager Version 6.00.8447 > Copyright (C) Microsoft Corp 1992-1998. All rights reserved. > > /DEBUG /nologo "/out:.\Debug\libpqd.lib" ".\Debug\win32.obj" > ".\Debug\getaddrinf > o.obj" ".\Debug\pgstrcasecmp.obj" ".\Debug\thread.obj" > ".\Debug\inet_aton.obj" " > .\Debug\crypt.obj" ".\Debug\noblock.obj" ".\Debug\dllist.obj" > ".\Debug\md5.obj" > ".\Debug\ip.obj" ".\Debug\fe-auth.obj" ".\Debug\fe-protocol2.obj" > ".\Debug\fe-pr > otocol3.obj" ".\Debug\fe-connect.obj" ".\Debug\fe-exec.obj" > ".\Debug\fe-lobj.obj > " ".\Debug\fe-misc.obj" ".\Debug\fe-print.obj" ".\Debug\fe-secure.obj" > ".\Debug\ > pqexpbuffer.obj" ".\Debug\wchar.obj" ".\Debug\encnames.obj" > ".\Debug\pthread-win > 32.obj" > LINK : warning LNK4044: unrecognized option "DEBUG"; ignored > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmn03392. > libpqdll.c > rc.exe /l 0x409 /fo".\Debug\libpq.res" libpq.rc > link.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmo03392. > Creating library .\Debug\libpqddll.lib and object > .\Debug\libpqddll.exp > 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. > > echo "#define PGBINDIR "">pg_config_paths.h > "#define PGBINDIR "">pg_config_paths.h > echo "#define PGSHAREDIR "" >>pg_config_paths.h > "#define PGSHAREDIR "" >>pg_config_paths.h > echo "#define SYSCONFDIR "" >>pg_config_paths.h > "#define SYSCONFDIR "" >>pg_config_paths.h > echo "#define INCLUDEDIR "" >>pg_config_paths.h > "#define INCLUDEDIR "" >>pg_config_paths.h > echo "#define PKGINCLUDEDIR "" >>pg_config_paths.h > "#define PKGINCLUDEDIR "" >>pg_config_paths.h > echo "#define INCLUDEDIRSERVER "" >>pg_config_paths.h > "#define INCLUDEDIRSERVER "" >>pg_config_paths.h > echo "#define LIBDIR "" >>pg_config_paths.h > "#define LIBDIR "" >>pg_config_paths.h > echo "#define PKGLIBDIR "" >>pg_config_paths.h > "#define PKGLIBDIR "" >>pg_config_paths.h > echo "#define LOCALEDIR "" >>pg_config_paths.h > "#define LOCALEDIR "" >>pg_config_paths.h > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nma03196. > sprompt.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmb03196. > getopt.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmc03196. > getopt_long.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmd03196. > path.c > ..\..\port\path.c(198) : error C2065: 'PGBINDIR' : undeclared identifier > ..\..\port\path.c(198) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(198) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(198) : error C2065: 'PGSHAREDIR' : undeclared > identifier > ..\..\port\path.c(198) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(198) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(201) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(201) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(215) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(215) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(232) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(232) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(232) : error C2065: 'INCLUDEDIR' : undeclared > identifier > ..\..\port\path.c(232) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(232) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(235) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(235) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(249) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(249) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(249) : error C2065: 'PKGINCLUDEDIR' : undeclared > identifier > ..\..\port\path.c(249) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(249) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(252) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(252) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(266) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(266) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(266) : error C2065: 'INCLUDEDIRSERVER' : undeclared > identifier > > ..\..\port\path.c(266) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(266) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(269) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(269) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(283) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(283) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(283) : error C2065: 'LIBDIR' : undeclared identifier > ..\..\port\path.c(283) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(283) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(286) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(286) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(300) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(300) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(300) : error C2065: 'PKGLIBDIR' : undeclared > identifier > ..\..\port\path.c(300) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(300) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(303) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(303) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(319) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(319) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(319) : error C2065: 'LOCALEDIR' : undeclared > identifier > ..\..\port\path.c(319) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(319) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(322) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(322) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > 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. > > C:\Documents and Settings\dpage\My Documents\CVS\pgsql\src> > > ---------------------------(end of broadcast)--------------------------- > TIP 8: explain analyze is your friend > -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 359-1001 + If your life is a hard drive, | 13 Roberts Road + Christ can be your backup. | Newtown Square, Pennsylvania 19073 Index: src/bin/psql/bcc32.mak =================================================================== RCS file: /cvsroot/pgsql-server/src/bin/psql/bcc32.mak,v retrieving revision 1.7 diff -c -c -r1.7 bcc32.mak *** src/bin/psql/bcc32.mak 2 Sep 2004 02:02:00 -0000 1.7 --- src/bin/psql/bcc32.mak 10 Sep 2004 03:45:42 -0000 *************** *** 53,59 **** .c.obj: $(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $< ! ALL : sql_help.h pg_config_paths.h "$(OUTDIR)\psql.exe" CLEAN : -@erase "$(INTDIR)\command.obj" --- 53,59 ---- .c.obj: $(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $< ! ALL : sql_help.h "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe" CLEAN : -@erase "$(INTDIR)\command.obj" *************** *** 81,89 **** -@erase "$(INTDIR)\psql.ils" -@erase "$(INTDIR)\psql.ilf" -@erase "$(OUTDIR)\psql.exe" ! -@erase "$(INTDIR)\pg_config_paths.h" ! pg_config_paths.h: win32.mak echo "#define PGBINDIR "">$@ echo "#define PGSHAREDIR "" >>$@ echo "#define SYSCONFDIR "" >>$@ --- 81,89 ---- -@erase "$(INTDIR)\psql.ils" -@erase "$(INTDIR)\psql.ilf" -@erase "$(OUTDIR)\psql.exe" ! -@erase "$(INTDIR)\..\..\port\pg_config_paths.h" ! "..\..\port\pg_config_paths.h": win32.mak echo "#define PGBINDIR "">$@ echo "#define PGSHAREDIR "" >>$@ echo "#define SYSCONFDIR "" >>$@ Index: src/bin/psql/win32.mak =================================================================== RCS file: /cvsroot/pgsql-server/src/bin/psql/win32.mak,v retrieving revision 1.19 diff -c -c -r1.19 win32.mak *** src/bin/psql/win32.mak 2 Sep 2004 02:02:00 -0000 1.19 --- src/bin/psql/win32.mak 10 Sep 2004 03:45:43 -0000 *************** *** 16,22 **** OutDir=.\Release # End Custom Macros ! ALL : sql_help.h pg_config_paths.h "$(OUTDIR)\psql.exe" CLEAN : -@erase "$(INTDIR)\command.obj" --- 16,22 ---- OutDir=.\Release # End Custom Macros ! ALL : sql_help.h "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe" CLEAN : -@erase "$(INTDIR)\command.obj" *************** *** 41,49 **** -@erase "$(INTDIR)\mbprint.obj" -@erase "$(INTDIR)\*psql.pch" -@erase "$(OUTDIR)\psql.exe" ! -@erase "$(INTDIR)\pg_config_paths.h" ! pg_config_paths.h: win32.mak echo "#define PGBINDIR "">$@ echo "#define PGSHAREDIR "" >>$@ echo "#define SYSCONFDIR "" >>$@ --- 41,49 ---- -@erase "$(INTDIR)\mbprint.obj" -@erase "$(INTDIR)\*psql.pch" -@erase "$(OUTDIR)\psql.exe" ! -@erase "$(INTDIR)\..\..\port\pg_config_paths.h" ! "..\..\port\pg_config_paths.h": win32.mak echo "#define PGBINDIR "">$@ echo "#define PGSHAREDIR "" >>$@ echo "#define SYSCONFDIR "" >>$@
> -----Original Message----- > From: Bruce Momjian [mailto:pgman@candle.pha.pa.us] > Sent: 10 September 2004 04:49 > To: Dave Page > Cc: PgSQL Win32 developers > Subject: Re: [pgsql-hackers-win32] VC++ psql build broken > > > OK, I was creating pg_config_paths.h in the wrong directory. > This should fix it. No, still get the following :-( : Microsoft (R) Program Maintenance Utility Version 6.00.8168.0 Copyright (C) Microsoft Corp 1988-1998. All rights reserved. echo "#define PGBINDIR "">"..\..\port\pg_config_paths.h" "#define PGBINDIR "">"..\..\port\pg_config_paths.h" echo "#define PGSHAREDIR "" >>"..\..\port\pg_config_paths.h" "#define PGSHAREDIR "" >>"..\..\port\pg_config_paths.h" echo "#define SYSCONFDIR "" >>"..\..\port\pg_config_paths.h" "#define SYSCONFDIR "" >>"..\..\port\pg_config_paths.h" echo "#define INCLUDEDIR "" >>"..\..\port\pg_config_paths.h" "#define INCLUDEDIR "" >>"..\..\port\pg_config_paths.h" echo "#define PKGINCLUDEDIR "" >>"..\..\port\pg_config_paths.h" "#define PKGINCLUDEDIR "" >>"..\..\port\pg_config_paths.h" echo "#define INCLUDEDIRSERVER "" >>"..\..\port\pg_config_paths.h" "#define INCLUDEDIRSERVER "" >>"..\..\port\pg_config_paths.h" echo "#define LIBDIR "" >>"..\..\port\pg_config_paths.h" "#define LIBDIR "" >>"..\..\port\pg_config_paths.h" echo "#define PKGLIBDIR "" >>"..\..\port\pg_config_paths.h" "#define PKGLIBDIR "" >>"..\..\port\pg_config_paths.h" echo "#define LOCALEDIR "" >>"..\..\port\pg_config_paths.h" "#define LOCALEDIR "" >>"..\..\port\pg_config_paths.h" if not exist ".\Release/" mkdir ".\Release" cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nma00380. sprompt.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmb00380. getopt.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmc00380. getopt_long.c cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmd00380. path.c ..\..\port\path.c(198) : error C2065: 'PGBINDIR' : undeclared identifier ..\..\port\path.c(198) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(198) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(198) : error C2065: 'PGSHAREDIR' : undeclared identifier ..\..\port\path.c(198) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(198) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 2 ..\..\port\path.c(201) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(201) : warning C4024: 'strncpy' : different types for formal a nd actual parameter 2 ..\..\port\path.c(215) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(215) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(232) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(232) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(232) : error C2065: 'INCLUDEDIR' : undeclared identifier ..\..\port\path.c(232) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(232) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 2 ..\..\port\path.c(235) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(235) : warning C4024: 'strncpy' : different types for formal a nd actual parameter 2 ..\..\port\path.c(249) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(249) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(249) : error C2065: 'PKGINCLUDEDIR' : undeclared identifier ..\..\port\path.c(249) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(249) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 2 ..\..\port\path.c(252) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(252) : warning C4024: 'strncpy' : different types for formal a nd actual parameter 2 ..\..\port\path.c(266) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(266) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(266) : error C2065: 'INCLUDEDIRSERVER' : undeclared identifier ..\..\port\path.c(266) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(266) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 2 ..\..\port\path.c(269) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(269) : warning C4024: 'strncpy' : different types for formal a nd actual parameter 2 ..\..\port\path.c(283) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(283) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(283) : error C2065: 'LIBDIR' : undeclared identifier ..\..\port\path.c(283) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(283) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 2 ..\..\port\path.c(286) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(286) : warning C4024: 'strncpy' : different types for formal a nd actual parameter 2 ..\..\port\path.c(300) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(300) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(300) : error C2065: 'PKGLIBDIR' : undeclared identifier ..\..\port\path.c(300) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(300) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 2 ..\..\port\path.c(303) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(303) : warning C4024: 'strncpy' : different types for formal a nd actual parameter 2 ..\..\port\path.c(319) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(319) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 1 ..\..\port\path.c(319) : error C2065: 'LOCALEDIR' : undeclared identifier ..\..\port\path.c(319) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(319) : warning C4024: 'relative_path' : different types for fo rmal and actual parameter 2 ..\..\port\path.c(322) : warning C4047: 'function' : 'const char *' differs in l evels of indirection from 'int ' ..\..\port\path.c(322) : warning C4024: 'strncpy' : different types for formal a nd actual parameter 2 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. C:\Documents and Settings\dpage\My Documents\CVS\pgsql\src> Regards, Dave
OK, another patch. Thanks. --------------------------------------------------------------------------- Dave Page wrote: > > > > -----Original Message----- > > From: Bruce Momjian [mailto:pgman@candle.pha.pa.us] > > Sent: 10 September 2004 04:49 > > To: Dave Page > > Cc: PgSQL Win32 developers > > Subject: Re: [pgsql-hackers-win32] VC++ psql build broken > > > > > > OK, I was creating pg_config_paths.h in the wrong directory. > > This should fix it. > > No, still get the following :-( : > > Microsoft (R) Program Maintenance Utility Version 6.00.8168.0 > Copyright (C) Microsoft Corp 1988-1998. All rights reserved. > > echo "#define PGBINDIR "">"..\..\port\pg_config_paths.h" > "#define PGBINDIR "">"..\..\port\pg_config_paths.h" > echo "#define PGSHAREDIR "" >>"..\..\port\pg_config_paths.h" > "#define PGSHAREDIR "" >>"..\..\port\pg_config_paths.h" > echo "#define SYSCONFDIR "" >>"..\..\port\pg_config_paths.h" > "#define SYSCONFDIR "" >>"..\..\port\pg_config_paths.h" > echo "#define INCLUDEDIR "" >>"..\..\port\pg_config_paths.h" > "#define INCLUDEDIR "" >>"..\..\port\pg_config_paths.h" > echo "#define PKGINCLUDEDIR "" >>"..\..\port\pg_config_paths.h" > "#define PKGINCLUDEDIR "" >>"..\..\port\pg_config_paths.h" > echo "#define INCLUDEDIRSERVER "" > >>"..\..\port\pg_config_paths.h" > "#define INCLUDEDIRSERVER "" >>"..\..\port\pg_config_paths.h" > echo "#define LIBDIR "" >>"..\..\port\pg_config_paths.h" > "#define LIBDIR "" >>"..\..\port\pg_config_paths.h" > echo "#define PKGLIBDIR "" >>"..\..\port\pg_config_paths.h" > "#define PKGLIBDIR "" >>"..\..\port\pg_config_paths.h" > echo "#define LOCALEDIR "" >>"..\..\port\pg_config_paths.h" > "#define LOCALEDIR "" >>"..\..\port\pg_config_paths.h" > if not exist ".\Release/" mkdir ".\Release" > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nma00380. > sprompt.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmb00380. > getopt.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmc00380. > getopt_long.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmd00380. > path.c > ..\..\port\path.c(198) : error C2065: 'PGBINDIR' : undeclared identifier > ..\..\port\path.c(198) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(198) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(198) : error C2065: 'PGSHAREDIR' : undeclared > identifier > ..\..\port\path.c(198) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(198) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(201) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(201) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(215) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(215) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(232) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(232) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(232) : error C2065: 'INCLUDEDIR' : undeclared > identifier > ..\..\port\path.c(232) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(232) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(235) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(235) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(249) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(249) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(249) : error C2065: 'PKGINCLUDEDIR' : undeclared > identifier > ..\..\port\path.c(249) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(249) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(252) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(252) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(266) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(266) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(266) : error C2065: 'INCLUDEDIRSERVER' : undeclared > identifier > > ..\..\port\path.c(266) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(266) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(269) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(269) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(283) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(283) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(283) : error C2065: 'LIBDIR' : undeclared identifier > ..\..\port\path.c(283) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(283) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(286) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(286) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(300) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(300) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(300) : error C2065: 'PKGLIBDIR' : undeclared > identifier > ..\..\port\path.c(300) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(300) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(303) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(303) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(319) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(319) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(319) : error C2065: 'LOCALEDIR' : undeclared > identifier > ..\..\port\path.c(319) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(319) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(322) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(322) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > 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. > > C:\Documents and Settings\dpage\My Documents\CVS\pgsql\src> > > Regards, Dave > > ---------------------------(end of broadcast)--------------------------- > TIP 1: subscribe and unsubscribe commands go to majordomo@postgresql.org > -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 359-1001 + If your life is a hard drive, | 13 Roberts Road + Christ can be your backup. | Newtown Square, Pennsylvania 19073 Index: src/bin/psql/bcc32.mak =================================================================== RCS file: /cvsroot/pgsql-server/src/bin/psql/bcc32.mak,v retrieving revision 1.8 diff -c -c -r1.8 bcc32.mak *** src/bin/psql/bcc32.mak 10 Sep 2004 03:48:54 -0000 1.8 --- src/bin/psql/bcc32.mak 10 Sep 2004 09:38:00 -0000 *************** *** 84,98 **** -@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)" --- 84,98 ---- -@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)" Index: src/bin/psql/win32.mak =================================================================== RCS file: /cvsroot/pgsql-server/src/bin/psql/win32.mak,v retrieving revision 1.20 diff -c -c -r1.20 win32.mak *** src/bin/psql/win32.mak 10 Sep 2004 03:48:54 -0000 1.20 --- src/bin/psql/win32.mak 10 Sep 2004 09:38:02 -0000 *************** *** 44,58 **** -@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)" --- 44,58 ---- -@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)"
I wasn't quoting properly. Patch attached. --------------------------------------------------------------------------- Dave Page wrote: > > > > -----Original Message----- > > From: Bruce Momjian [mailto:pgman@candle.pha.pa.us] > > Sent: 10 September 2004 04:49 > > To: Dave Page > > Cc: PgSQL Win32 developers > > Subject: Re: [pgsql-hackers-win32] VC++ psql build broken > > > > > > OK, I was creating pg_config_paths.h in the wrong directory. > > This should fix it. > > No, still get the following :-( : > > Microsoft (R) Program Maintenance Utility Version 6.00.8168.0 > Copyright (C) Microsoft Corp 1988-1998. All rights reserved. > > echo "#define PGBINDIR "">"..\..\port\pg_config_paths.h" > "#define PGBINDIR "">"..\..\port\pg_config_paths.h" > echo "#define PGSHAREDIR "" >>"..\..\port\pg_config_paths.h" > "#define PGSHAREDIR "" >>"..\..\port\pg_config_paths.h" > echo "#define SYSCONFDIR "" >>"..\..\port\pg_config_paths.h" > "#define SYSCONFDIR "" >>"..\..\port\pg_config_paths.h" > echo "#define INCLUDEDIR "" >>"..\..\port\pg_config_paths.h" > "#define INCLUDEDIR "" >>"..\..\port\pg_config_paths.h" > echo "#define PKGINCLUDEDIR "" >>"..\..\port\pg_config_paths.h" > "#define PKGINCLUDEDIR "" >>"..\..\port\pg_config_paths.h" > echo "#define INCLUDEDIRSERVER "" > >>"..\..\port\pg_config_paths.h" > "#define INCLUDEDIRSERVER "" >>"..\..\port\pg_config_paths.h" > echo "#define LIBDIR "" >>"..\..\port\pg_config_paths.h" > "#define LIBDIR "" >>"..\..\port\pg_config_paths.h" > echo "#define PKGLIBDIR "" >>"..\..\port\pg_config_paths.h" > "#define PKGLIBDIR "" >>"..\..\port\pg_config_paths.h" > echo "#define LOCALEDIR "" >>"..\..\port\pg_config_paths.h" > "#define LOCALEDIR "" >>"..\..\port\pg_config_paths.h" > if not exist ".\Release/" mkdir ".\Release" > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nma00380. > sprompt.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmb00380. > getopt.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmc00380. > getopt_long.c > cl.exe @C:\DOCUME~1\dpage\LOCALS~1\Temp\nmd00380. > path.c > ..\..\port\path.c(198) : error C2065: 'PGBINDIR' : undeclared identifier > ..\..\port\path.c(198) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(198) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(198) : error C2065: 'PGSHAREDIR' : undeclared > identifier > ..\..\port\path.c(198) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(198) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(201) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(201) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(215) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(215) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(232) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(232) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(232) : error C2065: 'INCLUDEDIR' : undeclared > identifier > ..\..\port\path.c(232) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(232) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(235) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(235) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(249) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(249) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(249) : error C2065: 'PKGINCLUDEDIR' : undeclared > identifier > ..\..\port\path.c(249) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(249) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(252) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(252) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(266) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(266) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(266) : error C2065: 'INCLUDEDIRSERVER' : undeclared > identifier > > ..\..\port\path.c(266) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(266) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(269) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(269) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(283) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(283) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(283) : error C2065: 'LIBDIR' : undeclared identifier > ..\..\port\path.c(283) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(283) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(286) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(286) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(300) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(300) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(300) : error C2065: 'PKGLIBDIR' : undeclared > identifier > ..\..\port\path.c(300) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(300) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(303) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(303) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > ..\..\port\path.c(319) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(319) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 1 > ..\..\port\path.c(319) : error C2065: 'LOCALEDIR' : undeclared > identifier > ..\..\port\path.c(319) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(319) : warning C4024: 'relative_path' : different > types for fo > rmal and actual parameter 2 > ..\..\port\path.c(322) : warning C4047: 'function' : 'const char *' > differs in l > evels of indirection from 'int ' > ..\..\port\path.c(322) : warning C4024: 'strncpy' : different types for > formal a > nd actual parameter 2 > 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. > > C:\Documents and Settings\dpage\My Documents\CVS\pgsql\src> > > Regards, Dave > > ---------------------------(end of broadcast)--------------------------- > TIP 1: subscribe and unsubscribe commands go to majordomo@postgresql.org > -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 359-1001 + If your life is a hard drive, | 13 Roberts Road + Christ can be your backup. | Newtown Square, Pennsylvania 19073 Index: src/bin/psql/bcc32.mak =================================================================== RCS file: /cvsroot/pgsql-server/src/bin/psql/bcc32.mak,v retrieving revision 1.8 diff -c -c -r1.8 bcc32.mak *** src/bin/psql/bcc32.mak 10 Sep 2004 03:48:54 -0000 1.8 --- src/bin/psql/bcc32.mak 10 Sep 2004 09:38:00 -0000 *************** *** 84,98 **** -@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)" --- 84,98 ---- -@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)" Index: src/bin/psql/win32.mak =================================================================== RCS file: /cvsroot/pgsql-server/src/bin/psql/win32.mak,v retrieving revision 1.20 diff -c -c -r1.20 win32.mak *** src/bin/psql/win32.mak 10 Sep 2004 03:48:54 -0000 1.20 --- src/bin/psql/win32.mak 10 Sep 2004 09:38:02 -0000 *************** *** 44,58 **** -@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)" --- 44,58 ---- -@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)"
> -----Original Message----- > From: Bruce Momjian [mailto:pgman@candle.pha.pa.us] > Sent: 10 September 2004 10:47 > To: Dave Page > Cc: PgSQL Win32 developers > Subject: Re: [pgsql-hackers-win32] VC++ psql build broken > > > OK, another patch. Thanks. > That looks better thanks, however: Microsoft (R) Program Maintenance Utility Version 6.00.8168.0 Copyright (C) Microsoft Corp 1988-1998. All rights reserved. perl.exe create_help.pl ../../../doc/src/sgml/ref sql_help.h 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" if not exist ".\Release/" mkdir ".\Release" NMAKE : fatal error U1073: don't know how to make '".\Release\psqlscan.obj"' Stop. NMAKE : fatal error U1077: 'C:\PROGRA~1\MICROS~3\VC98\BIN\NMAKE.EXE' : return co de '0x2' Stop. Not sure how to fix that :-( Regards, Dave
Ah, now we have hit a different roadblock, namely psqlscan.l. Don't you have a psqlscan.c? Ah, I bet you are using CVS and not a snapshot. A snapshot/tarball will have the flex output file but we don't keep that in CVS anymore. To get it to work you need the psqlscan.c file from a recent tarball or instal flex. --------------------------------------------------------------------------- Dave Page wrote: > > > > -----Original Message----- > > From: Bruce Momjian [mailto:pgman@candle.pha.pa.us] > > Sent: 10 September 2004 10:47 > > To: Dave Page > > Cc: PgSQL Win32 developers > > Subject: Re: [pgsql-hackers-win32] VC++ psql build broken > > > > > > OK, another patch. Thanks. > > > > That looks better thanks, however: > > Microsoft (R) Program Maintenance Utility Version 6.00.8168.0 > Copyright (C) Microsoft Corp 1988-1998. All rights reserved. > > perl.exe create_help.pl ../../../doc/src/sgml/ref sql_help.h > 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" > if not exist ".\Release/" mkdir ".\Release" > NMAKE : fatal error U1073: don't know how to make > '".\Release\psqlscan.obj"' > Stop. > NMAKE : fatal error U1077: 'C:\PROGRA~1\MICROS~3\VC98\BIN\NMAKE.EXE' : > return co > de '0x2' > Stop. > > Not sure how to fix that :-( > > Regards, Dave > > ---------------------------(end of broadcast)--------------------------- > TIP 8: explain analyze is your friend > -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 359-1001 + If your life is a hard drive, | 13 Roberts Road + Christ can be your backup. | Newtown Square, Pennsylvania 19073
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. --------------------------------------------------------------------------- pgman wrote: > > Ah, now we have hit a different roadblock, namely psqlscan.l. Don't you > have a psqlscan.c? Ah, I bet you are using CVS and not a snapshot. A > snapshot/tarball will have the flex output file but we don't keep that > in CVS anymore. > > To get it to work you need the psqlscan.c file from a recent tarball or > instal flex. > > --------------------------------------------------------------------------- > > Dave Page wrote: > > > > > > > -----Original Message----- > > > From: Bruce Momjian [mailto:pgman@candle.pha.pa.us] > > > Sent: 10 September 2004 10:47 > > > To: Dave Page > > > Cc: PgSQL Win32 developers > > > Subject: Re: [pgsql-hackers-win32] VC++ psql build broken > > > > > > > > > OK, another patch. Thanks. > > > > > > > That looks better thanks, however: > > > > Microsoft (R) Program Maintenance Utility Version 6.00.8168.0 > > Copyright (C) Microsoft Corp 1988-1998. All rights reserved. > > > > perl.exe create_help.pl ../../../doc/src/sgml/ref sql_help.h > > 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" > > if not exist ".\Release/" mkdir ".\Release" > > NMAKE : fatal error U1073: don't know how to make > > '".\Release\psqlscan.obj"' > > Stop. > > NMAKE : fatal error U1077: 'C:\PROGRA~1\MICROS~3\VC98\BIN\NMAKE.EXE' : > > return co > > de '0x2' > > Stop. > > > > Not sure how to fix that :-( > > > > Regards, Dave > > > > ---------------------------(end of broadcast)--------------------------- > > TIP 8: explain analyze is your friend > > > > -- > Bruce Momjian | http://candle.pha.pa.us > pgman@candle.pha.pa.us | (610) 359-1001 > + If your life is a hard drive, | 13 Roberts Road > + Christ can be your backup. | Newtown Square, Pennsylvania 19073 -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 359-1001 + If your life is a hard drive, | 13 Roberts Road + Christ can be your backup. | Newtown Square, Pennsylvania 19073
-----Original Message----- From: Bruce Momjian [mailto:pgman@candle.pha.pa.us] Sent: Fri 9/10/2004 5:30 PM To: Dave Page Cc: PgSQL Win32 developers Subject: Re: [pgsql-hackers-win32] VC++ psql build broken > Ah, now we have hit a different roadblock, namely psqlscan.l. Don't you > have a psqlscan.c? Ah, I bet you are using CVS and not a snapshot. A > snapshot/tarball will have the flex output file but we don't keep that > in CVS anymore. Of course, I had forgotten that the flex output was included in the source tarball. I'll grab a copy from my mingw tree andtry it when I have my laptop out later. Regards, Dave
-----Original Message----- From: Bruce Momjian [mailto:pgman@candle.pha.pa.us] Sent: Fri 9/10/2004 5:41 PM To: pgman@candle.pha.pa.us 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. That requires flex to be installed of course, which it won't be with VC++ (I don't know about Borland). Perhaps a note shouldbe added to the README? I'll see if I can add a rule later. Regards, Dave.
Dave Page wrote: > > 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. > > That requires flex to be installed of course, which it won't be > with VC++ (I don't know about Borland). Perhaps a note should > be added to the README? I'll see if I can add a rule later. Uh, what README? -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 359-1001 + If your life is a hard drive, | 13 Roberts Road + Christ can be your backup. | Newtown Square, Pennsylvania 19073