From 2ef6bb245ce38861712c63552c296ecc51b16083 Mon Sep 17 00:00:00 2001 From: Mihaela Stoica Date: Wed, 23 Nov 2016 16:24:18 +0000 Subject: [PATCH] CA-233286: Error while running the package-and-sign script Use executables from WIX_BIN instead of the default Wix candle/lit/light exes Signed-off-by: Mihaela Stoica --- mk/package-and-sign.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mk/package-and-sign.sh b/mk/package-and-sign.sh index a67a7379c..64fdb8dbf 100644 --- a/mk/package-and-sign.sh +++ b/mk/package-and-sign.sh @@ -45,9 +45,9 @@ BRANDING_COMPANY_NAME_SHORT=[Citrix] WIX=${REPO}/WixInstaller WIX_BIN=${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() { @@ -61,6 +61,7 @@ if [ -f ${SIGN_FILE} ]; then fi #build and sign the installers +echo "INFO: Build and sign the installers..." . ${REPO}/mk/build-installers.sh #collect output and extra files to the OUTPUT_DIR @@ -75,4 +76,4 @@ cp ${DOTNETINST}/${BRANDING_BRAND_CONSOLE}Setup.l10n.exe ${L10N_CD_DIR} echo "INFO: Build phase succeeded at " date -set +u +set +u \ No newline at end of file