Merge remote-tracking branch 'upstream/master' into jp

[winmerge-jp/winmerge-jp.git] / BuildInstaller.cmd

diff --git a/BuildInstaller.cmd b/BuildInstaller.cmd
index e0ac4bf..cc78bde 100644 (file)
--- a/BuildInstaller.cmd
+++ b/BuildInstaller.cmd
@@ -1,17 +1,48 @@
 if "%1" == "" (
-  call :BuildInstaller
+  call :BuildInstaller x86
   call :BuildInstaller x64
+  call :BuildInstaller x64NonAdmin
+  call :BuildInstaller ARM64
+) else if "%1" == "x64" (
+  call :BuildInstaller x64
+  call :BuildInstaller x64NonAdmin
+) else if "%1" == "x86" (
+  call :BuildInstaller x86
+) else if "%1" == "ARM64" (
+  call :BuildInstaller ARM64
+) else if "%1" == "ARM" (
+  echo platform %1 is not supported
 ) else (
-  call :BuildInstaller %1 
+  call :BuildInstaller %1
 )
 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%" == "ARM64" (
+  for %%i in ("%LOCALAPPDATA%\Programs" "%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
+      goto :eof
+    ) else (
+      if exist "%%~i\Inno Setup 5\iscc.exe" (
+        "%%~i\Inno Setup 5\iscc.exe" "Installer\innosetup\WinMerge%PLATFORM%.iss" || pause
+        goto :eof
+      )
+    )
+  )
+) else (
+  echo.
+  echo ============================================================
+  echo Build WinMerge%PLATFORM%.iss with Inno Setup 5
+  echo ============================================================
+  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
+    )
   )
 )
+
 goto :eof