[Winmerge-svn] SF.net SVN: winmerge: [4107] trunk/Docs/Developers
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ge...@us...> - 2007-02-12 22:23:24
|
Revision: 4107 http://svn.sourceforge.net/winmerge/?rev=4107&view=rev Author: gerundt Date: 2007-02-12 14:23:19 -0800 (Mon, 12 Feb 2007) Log Message: ----------- PATCH: [ 1658383 ] Use Verdana font in dev docs Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/Options.html trunk/Docs/Developers/Plugins.html trunk/Docs/Developers/readme-InnoSetup.html trunk/Docs/Developers/readme-Subversion.html trunk/Docs/Developers/readme-developers-MakePatchDirs.html trunk/Docs/Developers/readme-developers-Merge7zInstaller.html trunk/Docs/Developers/readme-developers.html trunk/Docs/Developers/readme-manual.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2007-02-12 22:20:32 UTC (rev 4106) +++ trunk/Docs/Developers/Changes.txt 2007-02-12 22:23:19 UTC (rev 4107) @@ -1,6 +1,8 @@ 2007-02-12 Tim PATCH: [ 1658347 ] Add note about PSDK paths and VC into dev-readme Developers: readme-developers.html + PATCH: [ 1658383 ] Use Verdana font in dev docs + Developers: *.html 2006-12-04 Kimmo Update SVN URLs Modified: trunk/Docs/Developers/Options.html =================================================================== --- trunk/Docs/Developers/Options.html 2007-02-12 22:20:32 UTC (rev 4106) +++ trunk/Docs/Developers/Options.html 2007-02-12 22:23:19 UTC (rev 4107) @@ -6,11 +6,26 @@ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <style type="text/css"> <!-- + body { + font-family: Verdana,Helvetica,Arial,sans-serif; + font-size: small; + } + code,pre { + font-family: "Courier New",Courier,monospace; + font-size: 1em; + } h3 { padding: 2px; border-left: 4px solid #FFCC00; border-bottom: 1px solid #FFCC00; } + pre { + margin-left: 25px; + margin-right: 25px; + padding: 5px; + background-color: #EEEEEE; + border: 1px solid black; + } --> </style> </head> Modified: trunk/Docs/Developers/Plugins.html =================================================================== --- trunk/Docs/Developers/Plugins.html 2007-02-12 22:20:32 UTC (rev 4106) +++ trunk/Docs/Developers/Plugins.html 2007-02-12 22:23:19 UTC (rev 4107) @@ -6,6 +6,14 @@ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <style type="text/css"> <!-- + body { + font-family: Verdana,Helvetica,Arial,sans-serif; + font-size: small; + } + code,pre { + font-family: "Courier New",Courier,monospace; + font-size: 1em; + } h3 { padding: 2px; border-left: 4px solid #FFCC00; @@ -322,22 +330,20 @@ <th>Functions parameters</th> </tr> <tr> - <th>VC++</th> + <th rowspan="2">VC++</th> <td><code>STDMETHOD(UnpackFile)</code></td> <td><code>([in] BSTR fileSrc, [in] BSTR fileDst, VARIANT_BOOL * pbChanged, INT * pSubcode, [out, retval] VARIANT_BOOL * pbSuccess)</code></td> </tr> <tr> - <th></th> <td><code>STDMETHOD(PackFile)</code></td> <td><code>([in] BSTR fileSrc, [in] BSTR fileDst, VARIANT_BOOL * pbChanged, INT pSubcode, [out, retval] VARIANT_BOOL * pbSuccess)</code></td> </tr> <tr> - <th>VB</th> + <th rowspan="2">VB</th> <td><code>Public Function UnpackFile</code></td> <td><code>(BSTR fileSrc, BSTR fileDst, ByRef bChanged As Boolean, ByRef subcode As Long) As Boolean</code></td> </tr> <tr> - <th></th> <td><code>Public Function PackFile</code></td> <td><code>(BSTR fileSrc, BSTR fileDst, ByRef bChanged As Boolean, subcode As Long) As Boolean</code></td> </tr> @@ -351,22 +357,20 @@ <th>Functions parameters</th> </tr> <tr> - <th>VC++</th> + <th rowspan="2">VC++</th> <td><code>STDMETHOD(UnpackBufferA)</code></td> <td><code>([in] SAFEARRAY ** pBuffer, [in] INT * pSize, [in] VARIANT_BOOL * pbChanged, [in] INT * pSubcode, [out, retval] VARIANT_BOOL * pbSuccess)</code></td> </tr> <tr> - <th></th> <td><code>STDMETHOD(PackBufferA)</code></td> <td><code>([in] SAFEARRAY ** pBuffer, [in] INT * pSize, [in] VARIANT_BOOL * pbChanged, [in] INT subcode, [out, retval] VARIANT_BOOL * pbSuccess)</code></td> </tr> <tr> - <th>VB</th> + <th rowspan="2">VB</th> <td><code>Public Function UnpackBufferA</code></td> <td><code>(ByRef buffer() As Byte, ByRef size As Long, ByRef bChanged As Boolean, ByRef subcode As Long) As Boolean</code></td> </tr> <tr> - <th></th> <td><code>Public Function PackBufferA</code></td> <td><code>(ByRef buffer() As Byte, ByRef size As Long, ByRef bChanged As Boolean, subcode As Long) As Boolean</code></td> </tr> Modified: trunk/Docs/Developers/readme-InnoSetup.html =================================================================== --- trunk/Docs/Developers/readme-InnoSetup.html 2007-02-12 22:20:32 UTC (rev 4106) +++ trunk/Docs/Developers/readme-InnoSetup.html 2007-02-12 22:23:19 UTC (rev 4107) @@ -6,6 +6,14 @@ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <style type="text/css"> <!-- + body { + font-family: Verdana,Helvetica,Arial,sans-serif; + font-size: small; + } + code,pre { + font-family: "Courier New",Courier,monospace; + font-size: 1em; + } h3 { padding: 2px; border-left: 4px solid #FFCC00; @@ -134,11 +142,11 @@ <p><strong>NOTE</strong><br> If you don't need or can't compile <code>ShellExtensionX64.dll</code> component, -comment or remove line:<pre> -; 64-bit version of ShellExtension +comment or remove line:</p> +<pre>; 64-bit version of ShellExtension Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; [...] </pre> -from <code>WinMerge.iss</code></p> +<p>from <code>WinMerge.iss</code></p> <h3>Running Inno Setup to create installer</h3> Modified: trunk/Docs/Developers/readme-Subversion.html =================================================================== --- trunk/Docs/Developers/readme-Subversion.html 2007-02-12 22:20:32 UTC (rev 4106) +++ trunk/Docs/Developers/readme-Subversion.html 2007-02-12 22:23:19 UTC (rev 4107) @@ -6,11 +6,24 @@ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <style type="text/css"> <!-- + body { + font-family: Verdana,Helvetica,Arial,sans-serif; + font-size: small; + } + code,pre { + font-family: "Courier New",Courier,monospace; + font-size: 1em; + } h3 { padding: 2px; border-left: 4px solid #FFCC00; border-bottom: 1px solid #FFCC00; } + h4 { + padding: 2px; + border-left: 8px solid #FF9933; + border-bottom: 1px solid #FF9933; + } --> </style> </head> @@ -52,7 +65,7 @@ <h3>Subversion documentation</h3> <p><a href="http://svnbook.red-bean.com/">The Subversion Book</a> is the definite guide to Subversion. Please try to find some time to look at it. There are also many Subversion and SVN resources available -in the net. Just listing couple of them here: +in the net. Just listing couple of them here:</p> <ul> <li> <a href="http://http://en.wikipedia.org/wiki/Subversion_(software)/">Wikipedia article</a> about @@ -64,8 +77,6 @@ </li> </ul> -</p> - <h3>Repository URLs</h3> <p>WinMerge Subversion repository URL is:<br> <code>https://winmerge.svn.sourceforge.net/svnroot/winmerge</code> @@ -76,13 +87,12 @@ </p> <p>Branches are in separate folder:<br> <code>https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches</code><br> -Current branches are: +Current branches are:</p> <ul> <li>2.6 release branch<br> <code>https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_6</code></li> </ul> -Old branches (2.0 - 2.4 releases) are in CVS repository. -</p> +<p>Old branches (2.0 - 2.4 releases) are in CVS repository.</p> <h3>Quick intro to using TortoiseSVN</h3> <h4>Checkout</h4> Modified: trunk/Docs/Developers/readme-developers-MakePatchDirs.html =================================================================== --- trunk/Docs/Developers/readme-developers-MakePatchDirs.html 2007-02-12 22:20:32 UTC (rev 4106) +++ trunk/Docs/Developers/readme-developers-MakePatchDirs.html 2007-02-12 22:23:19 UTC (rev 4107) @@ -6,6 +6,14 @@ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <style type="text/css"> <!-- + body { + font-family: Verdana,Helvetica,Arial,sans-serif; + font-size: small; + } + code,pre { + font-family: "Courier New",Courier,monospace; + font-size: 1em; + } h3 { padding: 2px; border-left: 4px solid #FFCC00; Modified: trunk/Docs/Developers/readme-developers-Merge7zInstaller.html =================================================================== --- trunk/Docs/Developers/readme-developers-Merge7zInstaller.html 2007-02-12 22:20:32 UTC (rev 4106) +++ trunk/Docs/Developers/readme-developers-Merge7zInstaller.html 2007-02-12 22:23:19 UTC (rev 4107) @@ -6,6 +6,14 @@ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <style type="text/css"> <!-- + body { + font-family: Verdana,Helvetica,Arial,sans-serif; + font-size: small; + } + code,pre { + font-family: "Courier New",Courier,monospace; + font-size: 1em; + } h3 { padding: 2px; border-left: 4px solid #FFCC00; Modified: trunk/Docs/Developers/readme-developers.html =================================================================== --- trunk/Docs/Developers/readme-developers.html 2007-02-12 22:20:32 UTC (rev 4106) +++ trunk/Docs/Developers/readme-developers.html 2007-02-12 22:23:19 UTC (rev 4107) @@ -6,6 +6,14 @@ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <style type="text/css"> <!-- + body { + font-family: Verdana,Helvetica,Arial,sans-serif; + font-size: small; + } + code,pre { + font-family: "Courier New",Courier,monospace; + font-size: 1em; + } h3 { padding: 2px; border-left: 4px solid #FFCC00; @@ -16,6 +24,9 @@ border-left: 8px solid #FF9933; border-bottom: 1px solid #FF9933; } + h5 { + font-size: small; + } pre { margin-left: 25px; margin-right: 25px; @@ -89,19 +100,19 @@ <li>Manual needs Docbook tools, documented in <a href="readme-manual.html">readme-manual.html</a></li> </ul> -<p>Platform SDK components<br> -With Feb 2003 Platform SDK (and VC6) following components are needed: +<h5>Platform SDK components</h5> +<p>With Feb 2003 Platform SDK (and VC6) following components are needed:</p> <ul> <li>Core SDK - obviously..</li> <li>MDAC SDK - for some ODBC etc headers needed by other PSDK headers..</li> <li>Internet Devlopment SDK - for IE/Shell headers</li> </ul> -Basically same components are needed for Windows 2003 SP1 PSDK, but with a different name: +<p>Basically same components are needed for Windows 2003 SP1 PSDK, but with a different name:</p> <ul> <li>Microsoft Windows Core SDK - obviously..</li> <li>Microsoft Data Access Services (MDAC) SDK - for some ODBC etc headers needed by other PSDK headers..</li> <li>Microsoft Web Workshop (IE) SDK - for IE/Shell headers</li> -</ul></p> +</ul> <p class="note">If you installed PSDK separately, don't forget to add the PSDK paths to Visual Studio's <em>Include</em> and <em>Library</em> directories. The easiest way is to use the "<em>Visual Studio Registration\Register PSDK directories with Visual Studio</em>" item from @@ -129,7 +140,7 @@ things.</p> <h4>Compiling expat</h4> -<p>expat is in <code>/Externals/expat</code> folder in source tree. To compile expat:<br> +<p>expat is in <code>/Externals/expat</code> folder in source tree. To compile expat:</p> <ul> <li>Open Visual Studio workspace <code>/Externals/expat/expat.dsw</code>. If you are using Visual Studio 2003.Net or later you need to convert the file to new format when @@ -137,13 +148,13 @@ <li>Select from Visual Studio menu Build / Batch Build</li> <li>Select either debug or release targets.</li> <li>Select Rebuild All</li> - </ul></p> + </ul> <p>After build finishes, selected (debug or release) lib and dll files are in <code>/Build/expat</code>. WinMerge executable's project file picks them from there.</p> <h4>Compiling scew</h4> -<p>scew is in <code>/Externals/scew</code> folder in source tree. To compile scew:<br> +<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.dsp</code> If you are using Visual Studio 2003.Net or later you need to convert the file to new format when @@ -151,10 +162,10 @@ <li>Select from Visual Studio menu Build / Batch Build</li> <li>Make sure all targets are selected</li> <li>Select Rebuild All</li> -</ul></p> +</ul> <h4>Compiling PCRE</h4> -<p>PCRE is in <code>/Externals/pcre</code> folder in source tree. To compile PCRE:<br> +<p>PCRE is in <code>/Externals/pcre</code> folder in source tree. To compile PCRE:</p> <ul> <li>Open Visual Studio workspace file <code>/Externals/pcre/pcre.dsp</code> If you are using Visual Studio 2003.Net or later you need to convert the file to new format when @@ -164,7 +175,7 @@ <li>Select Rebuild All</li> <li><i>Or</i> you can also compile those two projects individually, first <code>config_pcre</code> and then <code>pcre</code> project. -</ul></p> +</ul> <p>After build finishes, lib and dll files are in <code>/Build/pcre</code>. WinMerge executable's project file picks them from there.</p> @@ -403,7 +414,7 @@ </ul> <p>Please remember to put the version number into both executables. You may use -any of the following three methods at least. +any of the following three methods at least.</p> <ol> <li> You may run Src/SetResourceVersions.bat, which will prompt for the new @@ -419,7 +430,7 @@ manual, low-tech fashion). </li> </ol> -Whatever method you use, please double-check the +<p>Whatever method you use, please double-check the executable version numbers before uploading and releasing them.</p> <p> @@ -644,7 +655,7 @@ <h4>Compiling for 64-bit Windows</h4> <p>This is a bit tricky, and needs some patience to setup.</p> -<p><strong>Needed tools</strong> +<h5>Needed tools</h5> <ul> <li>Visual Studio 2003 or later (Might work for earlier, but I haven't tried it)</li> <li>Platform SDK (for Windows 2003 SP1) with at least following components installed: @@ -656,11 +667,10 @@ </ul> </li> </ul> -</p> -<p><strong>Starting Visual Studio and opening the project</strong><br> -We need to start Visual Studio from Platform SDK's 64-bit environment so that we get all -needed environment variables and paths correctly set. So: +<h5>Starting Visual Studio and opening the project</h5> +<p>We need to start Visual Studio from Platform SDK's 64-bit environment so that we get all +needed environment variables and paths correctly set. So:</p> <ol> <li>Start 64-bit Platform SDK environment:<br> From Start menu: Platform SDK --> Open Build Environment Window --> Windows XP/2003 64-bit @@ -670,7 +680,7 @@ <code>devenv /USEENV (uses open environment)</code></li> <li>Open <code>ShellExtensionX64.vcproj</code> from <code>ShellExtension</code> project folder.</li> -</ol></p> +</ol> <p>Make sure you have 64-bit target selected in Project Settings. Then check that paths are OK. You <strong>MUST</strong> build to separate directory than 32-bit targets so that files don't Modified: trunk/Docs/Developers/readme-manual.html =================================================================== --- trunk/Docs/Developers/readme-manual.html 2007-02-12 22:20:32 UTC (rev 4106) +++ trunk/Docs/Developers/readme-manual.html 2007-02-12 22:23:19 UTC (rev 4107) @@ -6,6 +6,14 @@ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <style type="text/css"> <!-- + body { + font-family: Verdana,Helvetica,Arial,sans-serif; + font-size: small; + } + code,pre { + font-family: "Courier New",Courier,monospace; + font-size: 1em; + } h3 { padding: 2px; border-left: 4px solid #FFCC00; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |