build: improve error handling if windows deployment cannot find the proper tools
This commit is contained in:
@@ -22,7 +22,12 @@ VERSION_STRING="${VERSION_STRING:2}"
|
|||||||
echo "installer version is $VERSION_STRING"
|
echo "installer version is $VERSION_STRING"
|
||||||
|
|
||||||
PRODUCT_GUID=$(cmd.exe /c "uuidgen")
|
PRODUCT_GUID=$(cmd.exe /c "uuidgen")
|
||||||
echo "$WIN_ARCH product guid is $PRODUCT_GUID"
|
if [ -z "$PRODUCT_GUID" ]; then
|
||||||
|
echo "Unable to generate GUID. Make sure to run this script from the Visual Studio command propmt. Aborting now."
|
||||||
|
exit 1
|
||||||
|
else
|
||||||
|
echo "$WIN_ARCH product guid is $PRODUCT_GUID"
|
||||||
|
fi
|
||||||
|
|
||||||
rm -rf build
|
rm -rf build
|
||||||
mkdir build
|
mkdir build
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ UPDATE_DATABASES=true
|
|||||||
CREATE_WIX_INSTALLER=true
|
CREATE_WIX_INSTALLER=true
|
||||||
CREATE_PORTABLE_PACKAGE=true
|
CREATE_PORTABLE_PACKAGE=true
|
||||||
|
|
||||||
RUN_32_BIT_PIPELINE=true
|
RUN_32_BIT_PIPELINE=false
|
||||||
RUN_64_BIT_PIPELINE=true
|
RUN_64_BIT_PIPELINE=true
|
||||||
|
|
||||||
|
|
||||||
@@ -215,9 +215,11 @@ fi
|
|||||||
cd deployment/windows/wixSetup
|
cd deployment/windows/wixSetup
|
||||||
if [ $RUN_32_BIT_PIPELINE = true ]; then
|
if [ $RUN_32_BIT_PIPELINE = true ]; then
|
||||||
sh build_win32.sh
|
sh build_win32.sh
|
||||||
|
[ $? -eq 0 ] || exit 1
|
||||||
fi
|
fi
|
||||||
if [ $RUN_64_BIT_PIPELINE = true ]; then
|
if [ $RUN_64_BIT_PIPELINE = true ]; then
|
||||||
sh build_win64.sh
|
sh build_win64.sh
|
||||||
|
[ $? -eq 0 ] || exit 1
|
||||||
fi
|
fi
|
||||||
cd ../../..
|
cd ../../..
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user