X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=BuildInstaller.cmd;h=ed4da192290c1a7b773926e2b8e4ebac74778dde;hb=refs%2Ftags%2Fv2.16.13;hp=a931a5ac02c895c81759a7c2efc375f3c226e5ca;hpb=52b5daa4c3eb6051e577994ec36717328a008ef8;p=winmerge-jp%2Fwinmerge-jp.git

diff --git a/BuildInstaller.cmd b/BuildInstaller.cmd
index a931a5ac0..ed4da1922 100644
--- a/BuildInstaller.cmd
+++ b/BuildInstaller.cmd
@@ -1,6 +1,13 @@
 if "%1" == "" (
   call :BuildInstaller
   call :BuildInstaller x64
+  call :BuildInstaller x64NonAdmin
+  call :BuildInstaller ARM64
+) else if "%1" == "x64" (
+  call :BuildInstaller x64
+  call :BuildInstaller x64NonAdmin
+) else if "%1" == "ARM64" (
+  call :BuildInstaller ARM64
 ) else (
   call :BuildInstaller %1 
 )
@@ -9,20 +16,27 @@ goto :eof
 :BuildInstaller
 set PLATFORM=%1
 
-if "%PLATFORM%" == "x64" (
-  for %%i in ("%ProgramFiles(x86)%" "%ProgramFiles%") do (
+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
     )
   )
 )