opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow running src/tools/msvc/mkvcbuild.pl under not Windows 

This to allow verifying the MSVC build file generation without having
to have Windows.

To do this, we avoid Windows-specific Perl modules and don't run the
"cl" compiler or "nmake".  The resulting build files won't actually be
completely correct, but it's useful enough.

Reviewed-by: Michael Paquier <michael@paquier.xyz>
Reviewed-by: Julien Rouhaud <rjuju123@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/d73b2c7b-f081-8357-8422-7564d55f1aac%402ndquadrant.com
This commit is contained in:
Peter Eisentraut 2020-02-21 20:50:56 +01:00
parent f4d59369d2
commit 73c8596488
4 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/msvc/Mkvcbuild.pm
View File

@ -6,7 +6,7 @@ package Mkvcbuild;
# src/tools/msvc/Mkvcbuild.pm
#
use Carp;
use Win32;
use if ($^O eq "MSWin32"), 'Win32';
use strict;
use warnings;
use Project;
@ -648,9 +648,11 @@ sub mkvcbuild
# 'Can't spawn "conftest.exe"'; suppress that.
no warnings;
no strict 'subs';
# Disable error dialog boxes like we do in the postmaster.
# Here, we run code that triggers relevant errors.
use Win32API::File qw(SetErrorMode :SEM_);
use if ($^O eq "MSWin32"), 'Win32API::File', qw(SetErrorMode :SEM_);
my $oldmode = SetErrorMode(
SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
system(".\\$exe");

2
src/tools/msvc/Project.pm
View File

@ -22,7 +22,7 @@ sub _new
my $self = {
name => $name,
type => $type,
guid => Win32::GuidGen(),
guid => $^O eq "MSWin32" ? Win32::GuidGen() : 'FAKE',
files => {},
references => [],
libraries => [],

17
src/tools/msvc/Solution.pm
View File

@ -60,10 +60,17 @@ sub DeterminePlatform
{
my $self = shift;
# Examine CL help output to determine if we are in 32 or 64-bit mode.
my $output = `cl /? 2>&1`;
$? >> 8 == 0 or die "cl command not found";
$self->{platform} = ($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32';
if ($^O eq "MSWin32")
{
# Examine CL help output to determine if we are in 32 or 64-bit mode.
my $output = `cl /? 2>&1`;
$? >> 8 == 0 or die "cl command not found";
$self->{platform} = ($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32';
}
else
{
$self->{platform} = 'FAKE';
}
print "Detected hardware platform: $self->{platform}\n";
return;
}
@ -1061,7 +1068,7 @@ EOF
}
if ($fld ne "")
{
$flduid{$fld} = Win32::GuidGen();
$flduid{$fld} = $^O eq "MSWin32" ? Win32::GuidGen() : 'FAKE';
print $sln <<EOF;
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "$fld", "$fld", "$flduid{$fld}"
EndProject

33
src/tools/msvc/VSObjectFactory.pm
View File

@ -111,21 +111,28 @@ sub CreateProject
sub DetermineVisualStudioVersion
{
# To determine version of Visual Studio we use nmake as it has
# existed for a long time and still exists in current Visual
# Studio versions.
my $output = `nmake /? 2>&1`;
$? >> 8 == 0
or croak
"Unable to determine Visual Studio version: The nmake command wasn't found.";
if ($output =~ /(\d+)\.(\d+)\.\d+(\.\d+)?$/m)
if ($^O eq "MSWin32")
{
return _GetVisualStudioVersion($1, $2);
}
# To determine version of Visual Studio we use nmake as it has
# existed for a long time and still exists in current Visual
# Studio versions.
my $output = `nmake /? 2>&1`;
$? >> 8 == 0
or croak
"Unable to determine Visual Studio version: The nmake command wasn't found.";
if ($output =~ /(\d+)\.(\d+)\.\d+(\.\d+)?$/m)
{
return _GetVisualStudioVersion($1, $2);
}
croak
"Unable to determine Visual Studio version: The nmake version could not be determined.";
croak
"Unable to determine Visual Studio version: The nmake version could not be determined.";
}
else
{
# fake version
return '16.00';
}
}
sub _GetVisualStudioVersion