From: Kimmo Varis Date: Thu, 9 Mar 2006 16:25:20 +0000 (+0000) Subject: PATCH: [ 1445719 ] Fix broken installer (2.5.3.3) X-Git-Tag: 2.16.5~5168 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2f850e0b680dcb38362b817bec303bfe596523b8;p=winmerge-jp%2Fwinmerge-jp.git PATCH: [ 1445719 ] Fix broken installer (2.5.3.3) --- diff --git a/Installer/InnoSetup/Changes.txt b/Installer/InnoSetup/Changes.txt index 24e2fe040..afc820d23 100755 --- a/Installer/InnoSetup/Changes.txt +++ b/Installer/InnoSetup/Changes.txt @@ -1,3 +1,7 @@ +2006-03-09 Kimmo + PATCH: [ 1445719 ] Fix broken installer (2.5.3.3) + InnoSetup: WinMerge.iss + 2006-02-23 Kimmo PATCH: [ 1436127 ] Add VS2003 runtimes to installer InnoSetup: WinMerge.iss diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss index 390061047..33bc7426b 100755 --- a/Installer/InnoSetup/WinMerge.iss +++ b/Installer/InnoSetup/WinMerge.iss @@ -340,10 +340,10 @@ Source: ..\Docs\Users\Files.txt; DestDir: {app}; Flags: promptifolder; Component ; We still need APPHelp.dll! ; begin VC system files -Source: Runtimes\mfc71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall regserver sharedfile; Components: Runtimes -Source: Runtimes\mfc71u.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall regserver sharedfile; MinVersion: 0, 4; Components: Runtimes +Source: Runtimes\mfc71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Runtimes +Source: Runtimes\mfc71u.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; MinVersion: 0, 4; Components: Runtimes Source: Runtimes\msvcr71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Runtimes -Source: Runtimes\msvcp71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall regserver sharedfile; Components: Runtimes +Source: Runtimes\msvcp71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Runtimes ; end VC system files Source: ..\Build\MergeRelease\ShellExtension.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 4, 0