From c6f8c0a1de448e7ca62ece1d21f089194d31f0d9 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Thu, 31 Jul 2014 23:58:27 -0500 Subject: Issue #21907: Avoid using double quotes to check argument values. Double quotes in expanded variables can match literal double quotes, which makes for a big mess when passing in a quoted argument (like "/p:externalsDir=..\externals", for example). --- PCbuild/build.bat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/PCbuild/build.bat b/PCbuild/build.bat index cde88c5..838f6ef 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -16,13 +16,13 @@ set target=Build set dir=%~dp0 :CheckOpts -if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts -if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts -if "%1"=="-r" (set target=Rebuild) & shift & goto CheckOpts -if "%1"=="-d" (set conf=Debug) & shift & goto CheckOpts -if "%1"=="-e" call "%dir%get_externals.bat" & shift & goto CheckOpts +if '%1'=='-c' (set conf=%2) & shift & shift & goto CheckOpts +if '%1'=='-p' (set platf=%2) & shift & shift & goto CheckOpts +if '%1'=='-r' (set target=Rebuild) & shift & goto CheckOpts +if '%1'=='-d' (set conf=Debug) & shift & goto CheckOpts +if '%1'=='-e' call "%dir%get_externals.bat" & shift & goto CheckOpts -if "%platf%"=="x64" (set vs_platf=x86_amd64) +if '%platf%'=='x64' (set vs_platf=x86_amd64) rem Setup the environment call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" %vs_platf% -- cgit v0.12