Thread: re-enable MSVC builds

The attached patch allows MSCV builds to complete.

The warnings still shown (see recent -hackers email) are identical to
those that were present in RC2, so they are not the products of recent
homedir changes.

cheers

andrew


Index: interfaces/libpq/fe-connect.c
===================================================================
RCS file: /home/cvsmirror/pgsql/src/interfaces/libpq/fe-connect.c,v
retrieving revision 1.299
diff -c -r1.299 fe-connect.c
*** interfaces/libpq/fe-connect.c    6 Jan 2005 21:41:44 -0000    1.299
--- interfaces/libpq/fe-connect.c    9 Jan 2005 22:43:47 -0000
***************
*** 35,41 ****
--- 35,48 ----

  #ifdef WIN32
  #include "win32.h"
+ #ifdef _WIN32_IE
+ #undef _WIN32_IE
+ #endif
  #define _WIN32_IE 0x0400
+ #ifdef near
+ #undef near
+ #endif
+ #define near
  #include <shlobj.h>
  #else
  #include <sys/socket.h>
Index: interfaces/libpq/win32.mak
===================================================================
RCS file: /home/cvsmirror/pgsql/src/interfaces/libpq/win32.mak,v
retrieving revision 1.28
diff -c -r1.28 win32.mak
*** interfaces/libpq/win32.mak    13 Nov 2004 03:18:50 -0000    1.28
--- interfaces/libpq/win32.mak    9 Jan 2005 22:43:47 -0000
***************
*** 138,144 ****
  RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"

  LINK32=link.exe
! LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib wsock32.lib $(SSL_LIBS)  \
   /nologo /subsystem:windows /dll $(LOPT) /incremental:no\
   /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:I386 /out:"$(OUTDIR)\$(OUTFILENAME).dll"\
   /implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib"  /def:$(OUTFILENAME)dll.def
--- 138,144 ----
  RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"

  LINK32=link.exe
! LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib $(SSL_LIBS)  \
   /nologo /subsystem:windows /dll $(LOPT) /incremental:no\
   /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:I386 /out:"$(OUTDIR)\$(OUTFILENAME).dll"\
   /implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib"  /def:$(OUTFILENAME)dll.def
Index: port/path.c
===================================================================
RCS file: /home/cvsmirror/pgsql/src/port/path.c,v
retrieving revision 1.49
diff -c -r1.49 path.c
*** port/path.c    6 Jan 2005 21:41:45 -0000    1.49
--- port/path.c    9 Jan 2005 22:43:47 -0000
***************
*** 18,24 ****
--- 18,31 ----
  #include <ctype.h>
  #include <sys/stat.h>
  #ifdef WIN32
+ #ifdef _WIN32_IE
+ #undef _WIN32_IE
+ #endif
  #define _WIN32_IE 0x0400
+ #ifdef near
+ #undef near
+ #endif
+ #define near
  #include <shlobj.h>
  #else
  #include <unistd.h>

Andrew Dunstan <andrew@dunslane.net> writes:
> The attached patch allows MSCV builds to complete.

Applied.

(I wonder whether the Borland build still works...)

> The warnings still shown (see recent -hackers email) are identical to
> those that were present in RC2, so they are not the products of recent
> homedir changes.

With the possible exception of the mkdir warning, these seem cosmetic
and not worth worrying about at this stage of the release cycle.

            regards, tom lane

> > The attached patch allows MSCV builds to complete.
>
> Applied.
>
> (I wonder whether the Borland build still works...)

I'm sure it still eneds the shell32 linking. The suorce part should be
the same - AFAIK they ship the MS headers. But I don't have a way to
test it, so...


> > The warnings still shown (see recent -hackers email) are
> identical to
> > those that were present in RC2, so they are not the
> products of recent
> > homedir changes.
>
> With the possible exception of the mkdir warning, these seem
> cosmetic and not worth worrying about at this stage of the
> release cycle.

Definitly. There have been cosmetic warnings in the win32 build ever
since it was created.

//Magnus

Magnus Hagander wrote:

>>>The attached patch allows MSCV builds to complete.
>>>
>>>
>>Applied.
>>
>>(I wonder whether the Borland build still works...)
>>
>>
>
>I'm sure it still eneds the shell32 linking. The suorce part should be
>the same - AFAIK they ship the MS headers. But I don't have a way to
>test it, so...
>
>
>
>
>

Me either, and I don't have time to acquire/test before release. I don't
see where to put it in the bcc.mak file anyway. So, either it's not
broken, or it is broken and will stay that way, or it is broken and
somebody else will step in *real* quick to fix it :-) I am not betting
on this last.

cheers

andrew

Andrew Dunstan <andrew@dunslane.net> writes:
> Magnus Hagander wrote:
>> I'm sure it still eneds the shell32 linking.

> I don't see where to put it in the bcc.mak file anyway.

Yeah, I looked in bcc32.mak and didn't see any reference to the other
*32.dll files that win32.mak references.  So either Borland does not
need any of them, or the Borland build has been broken for awhile.

If someone steps up to fix it, great, otherwise it's on the path to
extinction...

            regards, tom lane