[Winmerge-svn] SF.net SVN: winmerge:[7257] trunk/Docs

[<ki...@us...>]

Revision: 7257
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7257&view=rev
Author:   kimmov
Date:     2010-09-13 18:41:22 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
Docs: Updates for dropping ANSI targets and using VS2008.

Modified Paths:
--------------
    trunk/Docs/Developers/Compiling.html
    trunk/Docs/Developers/Releasing.html
    trunk/Docs/Developers/readme-InnoSetup.html
    trunk/Docs/Developers/readme-WIX.html
    trunk/Docs/Users/Files.txt

Modified: trunk/Docs/Developers/Compiling.html
===================================================================
--- trunk/Docs/Developers/Compiling.html	2010-09-13 18:27:49 UTC (rev 7256)
+++ trunk/Docs/Developers/Compiling.html	2010-09-13 18:41:22 UTC (rev 7257)
@@ -78,8 +78,9 @@
 <ul>
   <li>Visual Studio 2003.Net + Service Pack 1</li>
   <li>Visual Studio 2005 (occasional checks for compiling) (Service Pack 1
-    recommended) [<i>used for releases</i>]</li>
-  <li>Visual Studio 2008 (Service Pack 1 recommended)</li>
+    recommended)</li>
+  <li>Visual Studio 2008 (Service Pack 1 recommended)  [<i>used for releases</i>]</li>
+  <li>Visual Studio 2010</li>
 </ul>
 
 <h4>Libraries</h4>
@@ -87,7 +88,7 @@
 All are in the source tree (in <code>/Externals</code> -folder), and need to be
 compiled before compiling WinMerge executable.</p>
 
-<p class="note"><b>Visual Studio 2005 and later:</b> You'll need to convert
+<p class="note"><b>Visual Studio 2008 and later:</b> You'll need to convert
 library workspace and project files to new format before compiling.</p>
 
 <p> To convert workspace/project files, just open them into Visual Studio and
@@ -137,7 +138,7 @@
 ShellExtension (in <code>/ShellExtension</code>) have their own project files. There is no one
 single project/workspace file to compile all projects.<p>
 
-<p>The Visual Studio project and solution files for VS2003 come with the
+<p>The Visual Studio project and solution files for VS2005 come with the
 WinMerge sources. Newer versions of Visual Studio can open that file too, they
 just ask if one wants to convert to the new version. The reason we don't ship
 project files for all Visual Studio versions is we have no resources
@@ -158,7 +159,7 @@
 <p>expat is in <code>/Externals/expat</code> folder in source tree. To compile expat:</p>
 <ul>
   <li>Open Visual Studio solution <code>/Externals/expat/expat.sln</code>. If you are
-    using Visual Studio 2005 or later you need to convert the file to the new format when
+    using Visual Studio 2008 or later you need to convert the file to the new format when
     Visual Studio opens the file.</li>
   <li>Select from Visual Studio menu Build / Batch Build</li>
   <li>Select either debug or release targets.</li>
@@ -172,7 +173,7 @@
 <p>scew is in <code>/Externals/scew</code> folder in source tree. To compile scew:</p>
 <ul>
   <li>Open Visual Studio project file <code>/Externals/scew/win32/scew.vcproj</code> If you are
-    using Visual Studio 2005 or later you need to convert the file to the new format when
+    using Visual Studio 2008 or later you need to convert the file to the new format when
     Visual Studio opens the file.</li>
   <li>Select from Visual Studio menu Build / Batch Build</li>
   <li>Make sure all targets are selected</li>
@@ -187,7 +188,7 @@
 <p>To compile PCRE:</p>
 <ul>
   <li>Open Visual Studio solution file <code>/Externals/pcre/Win32/pcre.sln</code> If you are
-    using Visual Studio 2005 or later you need to convert the file to the new format when
+    using Visual Studio 2008 or later you need to convert the file to the new format when
     Visual Studio opens the file.</li>
   <li>Select the <code>MinSizeRel</code>-target.</li>
   <li>Build the <code>pcre</code>-project
@@ -219,9 +220,7 @@
 <p>There are several targets available for compiling different projects. Targets used
 for compiling releases are:<br>
 <ul>
-  <li><code>WinMerge.exe</code> : Release</li>
   <li><code>WinMergeU.exe</code> : UnicodeRelease</li>
-  <li><code>ShellExtension.dll</code> : Release MinDependency</li>
   <li><code>ShellExtensionU.dll</code> : Unicode Release MinDependency</li>
   <li>Plugin dlls : Unicode Release MinDependency</li>
 </ul>

Modified: trunk/Docs/Developers/Releasing.html
===================================================================
--- trunk/Docs/Developers/Releasing.html	2010-09-13 18:27:49 UTC (rev 7256)
+++ trunk/Docs/Developers/Releasing.html	2010-09-13 18:41:22 UTC (rev 7257)
@@ -163,8 +163,8 @@
    -script)</li>
   <li>updates POT and PO files</li>
   <li>builds libraries (expat, scew, pcre)</li>
-  <li>builds WinMerge.exe and WinMergeU.exe</li>
-  <li>builds 32-bit ShellExtension targets</li>
+  <li>builds WinMergeU.exe</li>
+  <li>builds 32-bit ShellExtension target</li>
   <li>builds user manual</li>
   <li>builds the InnoSetup installer</li>
   <li>creates per-version distribution folder</li>

Modified: trunk/Docs/Developers/readme-InnoSetup.html
===================================================================
--- trunk/Docs/Developers/readme-InnoSetup.html	2010-09-13 18:27:49 UTC (rev 7256)
+++ trunk/Docs/Developers/readme-InnoSetup.html	2010-09-13 18:41:22 UTC (rev 7257)
@@ -119,13 +119,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>

Modified: trunk/Docs/Developers/readme-WIX.html
===================================================================
--- trunk/Docs/Developers/readme-WIX.html	2010-09-13 18:27:49 UTC (rev 7256)
+++ trunk/Docs/Developers/readme-WIX.html	2010-09-13 18:41:22 UTC (rev 7257)
@@ -76,13 +76,13 @@
 <a href="Translations.html">Translations.html</a>.</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
+Those files are not distributes with WinMerge. By default we use VS2008
 merge modules from the <code>%CommonProgramFiles%\Merge Modules</code> folder:</p>
 <ul>
-  <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>
+  <li><code>Microsoft_VC90_CRT_x86.msm</code></li>
+  <li><code>Microsoft_VC90_MFC_x86.msm</code></li>
+  <li><code>Microsoft_VC90_CRT_x86_x64.msm</code></li>
+  <li><code>Microsoft_VC90_MFC_x86_x64.msm</code></li>
 </ul>
 
 <h4>Folder structure</h4>

Modified: trunk/Docs/Users/Files.txt
===================================================================
--- trunk/Docs/Users/Files.txt	2010-09-13 18:27:49 UTC (rev 7256)
+++ trunk/Docs/Users/Files.txt	2010-09-13 18:41:22 UTC (rev 7257)
@@ -12,11 +12,9 @@
 pcre.dll               - library file for regular expressions
 ReadMe.txt             - Important information about WinMerge
 Register.bat           - batch file for installing ShellExtension to system
-ShellExtension.dll     - ansi version of Shell integrarion dll
 ShellExtensionU.dll    - Unicode version of Shell integration dll
 ShellExtensionX64.dll  - 64-bit version of Shell integration dll
 UnRegister.bat         - batch file to uninstalling ShellExtension from system
-WinMerge.exe           - ANSI version of WinMerge
 WinMergeU.exe          - Unicode version of WinMerge
 
 Docs folder:


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