Thread: [Winmerge-svn] SF.net SVN: winmerge: [3532] trunk/Docs/Developers
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2006-09-06 15:29:35
|
Revision: 3532 http://svn.sourceforge.net/winmerge/?rev=3532&view=rev Author: kimmov Date: 2006-09-06 08:23:06 -0700 (Wed, 06 Sep 2006) Log Message: ----------- PATCH: [ 1552845 ] Small improvements to readme-manual Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-manual.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-09-06 15:06:33 UTC (rev 3531) +++ trunk/Docs/Developers/Changes.txt 2006-09-06 15:23:06 UTC (rev 3532) @@ -1,3 +1,7 @@ +2006-09-06 Kimmo + PATCH: [ 1552845 ] Small improvements to readme-manual + Developers: readme-manual.html + 2006-08-21 Kimmo Add recommendation about running tidy tool for generated HTML files Developers: readme-manual.html Modified: trunk/Docs/Developers/readme-manual.html =================================================================== --- trunk/Docs/Developers/readme-manual.html 2006-09-06 15:06:33 UTC (rev 3531) +++ trunk/Docs/Developers/readme-manual.html 2006-09-06 15:23:06 UTC (rev 3532) @@ -28,7 +28,7 @@ </head> <body> <h2>User Manual in DocBook/XML</h2> -<p>Our Manual is written in DocBook and can convert to other formats like HTML or CHM.</p> +<p>Our Manual is written in DocBook and we generate HTML and CHM manuals for distributing.</p> <h3>Useful DocBook resources:</h3> <ul> @@ -69,17 +69,17 @@ </ul> </li> <li> - <p><a href="http://www.cygwin.com/">Cygwin</a> contains needed tools too!</p> + <p><a href="http://www.cygwin.com/">Cygwin</a> contains needed tools:</p> <ul> <li><a href="http://ourworld.compuserve.com/homepages/hoenicka_markus/cygbook1.html">Long manual for cygwin and XML</a></li> <li><a href="http://www.coin-or.org/Clp/userguide/howto/docbook4clp.html">Shorter and easier manual for cygwin and docbook</a></li> </ul> </li> - <li><p><a href="#ownbuildsystem">Own build system</a> which based on Java and Saxon.</p></li> + <li><p><a href="#ownbuildsystem">Our preferred build system</a> based on Java and Saxon.</p></li> </ul> -<h3><a name="ownbuildsystem">Own build system which based on Java and Saxon</a></h3> -<p>Our own build system uses the following tools:</p> +<h3><a name="ownbuildsystem">Our preferred build system is based on Java and Saxon</a></h3> +<p>Our preferred build system uses the following tools:</p> <ul> <li><a href="http://java.sun.com/j2se/">Java Runtime Environment</a></li> <li><a href="http://saxon.sourceforge.net/">Saxon</a></li> @@ -93,9 +93,11 @@ <p>The batch files are located at the <code>build</code> subdirectory at the <code>Manual</code> directory. The main file ist <code>build.bat</code>. Paths to the installed tools are written in the <code>configuration.bat</code> file.</p> <dl> - <dt><code>build.bat html</code></dt> + <dt><code>build.bat html</code> or <code>build_html.bat</code></dt> <dd>Creates the HTML files under the <code>html</code> subdirectory at the <code>build</code> directory.</dd> - <dt><code>build.bat htmlhelp</code></dt> + <dt><code>build.bat html withads</code> or <br> <code>build_html.bat withads</code></dt> + <dd>Creates the HTML files with adds under the <code>html</code> subdirectory at the <code>build</code> directory.</dd> + <dt><code>build.bat htmlhelp</code> or <br> <code>build_htmlhelp.bat</code></dt> <dd>Creates the CHM file under the <code>htmlhelp</code> subdirectory at the <code>build</code> directory.</dd> <dt><code>build.bat</code></dt> <dd>Is the same like <code>build.bat html</code>.</dd> @@ -138,10 +140,12 @@ <pre>"/usr/share/sgml/docbook/sgml-dtd-4.2-1.0-24/docbook.dtd"</pre> <h4>Own build script</h4> -<p>We have an own build script, which replace the <code>docbook.dtd</code> url automatically and do some other works too.</p> +<p>We have an own build script, which replaces the <code>docbook.dtd</code> url automatically making it +easier to build manual.</p> -<p>The <code>build.sh</code> script file is located at the <code>build</code> subdirectory at the <code>Manual</code> directory. -But before you can use it at the shell server, you must give execute rights to the file:</p> +<p>The <code>build.sh</code> script file is located at the <code>build</code> subdirectory at +the <code>Manual</code> directory. But before you can use it at the shell server, you must give +execute rights for it:</p> <pre>chmod +x build.sh</pre> <p>Now you can call the script file (from the <code>build</code> directory):</p> @@ -156,9 +160,10 @@ <dd>Is the same like <code>./build.sh html</code>.</dd> </dl> -<h4>Postprocessing HTML</h4> -<p>Unfortunately DocBook tools generate quite a messy HTML. Not worth trying to read it... It is strongly -recommended to run some tidying tool before releasing/uploading HTML manual.</p> +<h3>Postprocessing HTML</h3> +<p>Unfortunately some DocBook tools generate quite a messy HTML. This is especially true for DSSSL-stylesheet +based tools. When using such tools it is strongly recommended to run some tidying tool before +releasing/uploading HTML manual.</p> <p>One good and free tool for tidying HTML is <a href="http://tidy.sourceforge.net/">HTML tidy</a>.</p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-09 09:10:55
|
Revision: 3537 http://svn.sourceforge.net/winmerge/?rev=3537&view=rev Author: kimmov Date: 2006-09-09 02:10:42 -0700 (Sat, 09 Sep 2006) Log Message: ----------- Add few words about registry subkeys. Clarify situation when winAPI functions could be used. Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/Options.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-09-09 08:25:33 UTC (rev 3536) +++ trunk/Docs/Developers/Changes.txt 2006-09-09 09:10:42 UTC (rev 3537) @@ -1,3 +1,7 @@ +2006-09-09 Kimmo + Add few words about registry subkeys. Clarify situation when winAPI functions could be used. + Developers: Options.html + 2006-09-06 Kimmo PATCH: [ 1552845 ] Small improvements to readme-manual Developers: readme-manual.html Modified: trunk/Docs/Developers/Options.html =================================================================== --- trunk/Docs/Developers/Options.html 2006-09-09 08:25:33 UTC (rev 3536) +++ trunk/Docs/Developers/Options.html 2006-09-09 09:10:42 UTC (rev 3537) @@ -19,7 +19,13 @@ <p>WinMerge stores options into registry:</p> <pre>HKCU/Software/Thingamahoochie/WinMerge</pre> +<p>Several subkeys exists for different kind of options. <code>Settings</code> subkey is +good place for most options. There are several subkeys for different sets of options, +e.g. custom colors have their own subkey. If you need one single new option, put it +top <code>Settings</code> subkey. If you need a new set of options for e.g. font setting, +create a new subkey for them.</p> + <h3>Accessing options</h3> <p>Two ways to read and save options:</p> <ol> @@ -31,7 +37,8 @@ </ol> <h3>Direct access with WinAPI</h3> -<p>This is handy for settings needed in few events or cases (star, exit).</p> +<p>This is handy for settings needed in few events or cases. Especially when +<code>COptionsMgr</code> is not available, e.g. early in startup of WinMerge.</p> <h3>COptionsMgr</h3> <p>Using <code>COptionsMgr</code> is recommended for all new options. Also all options @@ -79,7 +86,7 @@ initialised for access to options.</p> <p><b>Note:</b>All propertypages in OptionsDialog may not have GUI initialized, so remember -check window existence before trying to access it (get values/update it).</p> +to check window existence before trying to access it (get values/update it).</p> <p>Options-propertypages implement <code>IOptionsPanel</code> interface. <code>ReadOptions()</code> and <code>WriteOptions()</code> must be implemented by all options-propertypages. Their functionality This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-10 10:08:05
|
Revision: 3538 http://svn.sourceforge.net/winmerge/?rev=3538&view=rev Author: kimmov Date: 2006-09-10 03:07:50 -0700 (Sun, 10 Sep 2006) Log Message: ----------- PATCH: [ 1555237 ] Update installer doc after switch to SVN Modified Paths: -------------- trunk/Docs/Developers/Changes.txt Added Paths: ----------- trunk/Docs/Developers/readme-InnoSetup.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-09-09 09:10:42 UTC (rev 3537) +++ trunk/Docs/Developers/Changes.txt 2006-09-10 10:07:50 UTC (rev 3538) @@ -1,3 +1,8 @@ +2006-09-10 Kimmo + PATCH: [ 1555237 ] Update installer doc after switch to SVN + Developers: rename readme-developers-InnoSetup.html to readme-InnoSetup.html + Developers: readme-InnoSetup.html + 2006-09-09 Kimmo Add few words about registry subkeys. Clarify situation when winAPI functions could be used. Developers: Options.html Copied: trunk/Docs/Developers/readme-InnoSetup.html (from rev 3535, trunk/Docs/Developers/readme-developers-InnoSetup.html) =================================================================== --- trunk/Docs/Developers/readme-InnoSetup.html (rev 0) +++ trunk/Docs/Developers/readme-InnoSetup.html 2006-09-10 10:07:50 UTC (rev 3538) @@ -0,0 +1,154 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> + <title>Building WinMerge Installer</title> + <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> + <style type="text/css"> + <!-- + h3 { + padding: 2px; + border-left: 4px solid #FFCC00; + border-bottom: 1px solid #FFCC00; + } + --> + </style> +</head> +<body> + +<h2>Building WinMerge Installer</h2> + +<h3>Needed programs:</h3> +<ul> + <li> + <a href="http://www.jrsoftware.org/">Inno Setup</a> version 5.1.7. + </li> + <li> + <a href="http://www.istool.org/">ISTool</a> <strong>recommended</strong> + - great help managing Inno Setup installer scripts + </li> +</ul> + +<p>There is download package called "QuickStart Pack" available in Inno Setup +downloads. It contains all needed components in one installer.</p> + +<h3>Installer script:</h3> +Installer script is in <code>Installer/InnoSetup</code> folder: <code>WinMerge.iss</code> + +<h3>Checklist:</h3> +<ul> + <li> + Installer reads version number from <code>WinMerge.exe</code>. So make + sure you have version resource correctly set.<br> + You can use script to set version info into Merge.rc and all language.rc files: + just run <code>Src/SetResourceVersions.bat</code> - it asks version number to set. + Note that it needs four numbers, so if you are releasing 2.5.6 version, you need to + set last number as zero: 2.5.6.0. + </li> + <li> + Installer checks that files listed are present. But some files are + included as folder (like <code>/Plugins/Dlls</code>) or as filemask (like + <code>*.flt</code>) so take extra care to make sure all needed files + are present in locations shown below. + </li> +</ul> + +<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> + +<p>Copy or move the files into the following layout:</p> + +<ul> + <li> + <code>Build/</code> + <ul> + <li> + <code>Languages</code> + <ul> + <li><code>*.lang</code></li> + </ul> + </li> + <li> + <code>Manual/htmlhelp</code> + <ul> + <li><code>WinMerge.chm</code></li> + </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> + <li><code>WinMergeU.exe</code></li> + <li><code>WinMergeU.exe.Manifest</code></li> + </ul> + </li> + </ul> + </li> + <li> + <code>Docs/</code> + <ul> + <li> + <code>Users</code> + <ul> + <li><em>Copy the entire <code>Docs/Users</code> folder to here</em></li> + </ul> + </li> + </ul> + </li> + <li> + <code>Filters/</code> + <ul> + <li><code>FileFilter.tmpl</code></li> + <li><code>*.flt</code></li> + </ul> + </li> + <li> + <code>Installer/InnoSetup/</code> + <ul> + <li><em>Copy the entire InnoSetup source folder to here</em></li> + </ul> + </li> +</ul> + +<h3>Running Inno Setup to create installer</h3> + +<p><code>WinMerge.iss</code> (in <code>InnoSetup</code> folder) +is script used to create WinMerge installer.</p> + +<p>Rest of this section assumes ISTool is used. If not, then refer to +InnoSetup manual for creating installer from script.</p> + +<ol> + <li> + Start ISTool and load <code>WinMerge.iss</code> + </li> + <li> + Select "Project->Verify Files..." from ISTool menu to verify + all needed files are present and in correct directories. Copy missing + files to correct directories before continuing. + </li> + <li> + Select "Project->Compile Setup" from ISTool menu to create + installer. This takes a while... + </li> +</ol> + +<p>If compile succeeds you have <code>WinMerge-[version]-Setup.exe</code> in +folder <code>/Build</code>. You probably want to remove unnecessary zeros +from the filename before uploading: if filename is <code>WinMerge-2.6.0.0-Setup.exe</code>, +you may want to rename it to <code>WinMerge-2.6-Setup.exe</code>. Not a rule, but a +recommendation.</p> + +<p><strong>Test installer!</strong></p> + +</body> +</html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-10 14:00:20
|
Revision: 3540 http://svn.sourceforge.net/winmerge/?rev=3540&view=rev Author: kimmov Date: 2006-09-10 07:00:10 -0700 (Sun, 10 Sep 2006) Log Message: ----------- PATCH: [ 1555340 ] New Subversion-doc for devels Modified Paths: -------------- trunk/Docs/Developers/Changes.txt Added Paths: ----------- trunk/Docs/Developers/readme-Subversion.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-09-10 13:51:39 UTC (rev 3539) +++ trunk/Docs/Developers/Changes.txt 2006-09-10 14:00:10 UTC (rev 3540) @@ -2,6 +2,8 @@ PATCH: [ 1555237 ] Update installer doc after switch to SVN Developers: rename readme-developers-InnoSetup.html to readme-InnoSetup.html Developers: readme-InnoSetup.html + PATCH: [ 1555340 ] New Subversion-doc for devels + Developers new file: readme-Subversion.html 2006-09-09 Kimmo Add few words about registry subkeys. Clarify situation when winAPI functions could be used. Added: trunk/Docs/Developers/readme-Subversion.html =================================================================== --- trunk/Docs/Developers/readme-Subversion.html (rev 0) +++ trunk/Docs/Developers/readme-Subversion.html 2006-09-10 14:00:10 UTC (rev 3540) @@ -0,0 +1,121 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> + <title>Subversion version control</title> + <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> + <style type="text/css"> + <!-- + h3 { + padding: 2px; + border-left: 4px solid #FFCC00; + border-bottom: 1px solid #FFCC00; + } + --> + </style> +</head> +<body> + +<h2>Accessing WinMerge Subversion repository</h2> + +<h3>Why Subversion?</h3> +<p>We used <a href="http://www.sourceforge.net/">SourceForge.net</a>'s CVS service for years. +It served us pretty well. In 2006 SourceForge made Subversion also available as +service. And after short discussion WinMerge developers agreed to switch to Subversion. +It fits better to our needs than CVS. So we switched from CVS to subversio in August 2006. +</p> +<h4>But CVS is better! I Want to use CVS!</h4> +<p>We decided subversion is better for us. We keep using Subversion for now on.</p> +<h4>What happened to code in CVS?</h4> +<p>Nothing. It is still there. We don't just checkin anymore to CVS. And CVS page is not +visible in our project page.</p> + +<h3>Web access</h3> +<p>Easiest way to browse our sourcecode is through web. SourceForge.net utilizes +<a href="http://viewvc.tigris.org/">ViewVC</a> to access CVS/Subversion repositories via Web. +WinMerge Subversion repository is available at: <a href="http://svn.sourceforge.net/viewvc/winmerge/"> +http://svn.sourceforge.net/viewvc/winmerge/</a>. +</p> + +<h3>Subversion client programs</h3> +<ul> + <li> + <a href="http://tortoisesvn.tigris.org/">TortoiseSVN</a> <strong>Recommended</strong> TortoiseSVN + is a great Subversion client program for Windows. It does not need Subversion to be installed. + </li> + <li> + <a href="http://subversion.tigris.org/">Subversion</a> The Thing. If you want to use commandline + or if you want your own local Subversion repository, you need it. Not needed for TortoiseSVN. + </li> +</ul> + +<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: +<ul> + <li> + <a href="http://http://en.wikipedia.org/wiki/Subversion_(software)/">Wikipedia article</a> about + Subversion. + </li> + <li> + <a href="http://www.codeproject.com/useritems/XTortoiseSVN.asp">CodeProject article</a>Version + Control for the Standalone Programmer - Part 1. + </li> +</ul> + +</p> + +<h3>Repository URLs</h3> +<p>WinMerge Subversion repository URL is:<br> +<code>https://svn.sourceforge.net/svnroot/winmerge</code> +</p> +<p>Using above URL will checkout all branches and tags also. WinMerge development happens in +<i>trunk</i> and URL is:<br> +<code>https://svn.sourceforge.net/svnroot/winmerge/trunk</code> +</p> +<p>Branches are in separate folder:<br> +<code>https://svn.sourceforge.net/svnroot/winmerge/branches</code><br> +As of writing this (2006-09-09) there are no branches in our Subversion repository. Old branches are in +CVS repository. +</p> + +<h3>Quick intro to using TortoiseSVN</h3> +<h4>Checkout</h4> +<ol> + <li> Create top-level folder for your development version (e.g. <code>c:\devel\WinMerge\</code>)</li> + <li> In Windows explorer, go to that folder, and right-click with mouse in it</li> + <li> Select <i>SVN Checkout...</i> -item</li> + <li> Give trunk URL (see above) as a repository URL to get out development trunk</li> +</ol> + +<p> SVN should now checkout WinMerge trunk to given folder. Note that there is NO modules in SVN like there +is with CVS, so all files in <code>/trunk</code> in SVN repository are added to folder you just created. +Don't checkout to some common folder expecting there will be WinMerge subfolder anyway!</p> + +<h4>Checkin</h4> +<ol> + <li> Update <strong>ALL</strong> needed files before checking in. With SVN it is just one checkin + for one revision, so you can't do like with CVS to checkin one file or directory at a time.</li> + <li> Right-click over WinMerge root folder which you created for WinMerge trunk</li> + <li> Select <i>SVN Commit</i> from context menu</li> + <li> Type message (preferably same than in <code>changes.txt</code>) to commit dialog</li> + <li> Double-check that all files are in list of files</li> + <li> Click OK-button</li> + <li> Give your SourceFOrge.net login and password when TortoiseSVN asks them (it remembers them for + the next time if you check the checkbox)</li> +</ol> + +<p>Please copy/paste revision number to patch tracker item when you apply a patch to version control. +It makes it easier to track changes afterwards. That information is of course available through logs +and ViewVC, but it saves some time when revision number is visible in patch item.</p> + +<h4>Update</h4> +<ol> + <li> Right-click over WinMerge root folder which you created for WinMerge trunk</li> + <li> Select <i>SVN Update</i> from context menu</li> +</ol> + + +</body> +</html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-11 14:40:10
|
Revision: 3547 http://svn.sourceforge.net/winmerge/?rev=3547&view=rev Author: kimmov Date: 2006-09-11 07:40:00 -0700 (Mon, 11 Sep 2006) Log Message: ----------- PATCH: [ 1555893 ] Update readme-developers.html Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-developers.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-09-11 14:29:27 UTC (rev 3546) +++ trunk/Docs/Developers/Changes.txt 2006-09-11 14:40:00 UTC (rev 3547) @@ -1,3 +1,7 @@ +2006-09-11 Kimmo + PATCH: [ 1555893 ] Update readme-developers.html + Developers: readme-developers.html + 2006-09-10 Kimmo PATCH: [ 1555237 ] Update installer doc after switch to SVN Developers: rename readme-developers-InnoSetup.html to readme-InnoSetup.html Modified: trunk/Docs/Developers/readme-developers.html =================================================================== --- trunk/Docs/Developers/readme-developers.html 2006-09-11 14:29:27 UTC (rev 3546) +++ trunk/Docs/Developers/readme-developers.html 2006-09-11 14:40:00 UTC (rev 3547) @@ -40,7 +40,7 @@ <li><a href="#RCS_Ids">RCS Ids</a></li> <li><a href="#File_release_numbers">File release numbers</a></li> <li><a href="#Packaging_file_releases">Packaging file releases</a></li> - <li><a href="#Tagging_CVS_when_releasing_files">Tagging CVS when releasing files</a></li> + <li><a href="#Tagging_SVN_when_releasing_files">Tagging Subversion when releasing files</a></li> <li><a href="#Localization_resources_files">Localization : resources files</a></li> <li><a href="#Localization_merging_and_scheduling">Localization : merging and scheduling</a></li> <li><a href="#Logging">Logging</a></li> @@ -52,13 +52,33 @@ <p>Compiling sources is usually the first thing you want to do. Source packages for different versions are available from SourceForge.net.</p> -<p>WinMerge releases are compiled with Microsoft Visual Studio 6 + Service -Pack 6. Also Visual Studio 2003 is supported. The only additional package you -need is a <b>HTML Help Workshop</b>. It is a part of Platform SDK which comes -with Visual Studio 2003. HTML Help Workshop can be also downloaded from: -<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/htmlhelp/html/hwMicrosoftHTMLHelpDownloads.asp"> -HTMLHelp download</a>.</p> +<h3>Environment</h3> +<h4>Supported Compilers</h4> +<ul> + <li>Visual Studio 2003.Net + Service Pack 1 (used for releases)</li> + <li>Visual Studio 6 + Service Pack 6</li> + <li>Visual Studio 2005 (occasional checks for compiling)</li> +</ul> +<p>Note that WinMerge uses MFC heavily. So free editions of Visual Studio cannot +compile WinMerge, unless you have MFC installed separately.</p> +<h4>Additional requirements</h4> +<ul> + <li>HTML Help Workshop (either stand-alone or from Platform SDK)<br> + Download it from :<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/htmlhelp/html/hwMicrosoftHTMLHelpDownloads.asp"> + HTMLHelp download</a>.</li> + <li>Platform SDK <strong>recommended</strong><br> You can either download it from net: + <a href="http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3-A93E-40C0EC4F68E5&displaylang=en"> + Platform SDK download</a> or use version installed with Visual Studio 2003.Net and later.</li> + <li>Installer needs own tools, documented in <a href="readme-InnoSetup.html">readme-InnoSetup.html</a></li> + <li>Manual needs Docbook tools, documented in <a href="readme-manual.html">readme-manual.html</a></li> +</ul> + +<h4>Project files</h4> +<p>Project file for WinMerge executable (in <code>/Src</code>) and other projects like +ShellExtension (in <code>/ShellExtension</code>) have their own project files. There is no one +single project/workspace file to compile all projects.<p> + <p>Visual Studio project file for MSVC6 comes with WinMerge sources. Newer versions of Visual Studio can open that file too, they just ask if one wants to convert to new version. Reason we don't ship project files for all Visual Studio versions is we have no resources @@ -75,8 +95,10 @@ directory. Propable cause is that including files from Platform SDK directories breaks things.</p> + <h4>Compiling targets</h4> -<p>There are several targets available for compiling different projects. Targets used for compiling releases are:<br> +<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> @@ -113,8 +135,8 @@ </li> <li> <p>Before you start developing, make sure to capture - a snapshot of your starting sources (presumably a pristine copy of cvs - sources, or of a source zip from a distribution).</p> + a snapshot of your starting sources (presumably a pristine copy of sources from + subversion, or of a source zip from a distribution).</p> <p><b>DO NOT</b> submit a patch against year-old version. Latest experimental/beta version is at max few weeks old. Stable releases should only get bug fixes. And even then bugfix @@ -130,6 +152,9 @@ <p>Post your changes as a patch, to the SourceForge patch list. Try to give an informative patch title of course. Post to any relevant SourceForge bugs or RFEs, giving the patch number and title.</p> + <p>If the bug/rfe item is already assigned to you (or you submitted it), you can + also attach patch into that item. Remember to add a comment so others notice the + new attachment.</p> <p>The active developers have often been posting entire original and modified files rather than traditional diffs, because obviously all developers have access to WinMerge to compare original and modified files, and this @@ -139,15 +164,13 @@ from context menu and WinMerge creates a zip-file for you. Ready to be posted!</p> </li> <li> - <p>Wait for reactions from other developers (and sometimes active users). - If you feel impatient, you may solicit review of your patch via the - developer's mailing list.</p> + <p>Wait for reactions from other developers (and sometimes active users).<br> + Usually this means one of active developers approves your patch before commit.</p> </li> <li> - <p>After a reasonable amount of time has passed, and no negative reviews - have been posted (or after you have responded to and dealt reasonably - with any that have been posted), apply the patch to CVS. (Or ask a - project member to do so, if you have not yourself developer access to + <p>After a reasonable amount of time has passed, and one of active developers + has approved the patch, apply the patch to Subversion. (Or ask a + project member to do so, if you don't have yourself developer access to the project.)</p> <p>What is a reasonable amount of time? That is somewhat subjective, and we need to rely on your expertise as the patch developer, but let us @@ -163,7 +186,7 @@ <p>Note that <code>Src/Changes.txt</code> was split from <code>Src/readme.txt</code> after 2.4.0 release. So <code>Src/readme.txt</code> contains older changelog entries. Also, many -subfolders have therir own <code>Changes.txt</code> -file. If the file exists in the folder, it must be +subfolders have their own <code>Changes.txt</code> -file. If the file exists in the folder, it must be used instead of "global" <code>Src/Changes.txt</code>. <h3><a name="MakePatchDirs">MakePatchDirs</a></h3> @@ -252,6 +275,10 @@ // $Id$ </pre> +<p>Although we are now using Subversion, those lines are still useful. TortoiseSVN +understands them and adds correct version number and author, as if it was checked out +from CVS.</p> + <h3><a name="File_release_numbers">File release numbers</a></h3> <p>We are trying to keep a consistent numbering scheme on our file releases, @@ -295,8 +322,8 @@ <ul> <li><code>WinMerge.exe</code> and <code>WinMergeU.exe</code></li> - <li><code>ShellExtension.dll</code>, <code>ShellExtensionU.dll</code> and <code>register.bat</code> - to register it</li> + <li><code>ShellExtension.dll</code>, <code>ShellExtensionU.dll</code>, <code>register.bat</code> + and <code>unregister.bat</code> to register/unregister it.</li> <li>All filters from the <code>filters/</code> directory (remember template file!)</li> <li>All plugins from the <code>plugins/dlls/</code> directory. Create a <code>MergePlugins/</code> directory and copy the plugins to it</li> <li>All <code>*.lang</code> files (currently we have 21 languages, counting both Chinese versions)</li> @@ -355,11 +382,11 @@ <p>That is, dots are used only inside the version number and before the final extension.</p> -<h3><a name="Tagging_CVS_when_releasing_files">Tagging CVS when releasing files</a></h3> +<h3><a name="Tagging_SVN_when_releasing_files">Tagging Subversion when releasing files</a></h3> -<p>When we make a release we always put a note in <code>Src/Changes.txt</code> in CVS.</p> +<p>When we make a release we always put a note in <code>Src/Changes.txt</code> in SVN.</p> -<p>It is recommended to put a tag in CVS when you make a file release, because that makes it easier +<p>It is recommended to put a tag in SVN when you make a file release, because that makes it easier to pull a release version when there were code updates before and after it on the same day (because SourceForge doesn't record time of day correctly, and anyway, it it easier to just ask for a tag).</p> @@ -370,15 +397,16 @@ <h3><a name="Localization_resources_files">Localization : resources files</a></h3> <p><code>WinMerge.exe</code> and <code>WinMergeU.exe</code> are always compiled with the english resources. -Custom languages are in separate dll files with extension <code>.lang</code>, to be placed in WinMerge directory. -Language may be changed dynamically through the menu.</p> +Custom languages are in separate dll files with extension <code>.lang</code>, to be placed in +<code>Languages</code> subfolder in WinMerge folder. Language may be changed dynamically through the menu.</p> <p>WinMerge localization is achieved through localization of resources (files with extension <code>.rc</code>). Actually there is only one rc file in the project, <code>Merge.rc</code>. Localized versions for this file are to be stored in the <code>Languages/</code> directory, in the subdirectory created for that language.</p> -<p class="note">Besides the resources files you could also translate things like the <a href="http://cvs.sourceforge.net/viewcvs.py/winmerge/WinMerge/InnoSetup/Languages/">installer</a> -(the ISL files are just INI files) and the <a href="http://cvs.sourceforge.net/viewcvs.py/winmerge/WinMerge/Docs/Users/Languages/">readme files</a> (at the moment RTF files).</p> +<p class="note">Besides the resources files you could also translate things like the +<a href="http://svn.sourceforge.net/viewvc/winmerge/trunk/WinMerge/InnoSetup/Languages/">installer</a> +(the ISL files are just INI files) and the <a href="http://svn.sourceforge.net/viewvc/winmerge/trunk/WinMerge/Docs/Users/Languages/">readme files</a>.</p> <h4>Tips for developers :</h4> <ul> @@ -393,7 +421,7 @@ because merging rc files with WinMerge is then a lot easier. Strings are grouped in block according to their ID masked by <code>0xFFF0</code>. So there are at most 16 strings in a block, but maybe less. MSVC reorders strings between and inside blocks, but never reorder blocks (when a new blocks is created, MSVC always put it at the last position).</p> - <p>Typical method to merge strings in a <code>Merge.rc</code> from a patch with a <code>Merge.rc</code> in CVS :</p> + <p>Typical method to merge strings in a <code>Merge.rc</code> from a patch with a <code>Merge.rc</code> in SVN :</p> <ol> <li>Add your new strings with WinMerge : <code>resource.h</code> for ID, and <code>Merge.rc</code>.</li> <li>If no overlapping ID, you are finished.</li> @@ -415,10 +443,6 @@ <h4>Tips for translators :</h4> <ul> <li>Do not move around things in resource files (MSVC or WinMerge are OK, but maybe you'll use other tools).</li> - <li> - <strong>First translation</strong>: the order of blocks is different in 2.0 and 2.1 (bug). - You have to reorder the blocks if you build your 2.1 localization from your 2.0 one. - </li> <li>You may localize the layout. Avoid to localize the alignment flag, rather change coordinates.</li> </ul> <p class="note">Please try to avoid changing dialog layout when translating. @@ -427,7 +451,7 @@ If you want to improve dialog layout (we welcome UI improvements) you should submit it as src/Merge.rc patch so it will be merged to all translations.</p> <h4>Compiling</h4> -<p>We have a customised tool for compiling language files. Project for it is in CVS:</p> +<p>We have a customised tool for compiling language files. Project for it is in SVN:</p> <pre>/WinMerge/MakeResDll</pre> @@ -468,7 +492,7 @@ </li> <li> <p><strong>Delays in localization</strong>: translators generally need some weeks to translate, so their version is already outdated when - the localization is complete, and merging with CVS must be done again.</p> + the localization is complete, and merging with SVN must be done again.</p> </li> </ul> @@ -497,27 +521,6 @@ </li> </ul> -<h4>Typical steps for a new beta/release :</h4> -<ol> - <li> - Layout of dialogs. Visual check. Probably a developer work (for speed, and maybe - the language has no more translator). Update the CVS after this step. - </li> - <li>Branch the localized resource for the beta/release. Build the dll.</li> - <li>Beginning of localization. The translators gets the localized resource.</li> - <li>...</li> - <li>Translator applies his localization to the branch. Rebuild the dll.</li> - <li> - CVS localization. Developers merge the changes from 4 to the current CVS. - The layout may be merged only partially, as anyway it will be checked for the next beta/release. - </li> -</ol> - -<p>Steps 3, 4, 5, 6 may be reproduced. As long as the impacted beta/release is the last one, step 6 is -necessary (or the changes will be lost in the next beta/release). But step 6 is done by developers -only once (per language and per beta/release), after it is the translator's job. Please localize once -and well rather than in small chunks!</p> - <h4>Merging tools for resources :</h4> <p>WinMerge of course, plus the plugin <code>RCLocalizationHelper.dll</code>.</p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-16 06:55:26
|
Revision: 3568 http://svn.sourceforge.net/winmerge/?rev=3568&view=rev Author: kimmov Date: 2006-09-15 23:55:20 -0700 (Fri, 15 Sep 2006) Log Message: ----------- PATCH: [ 1559614 ] Readme: building 64-bit shellextension Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-developers.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-09-16 06:53:25 UTC (rev 3567) +++ trunk/Docs/Developers/Changes.txt 2006-09-16 06:55:20 UTC (rev 3568) @@ -1,3 +1,7 @@ +2006-09-16 Kimmo + PATCH: [ 1559614 ] Readme: building 64-bit shellextension + Developers: readme-developers.html + 2006-09-11 Kimmo PATCH: [ 1555893 ] Update readme-developers.html Developers: readme-developers.html Modified: trunk/Docs/Developers/readme-developers.html =================================================================== --- trunk/Docs/Developers/readme-developers.html 2006-09-16 06:53:25 UTC (rev 3567) +++ trunk/Docs/Developers/readme-developers.html 2006-09-16 06:55:20 UTC (rev 3568) @@ -566,5 +566,46 @@ path of <code>WinMerge.exe</code> you mainly use as its value. If this value exists ShellExtension does not care about another path value.</p> +<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> +<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: + <ul> + <li>Configuration Options</li> + <li>Microsoft Windows Core SDK <strong>with tools and build environments</strong></li> + <li>Microsoft Web Workshop (IE) SDK</li> + <li>Microsoft Data Access Services (MDAC) SDK <i>not sure about this</i></li> + </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: +<ol> + <li>Start 64-bit Platform SDK environment:<br> + From Start menu: Platform SDK --> Open Build Environment Window --> Windows XP/2003 64-bit + environment --> Release/Debug environment</li> + <li>CD to Visual Studio install folder/Common7/IDE</li> + <li>Start Visual Studio with command:<br> + <code>devenv /USEENV (uses open environment)</code></li> + <li>Open <code>ShellExtensionX64.vcproj</code> from <code>ShellExtension</code> project + folder.</li> +</ol></p> + +<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 +mix up.</p> + +<p>Compiling should now succeed. If not, check that all needed PSDK components are installed +and that paths are OK. If you are compiling in 32-bit Windows you get error about registering +but that is expected to happen.</p> + +<p>64-bit ShellExtension is registered to 64-bit Windows just like counterparts in 32-bit world:<br> +<code>regsvr ShellExtensionX64.dll</code></p> </body> </html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-19 15:28:49
|
Revision: 3582 http://svn.sourceforge.net/winmerge/?rev=3582&view=rev Author: kimmov Date: 2006-09-19 08:21:49 -0700 (Tue, 19 Sep 2006) Log Message: ----------- Add ShellExtensionX64.dll to installer doc Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-InnoSetup.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-09-19 14:52:33 UTC (rev 3581) +++ trunk/Docs/Developers/Changes.txt 2006-09-19 15:21:49 UTC (rev 3582) @@ -1,3 +1,7 @@ +2006-09-19 Kimmo + Add ShellExtensionX64.dll to installer doc + Developers: readme-InnoSetup.html + 2006-09-16 Kimmo PATCH: [ 1559614 ] Readme: building 64-bit shellextension Developers: readme-developers.html Modified: trunk/Docs/Developers/readme-InnoSetup.html =================================================================== --- trunk/Docs/Developers/readme-InnoSetup.html 2006-09-19 14:52:33 UTC (rev 3581) +++ trunk/Docs/Developers/readme-InnoSetup.html 2006-09-19 15:21:49 UTC (rev 3582) @@ -91,6 +91,12 @@ <li><code>WinMergeU.exe.Manifest</code></li> </ul> </li> + <li> + <code>ShellExtensionX64/</code> + <ul> + <li><code>ShellExtensionX64.dll</code></li> + </ul> + </li> </ul> </li> <li> @@ -119,6 +125,14 @@ </li> </ul> +<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 +Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; [...] +</pre> +from <code>WinMerge.iss</code></p> + <h3>Running Inno Setup to create installer</h3> <p><code>WinMerge.iss</code> (in <code>InnoSetup</code> folder) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-19 19:30:45
|
Revision: 3585 http://svn.sourceforge.net/winmerge/?rev=3585&view=rev Author: kimmov Date: 2006-09-19 12:30:39 -0700 (Tue, 19 Sep 2006) Log Message: ----------- Update Doxygen config file for new ArchiveSupport folder, also create docs in subfolder Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/doxygen.cfg Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-09-19 16:35:48 UTC (rev 3584) +++ trunk/Docs/Developers/Changes.txt 2006-09-19 19:30:39 UTC (rev 3585) @@ -1,6 +1,8 @@ 2006-09-19 Kimmo Add ShellExtensionX64.dll to installer doc Developers: readme-InnoSetup.html + Update Doxygen config file for new ArchiveSupport folder, also create docs in subfolder + Developers: doxygen.cfg 2006-09-16 Kimmo PATCH: [ 1559614 ] Readme: building 64-bit shellextension Modified: trunk/Docs/Developers/doxygen.cfg =================================================================== --- trunk/Docs/Developers/doxygen.cfg 2006-09-19 16:35:48 UTC (rev 3584) +++ trunk/Docs/Developers/doxygen.cfg 2006-09-19 19:30:39 UTC (rev 3585) @@ -1,11 +1,11 @@ -# Doxyfile 1.4.6 +# Doxyfile 1.4.7 #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = WinMerge -PROJECT_NUMBER = 2.5.4.0 -OUTPUT_DIRECTORY = +PROJECT_NUMBER = 2.6.0 +OUTPUT_DIRECTORY = doxygen CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English USE_WINDOWS_ENCODING = YES @@ -74,7 +74,7 @@ #--------------------------------------------------------------------------- INPUT = ../../Src \ ../../ShellExtension \ - ../../Merge7z + ../../ArchiveSupport/Merge7z FILE_PATTERNS = RECURSIVE = YES EXCLUDE = @@ -95,6 +95,7 @@ STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES +REFERENCES_LINK_SOURCE = YES USE_HTAGS = NO VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- @@ -207,6 +208,7 @@ INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES CALL_GRAPH = NO +CALLER_GRAPH = NO GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = png This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-24 08:49:12
|
Revision: 3629 http://svn.sourceforge.net/winmerge/?rev=3629&view=rev Author: kimmov Date: 2006-09-24 01:49:06 -0700 (Sun, 24 Sep 2006) Log Message: ----------- Add 2.6 branch URL Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-Subversion.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-09-24 08:27:14 UTC (rev 3628) +++ trunk/Docs/Developers/Changes.txt 2006-09-24 08:49:06 UTC (rev 3629) @@ -1,3 +1,7 @@ +2006-09-24 Kimmo + Add 2.6 branch URL + Developers: readme-Subversion.html + 2006-09-19 Kimmo Add ShellExtensionX64.dll to installer doc Developers: readme-InnoSetup.html Modified: trunk/Docs/Developers/readme-Subversion.html =================================================================== --- trunk/Docs/Developers/readme-Subversion.html 2006-09-24 08:27:14 UTC (rev 3628) +++ trunk/Docs/Developers/readme-Subversion.html 2006-09-24 08:49:06 UTC (rev 3629) @@ -76,8 +76,12 @@ </p> <p>Branches are in separate folder:<br> <code>https://svn.sourceforge.net/svnroot/winmerge/branches</code><br> -As of writing this (2006-09-09) there are no branches in our Subversion repository. Old branches are in -CVS repository. +Current branches are: +<ul> + <li>2.6 release branch<br> + <code>https://svn.sourceforge.net/svnroot/winmerge/branches/R2_6</code></li> +</ul> +Old branches (2.0 - 2.4 releases) are in CVS repository. </p> <h3>Quick intro to using TortoiseSVN</h3> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-24 08:51:54
|
Revision: 3631 http://svn.sourceforge.net/winmerge/?rev=3631&view=rev Author: kimmov Date: 2006-09-24 01:51:44 -0700 (Sun, 24 Sep 2006) Log Message: ----------- Clarify tagging releases to Subversion repository (no tagging for experimentals) Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-developers.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-09-24 08:50:16 UTC (rev 3630) +++ trunk/Docs/Developers/Changes.txt 2006-09-24 08:51:44 UTC (rev 3631) @@ -1,6 +1,8 @@ 2006-09-24 Kimmo Add 2.6 branch URL Developers: readme-Subversion.html + Clarify tagging releases to Subversion repository (no tagging for experimentals) + Developers: readme-developers.html 2006-09-19 Kimmo Add ShellExtensionX64.dll to installer doc Modified: trunk/Docs/Developers/readme-developers.html =================================================================== --- trunk/Docs/Developers/readme-developers.html 2006-09-24 08:50:16 UTC (rev 3630) +++ trunk/Docs/Developers/readme-developers.html 2006-09-24 08:51:44 UTC (rev 3631) @@ -386,9 +386,11 @@ <p>When we make a release we always put a note in <code>Src/Changes.txt</code> in SVN.</p> -<p>It is recommended to put a tag in SVN when you make a file release, because that makes it easier -to pull a release version when there were code updates before and after it on the same day -(because SourceForge doesn't record time of day correctly, and anyway, it it easier to just ask for a tag).</p> +<p>It is recommended to create a tag to repository when making a stable- or beta- releases. +Although with subversion we have kind of tags for every commit (revision numbers) it is still a lot +easier to handle and remeber them with human-readable names (R2_6_0) than with revision numbers +(revision 3637 (not a real revision number!)). Experimental or other testing releases don't need +tags since they are not intended for wide use and are usually just one-time snapshots.</p> <p>The tag should follow the same numbering scheme as used above, with the dots replaced by underscores and prefixed with an <code>R</code>, so the example experimental above would have a tag named <code>R2_1_3_0</code>, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-25 18:36:16
|
Revision: 3635 http://svn.sourceforge.net/winmerge/?rev=3635&view=rev Author: kimmov Date: 2006-09-25 11:35:58 -0700 (Mon, 25 Sep 2006) Log Message: ----------- Add info about different PSDK versions and components needed Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-developers.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-09-24 12:24:04 UTC (rev 3634) +++ trunk/Docs/Developers/Changes.txt 2006-09-25 18:35:58 UTC (rev 3635) @@ -1,3 +1,7 @@ +2006-09-25 Kimmo + Add info about different PSDK versions and components needed + Developers: readme-developers.html + 2006-09-24 Kimmo Add 2.6 branch URL Developers: readme-Subversion.html Modified: trunk/Docs/Developers/readme-developers.html =================================================================== --- trunk/Docs/Developers/readme-developers.html 2006-09-24 12:24:04 UTC (rev 3634) +++ trunk/Docs/Developers/readme-developers.html 2006-09-25 18:35:58 UTC (rev 3635) @@ -67,13 +67,33 @@ <li>HTML Help Workshop (either stand-alone or from Platform SDK)<br> Download it from :<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/htmlhelp/html/hwMicrosoftHTMLHelpDownloads.asp"> HTMLHelp download</a>.</li> - <li>Platform SDK <strong>recommended</strong><br> You can either download it from net: - <a href="http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3-A93E-40C0EC4F68E5&displaylang=en"> - Platform SDK download</a> or use version installed with Visual Studio 2003.Net and later.</li> + <li>Platform SDK - be sure to use version that works with your version of Visual Studio: + <ul> + <li><strong>VC6</strong>: Platform SDK February 2003 - <a href="http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdk-full.htm"> + Download and install</a></li> + <li><strong>VS2003.Net and later</strong>: Platform SDK Windows 2003 SP1 - + <a href="http://www.microsoft.com/downloads/details.aspx?familyid=0BAF2B35-C656-4969-ACE8-E4C0C0716ADB"> + Download and install</a></li> + </ul> + Visual Studio 2003.Net and later come with Platform SDK but you may still want more recent version...</li> <li>Installer needs own tools, documented in <a href="readme-InnoSetup.html">readme-InnoSetup.html</a></li> <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: +<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: +<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> + <h4>Project files</h4> <p>Project file for WinMerge executable (in <code>/Src</code>) and other projects like ShellExtension (in <code>/ShellExtension</code>) have their own project files. There is no one This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-11-01 16:36:10
|
Revision: 3754 http://svn.sourceforge.net/winmerge/?rev=3754&view=rev Author: kimmov Date: 2006-11-01 08:35:58 -0800 (Wed, 01 Nov 2006) Log Message: ----------- Update building instructions after expat and scew addition Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-developers.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-11-01 16:28:40 UTC (rev 3753) +++ trunk/Docs/Developers/Changes.txt 2006-11-01 16:35:58 UTC (rev 3754) @@ -1,3 +1,7 @@ +2006-11-01 Kimmo + Update building instructions after expat and scew addition + Developers: readme-developers.html + 2006-09-25 Kimmo Add info about different PSDK versions and components needed Developers: readme-developers.html Modified: trunk/Docs/Developers/readme-developers.html =================================================================== --- trunk/Docs/Developers/readme-developers.html 2006-11-01 16:28:40 UTC (rev 3753) +++ trunk/Docs/Developers/readme-developers.html 2006-11-01 16:35:58 UTC (rev 3754) @@ -62,7 +62,11 @@ <p>Note that WinMerge uses MFC heavily. So free editions of Visual Studio cannot compile WinMerge, unless you have MFC installed separately.</p> -<h4>Additional requirements</h4> +<h4>Libraries</h4> +<p>WinMerge executable depends on Expat XML parser and SCEW wrapper libraries. Both are in +source tree, but need to be compiled before compiling WinMerge executable.</p> + +<h4>Additional requirements (out of source tree)</h4> <ul> <li>HTML Help Workshop (either stand-alone or from Platform SDK)<br> Download it from :<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/htmlhelp/html/hwMicrosoftHTMLHelpDownloads.asp"> @@ -115,8 +119,52 @@ directory. Propable cause is that including files from Platform SDK directories breaks things.</p> +<h4>Compiling expat</h4> +<p>expat is in <code>/Externals/expat</code> folder in source tree. To compile expat:<br> +<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 + Visual Studio opens the file.</li> + <li>Select from Visual Studio menu Build / Batch Build</li> + <li>Make sure all targets are selected</li> + <li>Select Rebuild All</li> + <li><i>Wait until build finishes...</i></li> + <li>Build files are in folder <code>Externals/expat/lib</code> subfolders.</li> + <li>Create folder <code>/Build/expat</code> + <li>Select the target to use - we want to use dll version (no _static in folder name): + <ul> + <li><code>Debug</code> - debug ansi</li> + <li><code>Debug-w</code> - debug unicode</li> + <li><code>Release</code> - release ansi</li> + <li><code>Release-w</code> - release unicode</li> + </ul> + I'd choose release version, as we aren't interested in debugging expat itself. + </li> + <li>Copy expat import library (<code>.lib</code>) and <code>dll</code> file to + <code>/Build/expat</code> from selected expat build folder (e.g. Release-w)</li> + </ul></p> -<h4>Compiling targets</h4> +<p class="note">I (kimmov) know this is not very convenient as when switching WinMerge target +you have to copy the correct files to /Build/expat. I figure out better solution for this.</p> + +<h4>Compiling scew</h4> +<p>scew is in <code>/Externals/scew</code> folder in source tree. To compile scew:<br> +<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 + Visual Studio opens the file.</li> + <li>Select from Visual Studio menu Build / Batch Build</li> + <li>Make sure all targets are selected</li> + <li>Select Rebuild All</li> + <li><i>Wait until build finishes...</i></li> + <li>Copy all <code>.lib</code> files from folder <code>/Externals/scew/win32/lib</code> to + <code>/Build/expat</code></li> +</ul></p> + +<p>scew is a static library and it automatically selects the correct .lib file to use. +See <code>/Externals/scew/scew/scew.h</code> about more info how it is done.</p> + +<h4>Compiling WinMerge executable targets</h4> <p>There are several targets available for compiling different projects. Targets used for compiling releases are:<br> <ul> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-11-02 23:14:03
|
Revision: 3760 http://svn.sourceforge.net/winmerge/?rev=3760&view=rev Author: kimmov Date: 2006-11-02 15:13:55 -0800 (Thu, 02 Nov 2006) Log Message: ----------- Update installer doc for expat dlls Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-InnoSetup.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-11-02 17:51:37 UTC (rev 3759) +++ trunk/Docs/Developers/Changes.txt 2006-11-02 23:13:55 UTC (rev 3760) @@ -1,3 +1,7 @@ +2006-11-02 Kimmo + Update installer doc for expat dlls + Developers: readme-InnoSetup.html + 2006-11-01 Kimmo Update building instructions after expat and scew addition Developers: readme-developers.html Modified: trunk/Docs/Developers/readme-InnoSetup.html =================================================================== --- trunk/Docs/Developers/readme-InnoSetup.html 2006-11-02 17:51:37 UTC (rev 3759) +++ trunk/Docs/Developers/readme-InnoSetup.html 2006-11-02 23:13:55 UTC (rev 3760) @@ -65,6 +65,13 @@ <code>Build/</code> <ul> <li> + <code>expat</code> + <ul> + <li><code>libexpat.dll</code></li> + <li><code>libexpatw.dll</code></li> + </ul> + </li> + <li> <code>Languages</code> <ul> <li><code>*.lang</code></li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-11-03 16:22:22
|
Revision: 3761 http://svn.sourceforge.net/winmerge/?rev=3761&view=rev Author: gerundt Date: 2006-11-03 08:22:10 -0800 (Fri, 03 Nov 2006) Log Message: ----------- PATCH: [ 1589578 ] Add <h4> style to readme-developers.html Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-developers.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-11-02 23:13:55 UTC (rev 3760) +++ trunk/Docs/Developers/Changes.txt 2006-11-03 16:22:10 UTC (rev 3761) @@ -1,3 +1,7 @@ +2006-11-03 Tim + PATCH: [ 1589578 ] Add <h4> style to readme-developers.html + Developers: readme-developers.html + 2006-11-02 Kimmo Update installer doc for expat dlls Developers: readme-InnoSetup.html Modified: trunk/Docs/Developers/readme-developers.html =================================================================== --- trunk/Docs/Developers/readme-developers.html 2006-11-02 23:13:55 UTC (rev 3760) +++ trunk/Docs/Developers/readme-developers.html 2006-11-03 16:22:10 UTC (rev 3761) @@ -11,6 +11,11 @@ border-left: 4px solid #FFCC00; border-bottom: 1px solid #FFCC00; } + h4 { + padding: 2px; + border-left: 8px solid #FF9933; + border-bottom: 1px solid #FF9933; + } pre { margin-left: 25px; margin-right: 25px; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-11-04 23:59:38
|
Revision: 3772 http://svn.sourceforge.net/winmerge/?rev=3772&view=rev Author: kimmov Date: 2006-11-04 15:59:31 -0800 (Sat, 04 Nov 2006) Log Message: ----------- Update building instructions for expat and scew (a lot simpler now) Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-developers.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-11-04 23:51:15 UTC (rev 3771) +++ trunk/Docs/Developers/Changes.txt 2006-11-04 23:59:31 UTC (rev 3772) @@ -1,3 +1,7 @@ +2006-11-05 Kimmo + Update building instructions for expat and scew (a lot simpler now) + Developers: readme-developers.html + 2006-11-03 Tim PATCH: [ 1589578 ] Add <h4> style to readme-developers.html Developers: readme-developers.html Modified: trunk/Docs/Developers/readme-developers.html =================================================================== --- trunk/Docs/Developers/readme-developers.html 2006-11-04 23:51:15 UTC (rev 3771) +++ trunk/Docs/Developers/readme-developers.html 2006-11-04 23:59:31 UTC (rev 3772) @@ -131,26 +131,12 @@ using Visual Studio 2003.Net or later you need to convert the file to 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> + <li>Select either debug or release targets.</li> <li>Select Rebuild All</li> - <li><i>Wait until build finishes...</i></li> - <li>Build files are in folder <code>Externals/expat/lib</code> subfolders.</li> - <li>Create folder <code>/Build/expat</code> - <li>Select the target to use - we want to use dll version (no _static in folder name): - <ul> - <li><code>Debug</code> - debug ansi</li> - <li><code>Debug-w</code> - debug unicode</li> - <li><code>Release</code> - release ansi</li> - <li><code>Release-w</code> - release unicode</li> - </ul> - I'd choose release version, as we aren't interested in debugging expat itself. - </li> - <li>Copy expat import library (<code>.lib</code>) and <code>dll</code> file to - <code>/Build/expat</code> from selected expat build folder (e.g. Release-w)</li> </ul></p> -<p class="note">I (kimmov) know this is not very convenient as when switching WinMerge target -you have to copy the correct files to /Build/expat. I figure out better solution for this.</p> +<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> @@ -161,13 +147,12 @@ <li>Select from Visual Studio menu Build / Batch Build</li> <li>Make sure all targets are selected</li> <li>Select Rebuild All</li> - <li><i>Wait until build finishes...</i></li> - <li>Copy all <code>.lib</code> files from folder <code>/Externals/scew/win32/lib</code> to - <code>/Build/expat</code></li> </ul></p> -<p>scew is a static library and it automatically selects the correct .lib file to use. -See <code>/Externals/scew/scew/scew.h</code> about more info how it is done.</p> +<p>After build finishes, lib and dll files are in <code>/Build/expat</code>. WinMerge +executable's project file picks them from there. scew is a static library and it +automatically selects the correct .lib file to use. See <code>/Externals/scew/scew/scew.h</code> +for more info how it is done.</p> <h4>Compiling WinMerge executable targets</h4> <p>There are several targets available for compiling different projects. Targets used This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-11-07 17:07:51
|
Revision: 3784 http://svn.sourceforge.net/winmerge/?rev=3784&view=rev Author: kimmov Date: 2006-11-07 09:07:45 -0800 (Tue, 07 Nov 2006) Log Message: ----------- Add building instructions for PCRE Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-developers.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-11-07 16:58:51 UTC (rev 3783) +++ trunk/Docs/Developers/Changes.txt 2006-11-07 17:07:45 UTC (rev 3784) @@ -1,3 +1,7 @@ +2006-11-07 Kimmo + Add building instructions for PCRE + Developers: readme-developers.html + 2006-11-05 Kimmo Update building instructions for expat and scew (a lot simpler now) Developers: readme-developers.html Modified: trunk/Docs/Developers/readme-developers.html =================================================================== --- trunk/Docs/Developers/readme-developers.html 2006-11-07 16:58:51 UTC (rev 3783) +++ trunk/Docs/Developers/readme-developers.html 2006-11-07 17:07:45 UTC (rev 3784) @@ -149,11 +149,22 @@ <li>Select Rebuild All</li> </ul></p> -<p>After build finishes, lib and dll files are in <code>/Build/expat</code>. WinMerge -executable's project file picks them from there. scew is a static library and it -automatically selects the correct .lib file to use. See <code>/Externals/scew/scew/scew.h</code> -for more info how it is done.</p> +<h4>Compiling PCRE</h4> +<p>PCRE is in <code>/Externals/pcre</code> folder in source tree. To compile PCRE:<br> +<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 + Visual Studio opens the file.</li> + <li>Select from Visual Studio menu Build / Batch Build</li> + <li>Select <code>config_pcre</code> and <code>pcre</code> projects and build them</li> + <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> +<p>After build finishes, lib and dll files are in <code>/Build/pcre</code>. WinMerge +executable's project file picks them from there.</p> + <h4>Compiling WinMerge executable targets</h4> <p>There are several targets available for compiling different projects. Targets used for compiling releases are:<br> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-11-08 22:04:40
|
Revision: 3792 http://svn.sourceforge.net/winmerge/?rev=3792&view=rev Author: gerundt Date: 2006-11-08 14:04:30 -0800 (Wed, 08 Nov 2006) Log Message: ----------- Remove outdated "Docs\Developers\WinMerge files*" Modified Paths: -------------- trunk/Docs/Developers/Changes.txt Removed Paths: ------------- trunk/Docs/Developers/WinMerge files (Web format)/ trunk/Docs/Developers/WinMerge files.pdf trunk/Docs/Developers/WinMerge files.ppt Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-11-08 21:59:27 UTC (rev 3791) +++ trunk/Docs/Developers/Changes.txt 2006-11-08 22:04:30 UTC (rev 3792) @@ -1,3 +1,8 @@ +2006-11-08 Tim + Remove outdated "Docs\Developers\WinMerge files*" + Developers deleted files: WinMerge files.pdf, WinMerge files.ppt + Developers deleted directory: WinMerge files (Web format) + 2006-11-07 Kimmo Add building instructions for PCRE Developers: readme-developers.html Deleted: trunk/Docs/Developers/WinMerge files.pdf =================================================================== (Binary files differ) Deleted: trunk/Docs/Developers/WinMerge files.ppt =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-11-09 20:07:27
|
Revision: 3798 http://svn.sourceforge.net/winmerge/?rev=3798&view=rev Author: gerundt Date: 2006-11-09 12:07:04 -0800 (Thu, 09 Nov 2006) Log Message: ----------- PATCH: [ 1593009 ] Updated Organisation.txt Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/Organisation.txt Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-11-09 15:45:26 UTC (rev 3797) +++ trunk/Docs/Developers/Changes.txt 2006-11-09 20:07:04 UTC (rev 3798) @@ -1,3 +1,7 @@ +2006-11-09 Tim + PATCH: [ 1593009 ] Updated Organisation.txt + Developers: Organisation.txt + 2006-11-08 Tim Remove outdated "Docs\Developers\WinMerge files*" Developers deleted files: WinMerge files.pdf, WinMerge files.ppt Modified: trunk/Docs/Developers/Organisation.txt =================================================================== --- trunk/Docs/Developers/Organisation.txt 2006-11-09 15:45:26 UTC (rev 3797) +++ trunk/Docs/Developers/Organisation.txt 2006-11-09 20:07:04 UTC (rev 3798) @@ -2,37 +2,65 @@ WinMerge CVS organisation ========================= -WinMerge/ - - Docs/ - - Developers/ - - WinMerge files (Web format)/ - - Users/ +WinMerge + - ArchiveSupport + - Merge7z + - Merge7zInstaller + - Docs + - Developers + - Logos + - Users + - Languages - Manual + - Externals + - cppunit + - expat + - pcre + - scew - Filters - - InnoSetup - - Art - - Languages - - Runtimes - - MakePatchDirs - - MakeResDll - - Merge7z + - Installer + - InnoSetup + - Art + - Languages + - Runtimes - Plugins - - Src_Delphi/ - - Src_VB/ - - Src_VCPP/ + - dlls + - Src_Delphi + - Src_VB + - Src_VCPP - ShellExtension + - Languages - Src - Common - - Languages - diffutils - editlib + - ExpatMapLib + - Languages - res + - Testing + - CppUnit + - EditorTest + - selftests + - Tools + - diff2winmerge + - MakePatchDirs + - MakeResDll - Web - -WinMerge/ + +WinMerge/ - Module root, no files to here please. - + +WinMerge/ArchiveSupport/ + - Archive file support system. Currently includes 7-Zip based archive support. + +WinMerge/ArchiveSupport/Merge7z/ + - 7-Zip based archive file support. Integrates to WinMerge executable. + +WinMerge/ArchiveSupport/Merge7zInstaller/ + - Installer for archive file support using 7-Zip. Creates an executable + which installs needed files. + WinMerge/Docs/ - Directory containing documentation @@ -42,48 +70,57 @@ it contains a lot of useful information about practices of WinMerge developers. -WinMerge/Docs/Developers/WinMerge files (Web format)/ - - ??? +WinMerge/Docs/Logos/ + - WinMerge logos from Alexander Skinner. WinMerge/Docs/Users/ - Documentation files mostly for users interests +WinMerge/Docs/Users/Languages/ + - Readme.txt translations + WinMerge/Docs/Users/Manual/ - New 2.2.x userguide. Using Docbook/XML. - - readme.txt is changelog file +WinMerge/Externals/ + - External code modules WinMerge uses + +WinMerge/Externals/cppunit/ + - CppUnit unit-testing suite for C++ <http://cppunit.sourceforge.net/> + +WinMerge/Externals/expat/ + - Expat XML parser <http://expat.sourceforge.net/> + +WinMerge/Externals/pcre/ + - PCRE - Perl Compatible Regular Expression <http://www.pcre.org/> + +WinMerge/Externals/scew/ + - SCEW - Simple C Expat Wrapper <http://www.nongnu.org/scew/> + WinMerge/Filters/ - File filters are here -WinMerge/InnoSetup/ - -Source files used to create windows installer (with InnoSetup program) - - readme.txt is changelog file +WinMerge/Installer/ + - WinMerge installers. Currently we have only Innosetup-based installer. -WinMerge/InnoSetup/Art +WinMerge/Installer/InnoSetup/ + - Source files used to create windows installer (with InnoSetup program) + +WinMerge/Installer/InnoSetup/Art/ - Graphics files installer needs -WinMerge/InnoSetup/Languages +WinMerge/Installer/InnoSetup/Languages/ - Installer translations -WinMerge/InnoSetup/Runtimes +WinMerge/Installer/InnoSetup/Runtimes/ - Libraries for WinMerge added to install package -WinMerge/MakePatchDirs/ - - Source files for MakePatchDirs, a program to generate original & - altered directories - - Used to create patches to WinMerge source tree, for upload to - sourceforge patch board - -WinMerge/MakeResDll/ - - Source files for MakeResDll, a command line program used to - compile the WinMerge language dlls - -WinMerge/Merge7z/ - - 7Zip integration files. Needed to compile WinMerge executable. - WinMerge/Plugins/ - Plugins files. Also plugins documentation at the moment. +WinMerge/Plugins/dlls/ + - Compiled plugins files + WinMerge/Plugins/Src_Delphi/ - Sources for plugins made with Delphi @@ -96,25 +133,55 @@ WinMerge/ShellExtension/ - Files for ShellExtension for WinMerge. Needs also /Src/Common. +WinMerge/ShellExtension/Languages/ + - ShellExtension translations + WinMerge/Src/ - WinMerge executable sources. - - readme.txt is changelog file -WinMerge/Src/Common +WinMerge/Src/Common/ - Some common components shared by tools etc. -WinMerge/Src/Languages - - WinMerge translations sources. - -WinMerge/Src/diffutils +WinMerge/Src/diffutils/ - GNU/diffutils sources -WinMerge/Src/editlib +WinMerge/Src/editlib/ - CrystalEditor editor component sources. -WinMerge/Src/res +WinMerge/Src/ExpatMapLib/ + - Plugin to Expat XML parser for handling character encodings + +WinMerge/Src/Languages/ + - WinMerge translations sources. + +WinMerge/Src/res/ - Bitmaps, icons etc. +WinMerge/Testing/ + - WinMerge testing programs and files + +WinMerge/Testing/EditorTest/ + - Some tests for CrystalEditor + +WinMerge/Testing/selftests/ + - Tests using Perl run WinMerge executable to test compare functionality. + +WinMerge/Tools/ + - Tools needed/used with WinMerge development (e.g. language file compiler). + +WinMerge/Tools/diff2winmerge/ + - Commandline wrapper for WinMerge executable, offers + diffutils -style commandline switches (needed by Perl selftests). + +WinMerge/Tools/MakePatchDirs/ + - Source files for MakePatchDirs, a program to generate original & + altered directories + - Used to create patches to WinMerge source tree, for upload to + sourceforge patch board + +WinMerge/Tools/MakeResDll/ + - Source files for MakeResDll, a command line program used to + compile the WinMerge language dlls + WinMerge/Web/ - Homepages. - - readme.txt is changelog file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-11-09 20:17:32
|
Revision: 3800 http://svn.sourceforge.net/winmerge/?rev=3800&view=rev Author: gerundt Date: 2006-11-09 12:17:21 -0800 (Thu, 09 Nov 2006) Log Message: ----------- BUG: [ 1593013 ] Two "InnoSetup" readme's in DevDocs Modified Paths: -------------- trunk/Docs/Developers/Changes.txt Removed Paths: ------------- trunk/Docs/Developers/readme-developers-InnoSetup.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-11-09 20:08:28 UTC (rev 3799) +++ trunk/Docs/Developers/Changes.txt 2006-11-09 20:17:21 UTC (rev 3800) @@ -1,6 +1,8 @@ 2006-11-09 Tim PATCH: [ 1593009 ] Updated Organisation.txt Developers: Organisation.txt + BUG: [ 1593013 ] Two "InnoSetup" readme's in DevDocs + Developers deleted files: readme-developers-InnoSetup.html 2006-11-08 Tim Remove outdated "Docs\Developers\WinMerge files*" Deleted: trunk/Docs/Developers/readme-developers-InnoSetup.html =================================================================== --- trunk/Docs/Developers/readme-developers-InnoSetup.html 2006-11-09 20:08:28 UTC (rev 3799) +++ trunk/Docs/Developers/readme-developers-InnoSetup.html 2006-11-09 20:17:21 UTC (rev 3800) @@ -1,149 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> -<html> -<head> - <title>Building WinMerge Installer</title> - <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> - <style type="text/css"> - <!-- - h3 { - padding: 2px; - border-left: 4px solid #FFCC00; - border-bottom: 1px solid #FFCC00; - } - --> - </style> -</head> -<body> - -<h2>Building WinMerge Installer</h2> - -<h3>Needed programs:</h3> -<ul> - <li> - <a href="http://www.jrsoftware.org/">Inno Setup</a> version 5.1.5. - </li> - <li> - <a href="http://www.istool.org/">ISTool</a> <strong>recommended</strong> - - great help managing Inno Setup installer scripts - </li> -</ul> - -<p>There is download package called "QuickStart Pack" available in Inno Setup -downloads. It contains all needed components in one installer.</p> - -<h3>Installer script:</h3> -Installer script is in <code>InnoSetup</code> folder: <code>WinMerge.iss</code> - -<h3>Checklist:</h3> -<ul> - <li> - Installer reads version number from <code>WinMerge.exe</code>. So make - sure you have version resource correctly set.<br> - You can use script to set version info into Merge.rc and all language.rc files: - just run <code>Src/SetResourceVersions.bat</code> - it asks version number to set. - </li> - <li> - Installer checks that files listed are present. But some files are - included as folder (like <code>/Plugins/Dlls</code>) or as filemask (like - <code>*.flt</code>) so take extra care to make sure all needed files - are present in locations shown below. - </li> -</ul> - -<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> - -<p>Copy or move the files into the following layout:</p> - -<ul> - <li> - <code>Build/</code> - <ul> - <li> - <code>Languages</code> - <ul> - <li><code>*.lang</code></li> - </ul> - </li> - <li> - <code>Manual/htmlhelp</code> - <ul> - <li><code>WinMerge.chm</code></li> - </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> - <li><code>WinMergeU.exe</code></li> - <li><code>WinMergeU.exe.Manifest</code></li> - </ul> - </li> - </ul> - </li> - <li> - <code>Docs/</code> - <ul> - <li> - <code>Users</code> - <ul> - <li><em>Copy the entire <code>Docs/Users</code> folder to here</em></li> - </ul> - </li> - </ul> - </li> - <li> - <code>Filters/</code> - <ul> - <li><code>FileFilter.tmpl</code></li> - <li><code>*.flt</code></li> - </ul> - </li> - <li> - <code>InnoSetup/</code> - <ul> - <li><em>Copy the entire InnoSetup source folder to here</em></li> - </ul> - </li> -</ul> - -<h3>Running Inno Setup to create installer</h3> - -<p><code>WinMerge.iss</code> (in <code>InnoSetup</code> folder) -is script used to create WinMerge installer.</p> - -<p>Rest of this section assumes ISTool is used. If not, then refer to -InnoSetup manual for creating installer from script.</p> - -<ol> - <li> - Start ISTool and load <code>WinMerge.iss</code> - </li> - <li> - Select "Project->Verify Files..." from ISTool menu to verify - all needed files are present and in correct directories. Copy missing - files to correct directories before continuing. - </li> - <li> - Select "Project->Compile Setup" from ISTool menu to create - installer. This takes a while... - </li> -</ol> - -<p>If compile succeeds you have <code>WinMerge-[version]-Setup.exe</code> in -folder <code>/Build</code>.</p> - -<p><strong>Test installer!</strong></p> - -</body> -</html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-12-04 20:29:14
|
Revision: 3907 http://svn.sourceforge.net/winmerge/?rev=3907&view=rev Author: kimmov Date: 2006-12-04 12:23:38 -0800 (Mon, 04 Dec 2006) Log Message: ----------- Update SVN URLs Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-Subversion.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2006-12-04 18:19:07 UTC (rev 3906) +++ trunk/Docs/Developers/Changes.txt 2006-12-04 20:23:38 UTC (rev 3907) @@ -1,3 +1,7 @@ +2006-12-04 Kimmo + Update SVN URLs + Developers: readme-Subversion.html + 2006-11-09 Tim PATCH: [ 1593009 ] Updated Organisation.txt Developers: Organisation.txt Modified: trunk/Docs/Developers/readme-Subversion.html =================================================================== --- trunk/Docs/Developers/readme-Subversion.html 2006-12-04 18:19:07 UTC (rev 3906) +++ trunk/Docs/Developers/readme-Subversion.html 2006-12-04 20:23:38 UTC (rev 3907) @@ -68,18 +68,18 @@ <h3>Repository URLs</h3> <p>WinMerge Subversion repository URL is:<br> -<code>https://svn.sourceforge.net/svnroot/winmerge</code> +<code>https://winmerge.svn.sourceforge.net/svnroot/winmerge</code> </p> <p>Using above URL will checkout all branches and tags also. WinMerge development happens in <i>trunk</i> and URL is:<br> -<code>https://svn.sourceforge.net/svnroot/winmerge/trunk</code> +<code>https://winmerge.svn.sourceforge.net/svnroot/winmerge/trunk</code> </p> <p>Branches are in separate folder:<br> -<code>https://svn.sourceforge.net/svnroot/winmerge/branches</code><br> +<code>https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches</code><br> Current branches are: <ul> <li>2.6 release branch<br> - <code>https://svn.sourceforge.net/svnroot/winmerge/branches/R2_6</code></li> + <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> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2007-02-12 22:20:51
|
Revision: 4106 http://svn.sourceforge.net/winmerge/?rev=4106&view=rev Author: gerundt Date: 2007-02-12 14:20:32 -0800 (Mon, 12 Feb 2007) Log Message: ----------- PATCH: [ 1658347 ] Add note about PSDK paths and VC into dev-readme Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-developers.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2007-02-12 16:38:41 UTC (rev 4105) +++ trunk/Docs/Developers/Changes.txt 2007-02-12 22:20:32 UTC (rev 4106) @@ -1,3 +1,7 @@ +2007-02-12 Tim + PATCH: [ 1658347 ] Add note about PSDK paths and VC into dev-readme + Developers: readme-developers.html + 2006-12-04 Kimmo Update SVN URLs Developers: readme-Subversion.html Modified: trunk/Docs/Developers/readme-developers.html =================================================================== --- trunk/Docs/Developers/readme-developers.html 2007-02-12 16:38:41 UTC (rev 4105) +++ trunk/Docs/Developers/readme-developers.html 2007-02-12 22:20:32 UTC (rev 4106) @@ -102,6 +102,10 @@ <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> +<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 +the "<em>Platform SDK</em>" start menu folder.</p> <h4>Project files</h4> <p>Project file for WinMerge executable (in <code>/Src</code>) and other projects like This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <ki...@us...> - 2007-02-19 21:41:02
|
Revision: 4116 http://svn.sourceforge.net/winmerge/?rev=4116&view=rev Author: kimmov Date: 2007-02-19 13:41:00 -0800 (Mon, 19 Feb 2007) Log Message: ----------- Bugs 1663767-1663770, 1663776, 1663778: typo/grammar fixes. Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-developers.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2007-02-19 17:23:57 UTC (rev 4115) +++ trunk/Docs/Developers/Changes.txt 2007-02-19 21:41:00 UTC (rev 4116) @@ -1,3 +1,7 @@ +2007-02-19 Kimmo + Bugs 1663767-1663770, 1663776, 1663778: typo/grammar fixes. + Developers: readme-developers.html + 2007-02-12 Tim PATCH: [ 1658347 ] Add note about PSDK paths and VC into dev-readme Developers: readme-developers.html Modified: trunk/Docs/Developers/readme-developers.html =================================================================== --- trunk/Docs/Developers/readme-developers.html 2007-02-19 17:23:57 UTC (rev 4115) +++ trunk/Docs/Developers/readme-developers.html 2007-02-19 21:41:00 UTC (rev 4116) @@ -80,7 +80,7 @@ <h4>Libraries</h4> <p>WinMerge executable depends on Expat XML parser and SCEW wrapper libraries. Both are in -source tree, but need to be compiled before compiling WinMerge executable.</p> +the source tree, but need to be compiled before compiling WinMerge executable.</p> <h4>Additional requirements (out of source tree)</h4> <ul> @@ -126,7 +126,7 @@ <p>Visual Studio project file for MSVC6 comes with WinMerge sources. Newer versions of Visual Studio can open that file too, they just ask if one wants to convert to new version. Reason we don't ship project files for all Visual Studio versions is we have no resources -to keep all versions up to date. People can't test all versions themselves and easily forgot +to keep all versions up to date. People can't test all versions themselves and easily forget to update at least one file. So we easily end up in situation when there is no properly working project file at all...</p> @@ -135,8 +135,8 @@ <p>NOTE: There might be problems compiling/debugging with Visual Studio 2003 when using HTML Help WorkShop from Platform SDK in Visual Studio directory. Download and -install HTML Workhop as stand-alone and include headers and libraries from standalone -directory. Propable cause is that including files from Platform SDK directories breaks +install HTML Workshop as stand-alone and include headers and libraries from standalone +directory. Probable cause is that including files from Platform SDK directories breaks things.</p> <h4>Compiling expat</h4> @@ -223,7 +223,7 @@ subversion, or of a source zip from a distribution).</p> <p><b>DO NOT</b> submit a patch against year-old version. Latest experimental/beta version - is at max few weeks old. Stable releases should only get bug fixes. And even then bugfix + is at most a few weeks old. Stable releases should only get bug fixes. And even then bugfix is usually first applied to development versions. So there should be no reason to submit a patch against old version.</p> </li> @@ -435,7 +435,7 @@ <p> Now that 2.4 release has translations for Shell Extension we must also carefully - version it. If we don't update version number installer won't install updated version. + version it. If we don't update version number, installer won't install updated version. There are no scripts or other tools to update version number, it must be done by hand to <code>ShellExtension.rc</code> file (make sure you update all four numbers!). Version numbers follow the rule: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2007-02-19 22:32:22
|
Revision: 4117 http://svn.sourceforge.net/winmerge/?rev=4117&view=rev Author: kimmov Date: 2007-02-19 14:32:17 -0800 (Mon, 19 Feb 2007) Log Message: ----------- Add short instructions for Visual Studio 2005 Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-developers.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2007-02-19 21:41:00 UTC (rev 4116) +++ trunk/Docs/Developers/Changes.txt 2007-02-19 22:32:17 UTC (rev 4117) @@ -1,6 +1,8 @@ 2007-02-19 Kimmo Bugs 1663767-1663770, 1663776, 1663778: typo/grammar fixes. Developers: readme-developers.html + Add short instructions for Visual Studio 2005 + Developers: readme-developers.html 2007-02-12 Tim PATCH: [ 1658347 ] Add note about PSDK paths and VC into dev-readme Modified: trunk/Docs/Developers/readme-developers.html =================================================================== --- trunk/Docs/Developers/readme-developers.html 2007-02-19 21:41:00 UTC (rev 4116) +++ trunk/Docs/Developers/readme-developers.html 2007-02-19 22:32:17 UTC (rev 4117) @@ -191,7 +191,19 @@ <li>Plugin dlls : Unicode Release MinDependency</li> </ul> +<h4>Visual Studio 2005</h4> +<p>When VC6 project file (.dsp) is converted to Visual Studio 2005 project, it does not +compile correctly as is. The problem is Visual Studio 2005 automatically generates and +embeds manifest file for the executable. And as WinMerge resource file includes manifest +file there are conflicts.</p> +<p>The easiest way to fix the compile is to disable VS2005 from creating and embedding +the manifest file. From project properties: +<ul> + <li>disable Linker / Manifest File / Generate Manifest (set to "No")</li> + <li>disable Manifest Tool / Input and Output/ Embed Manifest (set to "No") +</ul></p> + <h3><a name="Code_changes">Code changes</a></h3> <p>Please follow these guidelines when submitting changes to WinMerge sources This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2007-02-21 16:22:00
|
Revision: 4122 http://svn.sourceforge.net/winmerge/?rev=4122&view=rev Author: kimmov Date: 2007-02-21 08:21:44 -0800 (Wed, 21 Feb 2007) Log Message: ----------- Add pcre.dll and InnoSetup/Runtimes to installer doc Modified Paths: -------------- trunk/Docs/Developers/Changes.txt trunk/Docs/Developers/readme-InnoSetup.html Modified: trunk/Docs/Developers/Changes.txt =================================================================== --- trunk/Docs/Developers/Changes.txt 2007-02-21 15:38:52 UTC (rev 4121) +++ trunk/Docs/Developers/Changes.txt 2007-02-21 16:21:44 UTC (rev 4122) @@ -1,3 +1,7 @@ +2007-02-21 Kimmo + Add pcre.dll and InnoSetup/Runtimes to installer doc + Developers: readme-InnoSetup.html + 2007-02-19 Kimmo Bugs 1663767-1663770, 1663776, 1663778: typo/grammar fixes. Developers: readme-developers.html Modified: trunk/Docs/Developers/readme-InnoSetup.html =================================================================== --- trunk/Docs/Developers/readme-InnoSetup.html 2007-02-21 15:38:52 UTC (rev 4121) +++ trunk/Docs/Developers/readme-InnoSetup.html 2007-02-21 16:21:44 UTC (rev 4122) @@ -107,6 +107,12 @@ </ul> </li> <li> + <code>pcre/</code> + <ul> + <li><code>pcre.dll</code></li> + </ul> + </li> + <li> <code>ShellExtensionX64/</code> <ul> <li><code>ShellExtensionX64.dll</code></li> @@ -133,9 +139,20 @@ </ul> </li> <li> - <code>Installer/InnoSetup/</code> + <code>Installer/</code> <ul> - <li><em>Copy the entire InnoSetup source folder to here</em></li> + <li> + <code>InnoSetup/</code> + <ul> + <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> </ul> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |