From 52b5daa4c3eb6051e577994ec36717328a008ef8 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Wed, 22 May 2019 22:06:03 +0900
Subject: [PATCH] Installer: Use Inno Setup 6 to build WinMerge x64 installer

---
 BuildInstaller.cmd | 19 ++++++++++++++++---
 appveyor.yml       |  2 ++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/BuildInstaller.cmd b/BuildInstaller.cmd
index e0ac4bf1e..a931a5ac0 100644
--- a/BuildInstaller.cmd
+++ b/BuildInstaller.cmd
@@ -9,9 +9,22 @@ goto :eof
 :BuildInstaller
 set PLATFORM=%1
 
-for %%i in ("%ProgramFiles(x86)%" "%ProgramFiles%") do (
-  if exist "%%~i\Inno Setup 5\iscc.exe" (
-    "%%~i\Inno Setup 5\iscc.exe" "Installer\innosetup\WinMerge%PLATFORM%.iss" || pause
+if "%PLATFORM%" == "x64" (
+  for %%i in ("%ProgramFiles(x86)%" "%ProgramFiles%") do (
+    if exist "%%~i\Inno Setup 6\iscc.exe" (
+      "%%~i\Inno Setup 6\iscc.exe" "Installer\innosetup\WinMerge%PLATFORM%.is6.iss" || pause
+    ) else (
+      if exist "%%~i\Inno Setup 5\iscc.exe" (
+        "%%~i\Inno Setup 5\iscc.exe" "Installer\innosetup\WinMerge%PLATFORM%.iss" || pause
+      )
+    )
+  )
+) else (
+  for %%i in ("%ProgramFiles(x86)%" "%ProgramFiles%") do (
+    if exist "%%~i\Inno Setup 5\iscc.exe" (
+      "%%~i\Inno Setup 5\iscc.exe" "Installer\innosetup\WinMerge%PLATFORM%.iss" || pause
+    )
   )
 )
+
 goto :eof
diff --git a/appveyor.yml b/appveyor.yml
index 29a601772..ca8f34e02 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,6 +5,8 @@ platform: x64
 shallow_clone: true
 install:
 - ps: Add-Content $ENV:UserProfile\Mercurial.ini "`r`n[extensions]`r`neol = "
+- ps: (new-object net.webclient).DownloadFile('http://www.jrsoftware.org/download.php/is.exe#innosetup-6.0.2.exe', 'innosetup-6.0.2.exe')
+- ps: innosetup-6.0.2.exe /silent /norestart
 cache: build/WinMergeDownloadDeps
 build_script:
 - cmd: >-
-- 
2.11.0