winmerge-svn Mailing List for WinMerge (Page 14)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7269
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7269&view=rev
Author:   gerundt
Date:     2010-09-21 14:12:27 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
PATCH: [ 3070254 ] Backport InnoSetup changes to R2_12

Modified Paths:
--------------
    branches/R2_12/Docs/Developers/readme-InnoSetup.html
    branches/R2_12/Docs/Users/ChangeLog.txt
    branches/R2_12/Installer/InnoSetup/WinMerge.iss

Modified: branches/R2_12/Docs/Developers/readme-InnoSetup.html
===================================================================

--- branches/R2_12/Docs/Developers/readme-InnoSetup.html	2010-09-21 13:48:45 UTC (rev 7268)
+++ branches/R2_12/Docs/Developers/readme-InnoSetup.html	2010-09-21 14:12:27 UTC (rev 7269)
@@ -64,10 +64,25 @@
 <h3>Folder structure and files needed:</h3>
 
 <p>These files are produced by compiling WinMerge, documentation etc, but
-that's not subject of this document, refer to <a href="readme-developers.html">readme-developers.html</a>.</p>
+that's not subject of this document, refer to <a href="Compiling.html">Compiling.html</a>,
+<a href="readme-manual.html">readme-manual.html</a> and
+<a href="Translations.html">Translations.html</a>.</p>
 
-<p>Copy or move the files into the following layout:</p>
+<p>In addition you will need Microsoft C- and MFC-runtime files. Those files are
+not distributes with WinMerge. Older WinMerge installers copied those runtime
+files to WinMerge program folder. But with VS 2005 and later this has caused a
+lot of installing problems for users. So now we are embedding MS's own runtime
+installer executable to our installer. This makes the installer executable
+considerable bigger but seems to be the only reliable way to install those
+runtime files.</p>
 
+<p>You can download the latest VC2008 runtimes installer from MS:
+<a href="http://www.microsoft.com/downloads/en/details.aspx?FamilyID=2051A0C1-C9B5-4B0A-A8F5-770A549FD78C">
+http://www.microsoft.com/downloads/en/details.aspx?FamilyID=2051A0C1-C9B5-4B0A-A8F5-770A549FD78C</a><p>
+
+<h4>Folder structure</h4>
+<p>Copy or move the WinMerge files into the following layout (not runtimes):</p>
+
 <ul>
  <li>
   <code>Build/</code>
@@ -76,7 +91,6 @@
      <code>expat</code>
      <ul>
       <li><code>libexpat.dll</code></li>
-      <li><code>libexpatw.dll</code></li>
      </ul>
     </li>
     <li>
@@ -92,13 +106,6 @@
      </ul>
     </li>
    <li>
-    <code>MergeRelease/</code>
-    <ul>
-     <li><code>ShellExtension.dll</code></li>
-     <li><code>WinMerge.exe</code></li>
-    </ul>
-   </li>
-   <li>
     <code>MergeUnicodeRelease/</code>
     <ul>
      <li><code>ShellExtensionU.dll</code></li>
@@ -146,12 +153,6 @@
       <li><em>Copy the entire Installer/InnoSetup folder to here</em></li>
      </ul>
    </li>
-   <li>
-    <code>Runtimes/</code>
-     <ul>
-      <li><em>Copy the entire Installer/Runtimes folder to here</em></li>
-     </ul>
-    </li>
   </ul>
  </li>
  <li>
@@ -175,6 +176,11 @@
 </pre>
 <p>from <code>WinMerge.iss</code></p>
 
