This patch removes ANSI WinMerge.exe installation from Windows versions supporting Unicode.
--- WinMerge.iss (revision 4597)
+++ WinMerge.iss (working copy)
@@ -316,7 +316,7 @@
[Files]
;The MinVersion forces Inno Setup to only copy the following file if the user is running a WinNT platform system
Source: ..\..\Build\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Components: Core
-Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags: promptifolder; Components: Core; Check: not IsWin64
+Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags: promptifolder; OnlyBelowVersion: 0, 4 Components: Core
; List of installed files
Source: ..\..\Docs\Users\Files.txt; DestDir: {app}; Flags: promptifolder; Components: Core
The patch
Logged In: YES
user_id=631874
Originator: YES
This updated patch also removes Unicode version of MFC dll.
Index: WinMerge.iss
--- WinMerge.iss (revision 4597)
+++ WinMerge.iss (working copy)
@@ -316,7 +316,7 @@
[Files]
;The MinVersion forces Inno Setup to only copy the following file if the user is running a WinNT platform system
Source: ..\..\Build\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Components: Core
-Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags: promptifolder; Components: Core; Check: not IsWin64
+Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags: promptifolder; OnlyBelowVersion: 0, 4; Components: Core
; List of installed files
Source: ..\..\Docs\Users\Files.txt; DestDir: {app}; Flags: promptifolder; Components: Core
@@ -324,7 +324,7 @@
; We still need APPHelp.dll!
; begin VC system files
-Source: ..\Runtimes\mfc71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
+Source: ..\Runtimes\mfc71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; OnlyBelowVersion: 0, 4; Components: Core
Source: ..\Runtimes\mfc71u.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; MinVersion: 0, 4; Components: Core
Source: ..\Runtimes\msvcr71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
Source: ..\Runtimes\msvcp71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
File Added: InstallOnlyUnicode_2.patch
Updated patch - includes MFC dll
Logged In: YES
user_id=631874
Originator: YES
Committed to SVN trunk.
Completed: At revision: 4598
Logged In: NO
Date: 2007-10-07 14:21
Sender: kimmov
Logged In: YES
user_id=631874
Originator: YES
This updated patch also removes Unicode version of MFC dll.
Index: WinMerge.iss
--- WinMerge.iss (revision 4597)
+++ WinMerge.iss (working copy)
@@ -316,7 +316,7 @@
[Files]
;The MinVersion forces Inno Setup to only copy the following file if the
user is running a WinNT platform system
Source: ..\..\Build\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app};
Flags: promptifolder; MinVersion: 0, 4; Components: Core
-Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags:
promptifolder; Components: Core; Check: not IsWin64
+Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags:
promptifolder; OnlyBelowVersion: 0, 4; Components: Core
; List of installed files
Source: ..\..\Docs\Users\Files.txt; DestDir: {app}; Flags: promptifolder;
Components: Core
@@ -324,7 +324,7 @@
; We still need APPHelp.dll!
; begin VC system files
-Source: ..\Runtimes\mfc71.dll; DestDir: {sys}; Flags: restartreplace
uninsneveruninstall sharedfile; Components: Core
+Source: ..\Runtimes\mfc71.dll; DestDir: {sys}; Flags: restartreplace
uninsneveruninstall sharedfile; OnlyBelowVersion: 0, 4; Components: Core
Source: ..\Runtimes\mfc71u.dll; DestDir: {sys}; Flags: restartreplace
uninsneveruninstall sharedfile; MinVersion: 0, 4; Components: Core
Source: ..\Runtimes\msvcr71.dll; DestDir: {sys}; Flags: restartreplace
uninsneveruninstall sharedfile; Components: Core
Source: ..\Runtimes\msvcp71.dll; DestDir: {sys}; Flags: restartreplace
uninsneveruninstall sharedfile; Components: Core
File Added: InstallOnlyUnicode_2.patch