Merge pull request #1305 from MihaelaStoica/master

CA-233286: Error while running the package-and-sign script
This commit is contained in:
Gabor Apati-Nagy 2016-11-23 18:02:18 +00:00 committed by GitHub
commit d2f36ca538

View File

@ -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