+<h4>Runtime files installer</h4>
+<p>Runtime files installer must be copied to the <code>Runtimes</code>-folder in same level
+than WinMerge source tree folder is. Not <i>inside</i> source tree but
+<i>outside</i> of the source tree.</p>
+
 <h3>Running Inno Setup to create installer</h3>
 
 <p><code>WinMerge.iss</code> (in <code>InnoSetup</code> folder)

Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt	2010-09-21 13:48:45 UTC (rev 7268)
+++ branches/R2_12/Docs/Users/ChangeLog.txt	2010-09-21 14:12:27 UTC (rev 7269)
@@ -8,6 +8,8 @@
   Fix help locations (#2988974)
   New translation: Persian (#2877121, #3065119)
   New translation: Serbian (#3017674, #3065119)
+  Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime
+    libraries installer (#3070254)
   Bugfix: WinMerge was vulnerable to DLL hijacking as described in
     Microsoft Security Advisory (2269637)  (#33056008)
   Translation updates:

Modified: branches/R2_12/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_12/Installer/InnoSetup/WinMerge.iss	2010-09-21 13:48:45 UTC (rev 7268)
+++ branches/R2_12/Installer/InnoSetup/WinMerge.iss	2010-09-21 14:12:27 UTC (rev 7269)
@@ -2,7 +2,7 @@
 ; $Id$
 ;
 ;           Programmed by:  Christian Blackburn, Christian List, Kimmo Varis,
-;                 Purpose:  The is the Inno Setup installation script for distributing our WinmMerge application.
+;                 Purpose:  The is the Inno Setup installation script for distributing our WinMerge application.
 ; Tools Needed To Compile:  Inno Setup 5.1.7+ (http://www.jrsoftware.org/isdl.php), Inno Setup QuickStart Pack 5.1.7+(http://www.jrsoftware.org/isdl.php)
 ;                           note: the versions of Inno Setup and the QuickStart Pack should be identical to ensure proper function
 ;Directly Dependant Files:  Because this is an installer. It would be difficult to list and maintain each of the files referenced
@@ -48,6 +48,11 @@
 #define AppVersion GetFileVersion(SourcePath + "\..\..\Build\MergeUnicodeRelease\WinMergeU.exe")
 #define FriendlyAppVersion Copy(GetFileVersion(SourcePath + "\..\..\Build\MergeUnicodeRelease\WinMergeU.exe"), 1, 5)
 
+; Runtime files installers
+#define RuntimesX86Installer "..\..\..\Runtimes\vcredist_x86.exe"
+#define RuntimesX64Installer "..\..\..\Runtimes\vcredist_x64.exe"
+
+
 [Setup]
 AppName=WinMerge
 AppVersion={#AppVersion}
@@ -80,6 +85,9 @@
 ;This must be admin to install C++ Runtimes and shell extension
 PrivilegesRequired=admin
 
+;Windows 2000 or later required
+MinVersion=0,5.0
+
 UninstallDisplayIcon={app}\{code:ExeName}
 
 ;Artwork References
@@ -353,24 +361,18 @@
 
 
 [Files]
-; Select the proper executable for different Windows versions
-; For Windows 05/98/ME ANSI executable is installed (WinMerge.exe)
-; For Windows NT4/2000/XP/2003/Vista the Unicode executable is installed (WinMergeU.exe)
-Source: ..\..\Build\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Components: Core
-Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags: promptifolder; OnlyBelowVersion: 0, 4; Components: Core
+; WinMerge itself
+Source: ..\..\Build\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app}; Flags: promptifolder; Components: Core
 
 ; List of installed files
 Source: ..\..\Docs\Users\Files.txt; DestDir: {app}; Flags: promptifolder; Components: Core
 
-; Microsoft runtime libraries (C-runtime, MFC)
-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
+; Microsoft runtime libraries installer (C-runtimes, MFC)
+Source: {#RuntimesX86Installer}; DestDir: {tmp}; Flags: ignoreversion; Components: Core; AfterInstall: RuntimesInstaller
+Source: {#RuntimesX64Installer}; DestDir: {tmp}; Flags: ignoreversion; Components: Core; Check: IsWin64; AfterInstall: RuntimesX64Installer
 
 ; Shell extension
-Source: ..\..\Build\MergeRelease\ShellExtension.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 4, 0; Check: not IsWin64
-Source: ..\..\Build\MergeUnicodeRelease\ShellExtensionU.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 0, 4; Check: not IsWin64
+Source: ..\..\Build\MergeUnicodeRelease\ShellExtensionU.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; Check: not IsWin64
 ; 64-bit version of ShellExtension
 Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
 
@@ -513,6 +515,7 @@
 Root: HKCR; SubKey: Directory\Shell\WinMerge; ValueType: none; Flags: deletekey noerror
 
 ;Adds "Start Menu" --> "Run" Support for WinMerge
+;TODO: Deinstall WinMerge.exe paths?
 Root: HKLM; Subkey: Software\Microsoft\Windows\CurrentVersion\App Paths\WinMerge.exe; ValueType: none; Flags: uninsdeletekey
 Root: HKLM; Subkey: Software\Microsoft\Windows\CurrentVersion\App Paths\WinMergeU.exe; ValueType: none; Flags: uninsdeletekey
 Root: HKLM; SubKey: SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\WinMerge.exe; ValueType: string; ValueName: ; ValueData: {app}\{code:ExeName}
@@ -596,6 +599,29 @@
 
 
 [Code]
+
+{Runs the runtime file installer}
+{Command line used is documented in:
+http://blogs.msdn.com/astebner/archive/2007/02/07/update-regarding-silent-install-of-the-vc-8-0-runtime-vcredist-packages.aspx
+}
+procedure RuntimesInstaller();
+var
+    ResultCode: Integer;
+begin
+    Exec(ExpandConstant('{tmp}\vcredist_x86.exe'), '/q:a /c:"VCREDI~3.EXE /q:a /c:""msiexec /i vcredist.msi /qn"" "', '', SW_SHOW, ewWaitUntilTerminated, ResultCode)
+end;
+
+{Runs the runtime file installer for X64}
+{Command line used is documented in:
+http://blogs.msdn.com/astebner/archive/2007/02/07/update-regarding-silent-install-of-the-vc-8-0-runtime-vcredist-packages.aspx
+}
+procedure RuntimesX64Installer();
+var
+    ResultCode: Integer;
+begin
+    Exec(ExpandConstant('{tmp}\vcredist_x64.exe'), '/q:a /c:"VCREDI~2.EXE /q:a /c:""msiexec /i vcredist.msi /qn"" "', '', SW_SHOW, ewWaitUntilTerminated, ResultCode)
+end;
+
 {Determines whether or not the user chose to create a start menu}
 Function GroupCreated(): boolean;
 Var
@@ -629,11 +655,7 @@
 {Returns the appropriate name of the .EXE being installed}
 Function ExeName(Unused: string): string;
 Begin
-
-  If UsingWinNT() = True Then
-	 Result := 'WinMergeU.exe'
-  Else
-    Result := 'WinMerge.exe';
+  Result := 'WinMergeU.exe';
 End;
 
 Function FixVersion(strInput: string): string;
@@ -767,7 +789,7 @@
 
       {Stops analyzing the version number since we already know it's inadequate and returns False (inadequate)}
       exit;
-    end
+    end;
 
 
   {Starts detecting the Minor version of the Version Installed}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (148)	Oct (84)	Nov (130)	Dec (121)
2007	Jan (89)	Feb (50)	Mar (81)	Apr (45)	May (42)	Jun (46)	Jul (40)	Aug (98)	Sep (80)	Oct (101)	Nov (128)	Dec (46)
2008	Jan (132)	Feb (117)	Mar (118)	Apr (112)	May (69)	Jun (140)	Jul (164)	Aug (159)	Sep (115)	Oct (65)	Nov (80)	Dec (128)
2009	Jan (145)	Feb (97)	Mar (118)	Apr (87)	May (96)	Jun (83)	Jul (50)	Aug (42)	Sep (18)	Oct (32)	Nov (12)	Dec (35)
2010	Jan (38)	Feb (8)	Mar (5)	Apr (19)	May (23)	Jun (39)	Jul (16)	Aug (4)	Sep (60)	Oct (100)	Nov (57)	Dec (43)
2011	Jan (25)	Feb (1)	Mar (3)	Apr	May (13)	Jun (19)	Jul	Aug (6)	Sep (5)	Oct (6)	Nov	Dec (1)
2012	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (2)	Dec
2013	Jan	Feb	Mar (19)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2019	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec

winmerge-svn Mailing List for WinMerge (Page 14)

Windows visual diff and merge for files and directories

winmerge-svn — Subscribe to this list if you wish to receive notifications from Subversion