Update upstream source from tag 'upstream/2.3.0+dfsg'

Update to upstream version '2.3.0+dfsg'
with Debian dir f701d582fe3b6bb5189dbf035102670db9c2516b

1 files changed, 8 insertions, 9 deletions

diff --git a/build_installer.bat b/build_installer.bat
index 424e585..9c204cc 100644
--- a/build_installer.bat
+++ b/build_installer.bat
@@ -1,25 +1,24 @@
 @echo off

-set WIX_ROOT=C:\Program Files (x86)\WiX Toolset v3.11

+set INNO_ROOT=C:\Program Files (x86)\Inno Setup 5

 

 set savedir=%cd%

 cd /d %~dp0

 

 if not exist build\bin\Release goto buildproject

 

-cd build\installer

-if ERRORLEVEL 1 goto buildproject

-

 echo Building 64-bit Windows installer...

-"%WIX_ROOT%\bin\candle.exe" -nologo -arch x64 -dConfiguration=Release -dPlatform=x64 -ext WixUtilExtension -ext WixFirewallExtension Product.wxs -o Barrier.wixobj

-if ERRORLEVEL 1 goto failed

-"%WIX_ROOT%\bin\light.exe" -nologo -ext WixUtilExtension -ext WixFirewallExtension -ext WixUIExtension Barrier.wixobj -o bin\Barrier.msi

+

+cd build\installer-inno

+if ERRORLEVEL 1 goto buildproject

+"%INNO_ROOT%\ISCC.exe" /Qp barrier.iss

 if ERRORLEVEL 1 goto failed

+

 echo Build completed successfully

 goto done

 

 :buildproject

 echo To build a 64-bit Windows installer:

-echo  - set Q_BUILD_TYPE=Release in build_env.bat

+echo  - set B_BUILD_TYPE=Release in build_env.bat

 echo  - also set other environmental overrides necessary for your build environment

 echo  - run clean_build.bat to build Barrier and verify that it succeeds

 echo  - re-run this script to create the installation package

@@ -29,7 +28,7 @@ goto done
 echo Build failed

 

 :done

-set WIX_ROOT=

+set INNO_ROOT=

 

 cd /d %savedir%

 set savedir=