Re: VC++ psql build broken

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 "" >>$@