OSDN Git Service

Add ARM64 support (2)
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 3 Apr 2021 12:33:50 +0000 (21:33 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 3 Apr 2021 12:33:50 +0000 (21:33 +0900)
Installer/InnoSetup/WinMergeARM64.is6.iss

index bfc93cc..96e3041 100644 (file)
@@ -679,16 +679,16 @@ Filename: {app}\WinMergeU.exe; Description: {cm:LaunchProgram,WinMerge}; Flags:
 ;Filename: {syswow64}\regsvr32.exe; Parameters: "/s /n /i:user ""{app}\ShellExtensionU.dll"""; Flags: waituntilidle; Check: not IsAdminInstallMode; Components: ShellExtension32bit
 Filename: {sys}\regsvr32.exe; Parameters: "/s ""{app}\ShellExtensionARM64.dll"""; Flags: waituntilidle; Check: IsAdminInstallMode
 Filename: {sys}\regsvr32.exe; Parameters: "/s /n /i:user ""{app}\ShellExtensionARM64.dll"""; Flags: waituntilidle; Check: not IsAdminInstallMode
-Filename: {app}\WinMerge32BitPluginProxy.exe; Parameters: "/RegServer"; Flags: waituntilidle; Check: IsAdminInstallMode
-Filename: {app}\WinMerge32BitPluginProxy.exe; Parameters: "/RegServerPerUser"; Flags: waituntilidle; Check: not IsAdminInstallMode
+;Filename: {app}\WinMerge32BitPluginProxy.exe; Parameters: "/RegServer"; Flags: waituntilidle; Check: IsAdminInstallMode
+;Filename: {app}\WinMerge32BitPluginProxy.exe; Parameters: "/RegServerPerUser"; Flags: waituntilidle; Check: not IsAdminInstallMode
 
 [UninstallRun]
 ;Filename: {syswow64}\regsvr32.exe; Parameters: "/s /u ""{app}\ShellExtensionU.dll"""; Flags: waituntilidle; Check: IsAdminInstallMode; Components: ShellExtension32bit
 ;Filename: {syswow64}\regsvr32.exe; Parameters: "/s /u /n /i:user ""{app}\ShellExtensionU.dll"""; Flags: waituntilidle; Check: not IsAdminInstallMode; Components: ShellExtension32bit
 Filename: {sys}\regsvr32.exe; Parameters: "/s /u ""{app}\ShellExtensionARM64.dll"""; Flags: waituntilidle; Check: IsAdminInstallMode
 Filename: {sys}\regsvr32.exe; Parameters: "/s /u /n /i:user ""{app}\ShellExtensionARM64.dll"""; Flags: waituntilidle; Check: not IsAdminInstallMode
-Filename: {app}\WinMerge32BitPluginProxy.exe; Parameters: "/UnregServer"; Flags: waituntilidle; Check: IsAdminInstallMode
-Filename: {app}\WinMerge32BitPluginProxy.exe; Parameters: "/UnregServerPerUser"; Flags: waituntilidle; Check: not IsAdminInstallMode
+;Filename: {app}\WinMerge32BitPluginProxy.exe; Parameters: "/UnregServer"; Flags: waituntilidle; Check: IsAdminInstallMode
+;Filename: {app}\WinMerge32BitPluginProxy.exe; Parameters: "/UnregServerPerUser"; Flags: waituntilidle; Check: not IsAdminInstallMode
 
 
 [UninstallDelete]