database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

MSVC: Pass any user-set MSBFLAGS to MSBuild and VCBUILD.

Browse Source 
This is particularly useful to pass /m, to perform a parallel build.

Christian Ullrich, reviewed by Michael Paquier.
This commit is contained in:
Noah Misch 2016-09-08 01:42:09 -04:00
parent 976a9bbd02
commit d299eb41df
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/src/sgml/install-windows.sgml
View File

@ -145,6 +145,14 @@ $ENV{PATH}=$ENV{PATH} . ';c:\some\where\bison\bin';
</programlisting> </programlisting>
</para> </para>
<para>
To pass additional command line arguments to the Visual Studio build
command (msbuild or vcbuild):
<programlisting>
$ENV{MSBFLAGS}="/m";
</programlisting>
</para>
<sect2> <sect2>
<title>Requirements</title> <title>Requirements</title>
<para> <para>

7
src/tools/msvc/build.pl
View File

@ -38,6 +38,7 @@ my $vcver = Mkvcbuild::mkvcbuild($config);
# check what sort of build we are doing # check what sort of build we are doing
my $bconf = $ENV{CONFIG} || "Release"; my $bconf = $ENV{CONFIG} || "Release";
my $msbflags = $ENV{MSBFLAGS} || "";
my $buildwhat = $ARGV[1] || ""; my $buildwhat = $ARGV[1] || "";
if (uc($ARGV[0]) eq 'DEBUG') if (uc($ARGV[0]) eq 'DEBUG')
{ {
@ -53,16 +54,16 @@ elsif (uc($ARGV[0]) ne "RELEASE")
if ($buildwhat and $vcver >= 10.00) if ($buildwhat and $vcver >= 10.00)
{ {
system( system(
"msbuild $buildwhat.vcxproj /verbosity:normal /p:Configuration=$bconf" "msbuild $buildwhat.vcxproj $msbflags /verbosity:normal /p:Configuration=$bconf"
); );
} }
elsif ($buildwhat) elsif ($buildwhat)
{ {
system("vcbuild $buildwhat.vcproj $bconf"); system("vcbuild $msbflags $buildwhat.vcproj $bconf");
} }
else else
{ {
system("msbuild pgsql.sln /verbosity:normal /p:Configuration=$bconf"); system("msbuild pgsql.sln $msbflags /verbosity:normal /p:Configuration=$bconf");
} }
# report status # report status

2
src/tools/msvc/clean.bat
View File

@ -107,6 +107,6 @@ REM for /r %%f in (*.sql) do if exist %%f.in del %%f
cd %D% cd %D%
REM Clean up ecpg regression test files REM Clean up ecpg regression test files
msbuild /NoLogo ecpg_regression.proj /t:clean /v:q msbuild %MSBFLAGS% /NoLogo ecpg_regression.proj /t:clean /v:q
goto :eof goto :eof

3
src/tools/msvc/vcregress.pl
View File

@ -138,8 +138,9 @@ sub check
sub ecpgcheck sub ecpgcheck
{ {
my $msbflags = $ENV{MSBFLAGS} || "";
chdir $startdir; chdir $startdir;
system("msbuild ecpg_regression.proj /p:config=$Config"); system("msbuild ecpg_regression.proj $msbflags /p:config=$Config");
my $status = $? >> 8; my $status = $? >> 8;
exit $status if $status; exit $status if $status;
InstallTemp(); InstallTemp();