[DotNet upgrade] Use executables from WIX_BIN instead of the default Wix candle/lit/light exes (which may not be the WIX_BIN ones), to guarantee using the patched+built 3.10 exes

Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
This commit is contained in:
Callum McIntyre 2016-10-17 10:41:00 +01:00
parent 574c7ed221
commit dfe627b5ee

View File

@ -167,10 +167,10 @@ $MSBUILD /p:SolutionDir="$SOLUTIONDIR" splash/splash.vcxproj
WIX=${REPO}/WixInstaller
WIX_BIN=${WIX}/bin
WIX_SRC=${SCRATCH_DIR}/wixsrc
# ${WIX_BIN}/
CANDLE="candle.exe -nologo"
LIT="lit.exe -nologo"
LIGHT="light.exe -nologo"
CANDLE="${WIX_BIN}/candle.exe -nologo"
LIT="${WIX_BIN}/lit.exe -nologo"
LIGHT="${WIX_BIN}/light.exe -nologo"
mkdir_clean ${WIX_SRC}
${UNZIP} ${SCRATCH_DIR}/wix310-debug.zip -d ${SCRATCH_DIR}/wixsrc