* Noah Misch wrote:
Committed.
Much apologizings for coming in late again, but I just realized it would
be better if the user-controlled flags came after all predefined options
the user might want to override. Right now that is only /verbosity in
both build and clean operations.
Patch attached, also reordering the ecpg-clean command line in clean.bat
to match the others that have the project file first.
--
Christian
>From 09a5f3945e2b87b56ca3525a56db970e9ecf8ffd Mon Sep 17 00:00:00 2001
From: Christian Ullrich <ch...@chrullrich.net>
Date: Thu, 8 Sep 2016 08:34:45 +0200
Subject: [PATCH] Let MSBFLAGS be used to override predefined options.
---
src/tools/msvc/build.pl | 4 ++--
src/tools/msvc/clean.bat | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/tools/msvc/build.pl b/src/tools/msvc/build.pl
index 5273977..a5469cd 100644
--- a/src/tools/msvc/build.pl
+++ b/src/tools/msvc/build.pl
@@ -54,7 +54,7 @@ elsif (uc($ARGV[0]) ne "RELEASE")
if ($buildwhat and $vcver >= 10.00)
{
system(
- "msbuild $buildwhat.vcxproj $msbflags /verbosity:normal
/p:Configuration=$bconf"
+ "msbuild $buildwhat.vcxproj /verbosity:normal $msbflags
/p:Configuration=$bconf"
);
}
elsif ($buildwhat)
@@ -63,7 +63,7 @@ elsif ($buildwhat)
}
else
{
- system("msbuild pgsql.sln $msbflags /verbosity:normal
/p:Configuration=$bconf");
+ system("msbuild pgsql.sln /verbosity:normal $msbflags
/p:Configuration=$bconf");
}
# report status
diff --git a/src/tools/msvc/clean.bat b/src/tools/msvc/clean.bat
index e21e37f..b972ddf 100755
--- a/src/tools/msvc/clean.bat
+++ b/src/tools/msvc/clean.bat
@@ -107,6 +107,6 @@ REM for /r %%f in (*.sql) do if exist %%f.in del %%f
cd %D%
REM Clean up ecpg regression test files
-msbuild %MSBFLAGS% /NoLogo ecpg_regression.proj /t:clean /v:q
+msbuild ecpg_regression.proj /NoLogo /v:q %MSBFLAGS% /t:clean
goto :eof
--
2.10.0.windows.1
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
