Thread: [Winmerge-svn] SF.net SVN: winmerge:[6692] trunk/Docs/Developers/readme-WIX.html
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2009-04-23 13:10:15
|
Revision: 6692 http://winmerge.svn.sourceforge.net/winmerge/?rev=6692&view=rev Author: kimmov Date: 2009-04-23 13:10:04 +0000 (Thu, 23 Apr 2009) Log Message: ----------- Docs: Fix errors in WIX installer doc as suggested by Tim. Modified Paths: -------------- trunk/Docs/Developers/readme-WIX.html Modified: trunk/Docs/Developers/readme-WIX.html =================================================================== --- trunk/Docs/Developers/readme-WIX.html 2009-04-22 19:56:13 UTC (rev 6691) +++ trunk/Docs/Developers/readme-WIX.html 2009-04-23 13:10:04 UTC (rev 6692) @@ -72,7 +72,6 @@ <code>expat</code> <ul> <li><code>libexpat.dll</code></li> - <li><code>libexpatw.dll</code></li> </ul> </li> <li> @@ -88,13 +87,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> @@ -186,8 +178,8 @@ </pre> </p> -<p>If the compile succeeds you have <code>WinMerge-[version]-Setup.exe</code> in -folder <code>/Build</code>. +<p>If the compile succeeds you have <code>WinMerge-[platform]-Setup.msi</code> +files in <code>Build\WiX\Release\</code>folder's subfolders. <p><strong>Test installer!</strong></p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-05-29 09:49:32
|
Revision: 6804 http://winmerge.svn.sourceforge.net/winmerge/?rev=6804&view=rev Author: kimmov Date: 2009-05-29 09:49:24 +0000 (Fri, 29 May 2009) Log Message: ----------- Docs: Update WiX installer doc for latest changes in installer itself and WinMerge files. Modified Paths: -------------- trunk/Docs/Developers/readme-WIX.html Modified: trunk/Docs/Developers/readme-WIX.html =================================================================== --- trunk/Docs/Developers/readme-WIX.html 2009-05-29 09:13:31 UTC (rev 6803) +++ trunk/Docs/Developers/readme-WIX.html 2009-05-29 09:49:24 UTC (rev 6804) @@ -58,10 +58,39 @@ <code>WinMerge.wxs</code>. This file includes other needed files.</p> <h3>Folder structure and files needed:</h3> +<p>First make sure you have all needed files compiled and available: +<ul> + <li>WinMerge executables: <code>WinMerge.exe</code> and <code>WinMergeU.exe</code></li> + <li>Translation library: <code>MergeLang.dll</code></li> + <li>Executable translations: <code>/Translations/WinMerge/*.po</code></li> + <li>Libraries: <code>libexpat.dll</code> and <code>pcre.dll</code></li> + <li>Manual: <code>WinMerge.chm</code></li> + <li>ShellExtension: <code>ShellExtension.dll</code>, <code>ShellExtensionU.dll</code> + and <code>ShellExtensionX64.dll</code> + <li>Documents: <code>/Docs/Users/*</code> + <li>Filters: <code>/Filters/*</code> +</ul></p> <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>In addition you will need Microsoft C- and MFC-runtime files. Those files are +not distributes with WinMerge. You get these files from Visual Studio +installation folder or can download them from internet. By default we use VS2005 +runtime files: +<ul> + <li><code>msvcr80.dll</code></li> + <li><code>msvcp80.dll</code></li> + <li><code>mfc80.dll</code></li> + <li><code>mfc80u.dll</code></li> + <li><code>Microsoft.VC80.CRT.manifest</code></li> + <li><code>Microsoft.VC80.MFC.manifest</code></li> +</ul></li> + +<h4>Folder structure</h4> + <p>Copy or move the files into the following layout:</p> <ul> @@ -75,12 +104,6 @@ </ul> </li> <li> - <code>Languages</code> - <ul> - <li><code>*.lang</code></li> - </ul> - </li> - <li> <code>Manual/htmlhelp</code> <ul> <li><code>WinMerge.chm</code></li> @@ -134,12 +157,6 @@ <li><em>Copy the entire Installer/WIX 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> @@ -153,8 +170,30 @@ </li> </ul> </li> + <li> + <code>Translations/</code> + <ul> + <li> + <code>Docs</code> + <ul> + <li><code>*.*</code></li> + </ul> + </li> + <li> + <code>WinMerge</code> + <ul> + <li><code>*.po</code></li> + </ul> + </li> + </ul> + </li> </ul> +<h4>Runtime files</h4> +<p>Runtime files 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 WIX tools to create installer</h3> <p><code>WinMerge.wxs</code> (in <code>WIX</code> folder) @@ -168,14 +207,17 @@ <pre> msbuild.exe WinMerge.wixproj </pre> -or with platform parameter: +There are two commonly used parameters: +<ul> + <li>Platform: <code>/p:Platform=x86</code> or <code>/p:Platform=x64</code></li> + <li>Version: <code>/p:ProductVersion=x.x.x</code>. If the version number + is not given it is read from <code>Config.wxi</code>. But then filename + does not contain version number.</li> +</ul> +For example: <pre> - msbuild.exe WinMerge.wixproj /p:Platform=x86 + msbuild.exe WinMerge.wixproj /p:Platform=x86,ProductVersion=1.0.2 </pre> -and to build 64-bit installer: -<pre> - msbuild.exe WinMerge.wixproj /p:Platform=x64 -</pre> </p> <p>If the compile succeeds you have <code>WinMerge-[platform]-Setup.msi</code> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-06-02 13:14:40
|
Revision: 6813 http://winmerge.svn.sourceforge.net/winmerge/?rev=6813&view=rev Author: gerundt Date: 2009-06-02 12:37:34 +0000 (Tue, 02 Jun 2009) Log Message: ----------- Docs: WiX setup don't install WinMerge.exe and ShellExtension.dll Modified Paths: -------------- trunk/Docs/Developers/readme-WIX.html Modified: trunk/Docs/Developers/readme-WIX.html =================================================================== --- trunk/Docs/Developers/readme-WIX.html 2009-06-02 12:02:22 UTC (rev 6812) +++ trunk/Docs/Developers/readme-WIX.html 2009-06-02 12:37:34 UTC (rev 6813) @@ -60,13 +60,12 @@ <h3>Folder structure and files needed:</h3> <p>First make sure you have all needed files compiled and available: <ul> - <li>WinMerge executables: <code>WinMerge.exe</code> and <code>WinMergeU.exe</code></li> + <li>WinMerge executables: <code>WinMergeU.exe</code></li> <li>Translation library: <code>MergeLang.dll</code></li> <li>Executable translations: <code>/Translations/WinMerge/*.po</code></li> <li>Libraries: <code>libexpat.dll</code> and <code>pcre.dll</code></li> <li>Manual: <code>WinMerge.chm</code></li> - <li>ShellExtension: <code>ShellExtension.dll</code>, <code>ShellExtensionU.dll</code> - and <code>ShellExtensionX64.dll</code> + <li>ShellExtension: <code>ShellExtensionU.dll</code> and <code>ShellExtensionX64.dll</code></li> <li>Documents: <code>/Docs/Users/*</code> <li>Filters: <code>/Filters/*</code> </ul></p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-06-05 06:39:29
|
Revision: 6820 http://winmerge.svn.sourceforge.net/winmerge/?rev=6820&view=rev Author: gerundt Date: 2009-06-05 06:39:27 +0000 (Fri, 05 Jun 2009) Log Message: ----------- Docs: Add note about Microsoft C- and MFC-runtime merge modules to WiX readme Modified Paths: -------------- trunk/Docs/Developers/readme-WIX.html Modified: trunk/Docs/Developers/readme-WIX.html =================================================================== --- trunk/Docs/Developers/readme-WIX.html 2009-06-04 19:31:10 UTC (rev 6819) +++ trunk/Docs/Developers/readme-WIX.html 2009-06-05 06:39:27 UTC (rev 6820) @@ -75,17 +75,14 @@ <a href="readme-manual.html">readme-manual.html</a> and <a href="Translations.html">Translations.html</a>.</p> -<p>In addition you will need Microsoft C- and MFC-runtime files. Those files are -not distributes with WinMerge. You get these files from Visual Studio -installation folder or can download them from internet. By default we use VS2005 -runtime files:</p> +<p>In addition you will need Microsoft C- and MFC-runtime <em>merge modules</em>. +Those files are not distributes with WinMerge. By default we use VS2005 +merge modules from the <code>%CommonProgramFiles%\Merge Modules</code> folder:</p> <ul> - <li><code>msvcr80.dll</code></li> - <li><code>msvcp80.dll</code></li> - <li><code>mfc80.dll</code></li> - <li><code>mfc80u.dll</code></li> - <li><code>Microsoft.VC80.CRT.manifest</code></li> - <li><code>Microsoft.VC80.MFC.manifest</code></li> + <li><code>Microsoft_VC80_CRT_x86.msm</code></li> + <li><code>Microsoft_VC80_MFC_x86.msm</code></li> + <li><code>Microsoft_VC80_CRT_x86_x64.msm</code></li> + <li><code>Microsoft_VC80_MFC_x86_x64.msm</code></li> </ul> <h4>Folder structure</h4> @@ -188,11 +185,6 @@ </li> </ul> -<h4>Runtime files</h4> -<p>Runtime files 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 WIX tools to create installer</h3> <p><code>WinMerge.wxs</code> (in <code>WIX</code> folder) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-12-21 18:28:52
|
Revision: 7046 http://winmerge.svn.sourceforge.net/winmerge/?rev=7046&view=rev Author: kimmov Date: 2009-12-21 18:28:45 +0000 (Mon, 21 Dec 2009) Log Message: ----------- Docs: Wix installer needs to be compiled in Visual Studio command prompt. Modified Paths: -------------- trunk/Docs/Developers/readme-WIX.html Modified: trunk/Docs/Developers/readme-WIX.html =================================================================== --- trunk/Docs/Developers/readme-WIX.html 2009-12-21 17:48:18 UTC (rev 7045) +++ trunk/Docs/Developers/readme-WIX.html 2009-12-21 18:28:45 UTC (rev 7046) @@ -193,7 +193,7 @@ <h4>Building with MSBuild</h4> -<p>Open the DOS prompt and CD to <code>Installer/WIX</code> -folder. Run +<p>Open the Visual Studio command prompt and CD to <code>Installer/WIX</code> -folder. Run command: <pre> msbuild.exe WinMerge.wixproj This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |