Re: Missing file versions for a bunch of dll/exe files in Windows builds

From: Michael Paquier <michael(dot)paquier(at)gmail(dot)com>
To: Noah Misch <noah(at)leadboat(dot)com>
Cc: MauMau <maumau307(at)gmail(dot)com>, Magnus Hagander <magnus(at)hagander(dot)net>, pgsql-bugs <pgsql-bugs(at)postgresql(dot)org>
Subject: Re: Missing file versions for a bunch of dll/exe files in Windows builds
Date: 2014-07-11 04:21:57
Message-ID: CAB7nPqTozhMdCqXNsDeaBr30ofJpdt2P6u7v=FUA-_Z6tERD3w@mail.gmail.com
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-bugs

On Fri, Jul 11, 2014 at 12:02 AM, Noah Misch <noah(at)leadboat(dot)com> wrote:
> I started editing these patches for commit, but I ran into two defects.
Thanks for looking at that and helping out!

> First, clean.bat requires an update to remove the new win32ver.rc files.
Done. The removal of the additional rc files is grouped at the
beginning of clean.bat.

> Second, the MinGW build uses few or none of the new PGFILEDESC entries; you
> need to mention $(WIN32RES) as in (most) existing PGFILEDESC-using makefiles.
I see, that's specified in src/makefiles/Makefile.win32. For the
portion of conversion_procs, updating directly proc.mk seems to be
enough, so done this way. Also, an entry in conversion_procs was not
updated according to the PGFILEDESC you introduced.

Btw, looking more at those patches, I found a limitation with
contrib/spi for MinGW builds: in order to pass WIN32RES to OBJS, some
of the contrib defined as MODULES need to be defined as MODULE_big to
accept a custom list of OBJS, but MODULE_big is not able to accept a
list of shared libraries. This limitation causes all the dll generated
in contrib/spi to not be versioned with MinGW. MSVC works fine though.

> Here are the patches as they stood at the time of those discoveries.
> Project::AddDir() does more than look for PGFILEDESC. Your patches placed
> AddDir calls next to code made redundant by those calls; I removed the
> now-redundant code. I prefer four-argument Solution::AddProject() over
> three-argument Solution::AddProject() followed promptly by Project::AddDir(),
> but that was a mere cosmetic judgement. Our prevailing style is to not
> uppercase the letter after the hyphen in PGFILEDESC, and I edited PGFILEDESC
> wording here and there. Please update these to fix the two bugs noted above.
Ah, right. Nice catch.

> On Sat, Jun 21, 2014 at 10:13:40PM +0900, Michael Paquier wrote:
>> On Sat, Jun 21, 2014 at 11:47 AM, MauMau <maumau307(at)gmail(dot)com> wrote:
>> > bin\isolationtester.exe
>> > bin\pg_isolation_regress
>> > bin\pg_regress.exe
>> > bin\pg_regress_ecpg.exe
>> > bin\zic.exe
>> > lib\dict_snowball.dll
>> > lib\regress.dll
>> Yes, I'd like to improve that in a next patch hopefully in CF2, except
>> if a committer picking up this patch thinks differently.
>
> While I'd have preferred to see all binaries covered at once, that's fine.
Thanks, I am still planning to work more on those things for CF2 and
next commit fests.

Updated patches are attached.

Regards,
--
Michael

Attachment Content-Type Size
0001-MSVC-Recognize-PGFILEDESC-in-contrib-and-conversion_.patch text/x-patch 4.1 KB
0002-Improve-versioning-for-MSVC-and-MinGW-builds.patch text/x-patch 50.9 KB

In response to

Responses

Browse pgsql-bugs by date

  From Date Subject
Next Message gerke.ephorus 2014-07-11 07:31:49 BUG #10925: Documentation not clear on copy options containing '_'
Previous Message karel.knezourek 2014-07-11 04:06:53 BUG #10922: row_to_json creates invalid JSON for currecy lower then 1000.