pgsql: Honor MSVC WindowsSDKVersion if set

Started by Andrew Dunstanalmost 7 years ago5 messagescomitters
Jump to latest
#1Andrew Dunstan
andrew@dunslane.net

Honor MSVC WindowsSDKVersion if set

Add a line to the project file setting the target SDK. Otherwise, in for
example VS2017, if the default but optional 8.1 SDK is not installed the
build will fail.

Patch from Peifeng Qiu, slightly edited by me.

Discussion: /messages/by-id/CABmtVJhw1boP_bd4=b3Qv5YnqEdL696NtHFi2ruiyQ6mFHkeQQ@mail.gmail.com

Backpatch to all live branches.

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/20e99cdddbd3b55257827d621c2f9c592521cd4b

Modified Files
--------------
src/tools/msvc/MSBuildProject.pm | 13 +++++++++++++
1 file changed, 13 insertions(+)

#2Tom Lane
tgl@sss.pgh.pa.us
In reply to: Andrew Dunstan (#1)
Re: pgsql: Honor MSVC WindowsSDKVersion if set

Andrew Dunstan <andrew@dunslane.net> writes:

Honor MSVC WindowsSDKVersion if set

Hmm, dory seems unhappy with this:

syntax error at C:\pgbuildfarm\pgbuildroot\HEAD\pgsql.build\src\tools\msvc/MSBuildProject.pm line 50, near ", =~"
BEGIN not safe after errors--compilation aborted at C:\pgbuildfarm\pgbuildroot\HEAD\pgsql.build\src\tools\msvc/MSBuildProject.pm line 414.
Compilation failed in require at C:\pgbuildfarm\pgbuildroot\HEAD\pgsql.build\src\tools\msvc/VSObjectFactory.pm line 16.
BEGIN failed--compilation aborted at C:\pgbuildfarm\pgbuildroot\HEAD\pgsql.build\src\tools\msvc/VSObjectFactory.pm line 16.
Compilation failed in require at C:\pgbuildfarm\pgbuildroot\HEAD\pgsql.build\src\tools\msvc/Solution.pm line 11.
BEGIN failed--compilation aborted at C:\pgbuildfarm\pgbuildroot\HEAD\pgsql.build\src\tools\msvc/Solution.pm line 11.
Compilation failed in require at C:\pgbuildfarm\pgbuildroot\HEAD\pgsql.build\src\tools\msvc/Mkvcbuild.pm line 13.
BEGIN failed--compilation aborted at C:\pgbuildfarm\pgbuildroot\HEAD\pgsql.build\src\tools\msvc/Mkvcbuild.pm line 13.
Compilation failed in require at build.pl line 13.
BEGIN failed--compilation aborted at build.pl line 13.

regards, tom lane

#3Andrew Dunstan
andrew@dunslane.net
In reply to: Tom Lane (#2)
Re: pgsql: Honor MSVC WindowsSDKVersion if set

On 7/25/19 1:18 PM, Tom Lane wrote:

Andrew Dunstan <andrew@dunslane.net> writes:

Honor MSVC WindowsSDKVersion if set

Hmm, dory seems unhappy with this:

syntax error at C:\pgbuildfarm\pgbuildroot\HEAD\pgsql.build\src\tools\msvc/MSBuildProject.pm line 50, near ", =~"
BEGIN not safe after errors--compilation aborted at C:\pgbuildfarm\pgbuildroot\HEAD\pgsql.build\src\tools\msvc/MSBuildProject.pm line 414.

Sometimes my fingers don't do what my brain tells them.

Will fix.

cheers

andrew

--
Andrew Dunstan https://www.2ndQuadrant.com
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services

#4Tom Lane
tgl@sss.pgh.pa.us
In reply to: Tom Lane (#2)
Re: pgsql: Honor MSVC WindowsSDKVersion if set

I wrote:

Andrew Dunstan <andrew@dunslane.net> writes:

Honor MSVC WindowsSDKVersion if set

Hmm, dory seems unhappy with this:

Looking closer, it seems to be just a stray comma, so I fixed that.

regards, tom lane

#5Andrew Dunstan
andrew@dunslane.net
In reply to: Tom Lane (#4)
Re: pgsql: Honor MSVC WindowsSDKVersion if set

On 7/25/19 2:43 PM, Tom Lane wrote:

I wrote:

Andrew Dunstan <andrew@dunslane.net> writes:

Honor MSVC WindowsSDKVersion if set

Hmm, dory seems unhappy with this:

Looking closer, it seems to be just a stray comma, so I fixed that.

Thanks for fixing

cheers

andrew

--
Andrew Dunstan https://www.2ndQuadrant.com
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services