Commitd299eb4

committed

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

This is particularly useful to pass /m, to perform a parallel build.Christian Ullrich, reviewed by Michael Paquier.

1 parent976a9bb commitd299eb4Copy full SHA for d299eb4

File tree

+15

-5

lines changed

+15

-5

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,14 @@ $ENV{PATH}=$ENV{PATH} . ';c:\some\where\bison\bin';`
`145`	`145`	`</programlisting>`
`146`	`146`	`</para>`
`147`	`147`
	`148`	`+ <para>`
	`149`	`+ To pass additional command line arguments to the Visual Studio build`
	`150`	`+ command (msbuild or vcbuild):`
	`151`	`+<programlisting>`
	`152`	`+$ENV{MSBFLAGS}="/m";`
	`153`	`+</programlisting>`
	`154`	`+ </para>`
	`155`	`+`
`148`	`156`	`<sect2>`
`149`	`157`	`<title>Requirements</title>`
`150`	`158`	`<para>`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ BEGIN`
`38`	`38`	`# check what sort of build we are doing`
`39`	`39`
`40`	`40`	`my$bconf =$ENV{CONFIG} \|\|"Release";`
	`41`	`+my$msbflags =$ENV{MSBFLAGS} \|\|"";`
`41`	`42`	`my$buildwhat =$ARGV[1] \|\|"";`
`42`	`43`	`if (uc($ARGV[0])eq'DEBUG')`
`43`	`44`	`{`
`@@ -53,16 +54,16 @@ BEGIN`
`53`	`54`	`if ($buildwhatand$vcver >= 10.00)`
`54`	`55`	`{`
`55`	`56`	`system(`
`56`		`-"msbuild$buildwhat.vcxproj /verbosity:normal /p:Configuration=$bconf"`
	`57`	`+"msbuild$buildwhat.vcxproj$msbflags/verbosity:normal /p:Configuration=$bconf"`
`57`	`58`	`);`
`58`	`59`	`}`
`59`	`60`	`elsif ($buildwhat)`
`60`	`61`	`{`
`61`		`-system("vcbuild$buildwhat.vcproj$bconf");`
	`62`	`+system("vcbuild$msbflags$buildwhat.vcproj$bconf");`
`62`	`63`	`}`
`63`	`64`	`else`
`64`	`65`	`{`
`65`		`-system("msbuild pgsql.sln /verbosity:normal /p:Configuration=$bconf");`
	`66`	`+system("msbuild pgsql.sln$msbflags/verbosity:normal /p:Configuration=$bconf");`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`# report status`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,6 @@ REM for /r %%f in (*.sql) do if exist %%f.in del %%f`
`107`	`107`	`cd%D%`
`108`	`108`
`109`	`109`	`REM Clean up ecpg regression test files`
`110`		`-msbuild /NoLogo ecpg_regression.proj /t:clean /v:q`
	`110`	`+msbuild%MSBFLAGS%/NoLogo ecpg_regression.proj /t:clean /v:q`
`111`	`111`
`112`	`112`	`goto :eof`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,9 @@ sub check`
`138`	`138`
`139`	`139`	`subecpgcheck`
`140`	`140`	`{`
	`141`	`+my$msbflags =$ENV{MSBFLAGS} \|\|"";`
`141`	`142`	`chdir$startdir;`
`142`		`-system("msbuild ecpg_regression.proj /p:config=$Config");`
	`143`	`+system("msbuild ecpg_regression.proj$msbflags/p:config=$Config");`
`143`	`144`	`my$status =$? >> 8;`
`144`	`145`	`exit$statusif$status;`
`145`	`146`	`InstallTemp();`

Comments

(0)