|
From: <ki...@us...> - 2006-09-24 08:50:23
|
Revision: 3630
http://svn.sourceforge.net/winmerge/?rev=3630&view=rev
Author: kimmov
Date: 2006-09-24 01:50:16 -0700 (Sun, 24 Sep 2006)
Log Message:
-----------
Add 2.6 branch URL
Modified Paths:
--------------
branches/R2_6/Docs/Developers/Changes.txt
branches/R2_6/Docs/Developers/readme-Subversion.html
Modified: branches/R2_6/Docs/Developers/Changes.txt
===================================================================
--- branches/R2_6/Docs/Developers/Changes.txt 2006-09-24 08:49:06 UTC (rev 3629)
+++ branches/R2_6/Docs/Developers/Changes.txt 2006-09-24 08:50:16 UTC (rev 3630)
@@ -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: branches/R2_6/Docs/Developers/readme-Subversion.html
===================================================================
--- branches/R2_6/Docs/Developers/readme-Subversion.html 2006-09-24 08:49:06 UTC (rev 3629)
+++ branches/R2_6/Docs/Developers/readme-Subversion.html 2006-09-24 08:50:16 UTC (rev 3630)
@@ -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:53:13
|
Revision: 3632
http://svn.sourceforge.net/winmerge/?rev=3632&view=rev
Author: kimmov
Date: 2006-09-24 01:53:00 -0700 (Sun, 24 Sep 2006)
Log Message:
-----------
Clarify tagging releases to Subversion repository (no tagging for experimentals)
Modified Paths:
--------------
branches/R2_6/Docs/Developers/Changes.txt
branches/R2_6/Docs/Developers/readme-developers.html
Modified: branches/R2_6/Docs/Developers/Changes.txt
===================================================================
--- branches/R2_6/Docs/Developers/Changes.txt 2006-09-24 08:51:44 UTC (rev 3631)
+++ branches/R2_6/Docs/Developers/Changes.txt 2006-09-24 08:53:00 UTC (rev 3632)
@@ -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: branches/R2_6/Docs/Developers/readme-developers.html
===================================================================
--- branches/R2_6/Docs/Developers/readme-developers.html 2006-09-24 08:51:44 UTC (rev 3631)
+++ branches/R2_6/Docs/Developers/readme-developers.html 2006-09-24 08:53:00 UTC (rev 3632)
@@ -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:37:21
|
Revision: 3636
http://svn.sourceforge.net/winmerge/?rev=3636&view=rev
Author: kimmov
Date: 2006-09-25 11:37:15 -0700 (Mon, 25 Sep 2006)
Log Message:
-----------
Add info about different PSDK versions and components needed
Modified Paths:
--------------
branches/R2_6/Docs/Developers/Changes.txt
branches/R2_6/Docs/Developers/readme-developers.html
Modified: branches/R2_6/Docs/Developers/Changes.txt
===================================================================
--- branches/R2_6/Docs/Developers/Changes.txt 2006-09-25 18:35:58 UTC (rev 3635)
+++ branches/R2_6/Docs/Developers/Changes.txt 2006-09-25 18:37:15 UTC (rev 3636)
@@ -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: branches/R2_6/Docs/Developers/readme-developers.html
===================================================================
--- branches/R2_6/Docs/Developers/readme-developers.html 2006-09-25 18:35:58 UTC (rev 3635)
+++ branches/R2_6/Docs/Developers/readme-developers.html 2006-09-25 18:37:15 UTC (rev 3636)
@@ -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: <ge...@us...> - 2006-11-03 16:25:42
|
Revision: 3762
http://svn.sourceforge.net/winmerge/?rev=3762&view=rev
Author: gerundt
Date: 2006-11-03 08:25:32 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
PATCH: [ 1589578 ] Add <h4> style to readme-developers.html
Modified Paths:
--------------
branches/R2_6/Docs/Developers/Changes.txt
branches/R2_6/Docs/Developers/readme-developers.html
Modified: branches/R2_6/Docs/Developers/Changes.txt
===================================================================
--- branches/R2_6/Docs/Developers/Changes.txt 2006-11-03 16:22:10 UTC (rev 3761)
+++ branches/R2_6/Docs/Developers/Changes.txt 2006-11-03 16:25:32 UTC (rev 3762)
@@ -1,3 +1,7 @@
+2006-11-03 Tim
+ PATCH: [ 1589578 ] Add <h4> style to readme-developers.html
+ Developers: readme-developers.html
+
2006-09-25 Kimmo
Add info about different PSDK versions and components needed
Developers: readme-developers.html
Modified: branches/R2_6/Docs/Developers/readme-developers.html
===================================================================
--- branches/R2_6/Docs/Developers/readme-developers.html 2006-11-03 16:22:10 UTC (rev 3761)
+++ branches/R2_6/Docs/Developers/readme-developers.html 2006-11-03 16:25:32 UTC (rev 3762)
@@ -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: <ge...@us...> - 2006-11-08 22:05:30
|
Revision: 3793
http://svn.sourceforge.net/winmerge/?rev=3793&view=rev
Author: gerundt
Date: 2006-11-08 14:05:18 -0800 (Wed, 08 Nov 2006)
Log Message:
-----------
Remove outdated "Docs\Developers\WinMerge files*"
Modified Paths:
--------------
branches/R2_6/Docs/Developers/Changes.txt
Removed Paths:
-------------
branches/R2_6/Docs/Developers/WinMerge files (Web format)/
branches/R2_6/Docs/Developers/WinMerge files.pdf
branches/R2_6/Docs/Developers/WinMerge files.ppt
Modified: branches/R2_6/Docs/Developers/Changes.txt
===================================================================
--- branches/R2_6/Docs/Developers/Changes.txt 2006-11-08 22:04:30 UTC (rev 3792)
+++ branches/R2_6/Docs/Developers/Changes.txt 2006-11-08 22:05:18 UTC (rev 3793)
@@ -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-03 Tim
PATCH: [ 1589578 ] Add <h4> style to readme-developers.html
Developers: readme-developers.html
Deleted: branches/R2_6/Docs/Developers/WinMerge files.pdf
===================================================================
(Binary files differ)
Deleted: branches/R2_6/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:08:38
|
Revision: 3799
http://svn.sourceforge.net/winmerge/?rev=3799&view=rev
Author: gerundt
Date: 2006-11-09 12:08:28 -0800 (Thu, 09 Nov 2006)
Log Message:
-----------
PATCH: [ 1593009 ] Updated Organisation.txt
Modified Paths:
--------------
branches/R2_6/Docs/Developers/Changes.txt
branches/R2_6/Docs/Developers/Organisation.txt
Modified: branches/R2_6/Docs/Developers/Changes.txt
===================================================================
--- branches/R2_6/Docs/Developers/Changes.txt 2006-11-09 20:07:04 UTC (rev 3798)
+++ branches/R2_6/Docs/Developers/Changes.txt 2006-11-09 20:08:28 UTC (rev 3799)
@@ -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: branches/R2_6/Docs/Developers/Organisation.txt
===================================================================
--- branches/R2_6/Docs/Developers/Organisation.txt 2006-11-09 20:07:04 UTC (rev 3798)
+++ branches/R2_6/Docs/Developers/Organisation.txt 2006-11-09 20:08:28 UTC (rev 3799)
@@ -2,37 +2,60 @@
WinMerge CVS organisation
=========================
-WinMerge/
- - Docs/
- - Developers/
- - WinMerge files (Web format)/
- - Users/
+WinMerge
+ - ArchiveSupport
+ - Merge7z
+ - Merge7zInstaller
+ - Docs
+ - Developers
+ - Logos
+ - Users
+ - Languages
- Manual
- 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
+ - ExpatLib
+ - ExpatMapLib
+ - Languages
- res
+ - Testing
+ - 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 +65,42 @@
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/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 +113,58 @@
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/ExpatLib/
+ - Partial sources for Expat XML parser
+
+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:18:25
|
Revision: 3801
http://svn.sourceforge.net/winmerge/?rev=3801&view=rev
Author: gerundt
Date: 2006-11-09 12:18:15 -0800 (Thu, 09 Nov 2006)
Log Message:
-----------
BUG: [ 1593013 ] Two "InnoSetup" readme's in DevDocs
Modified Paths:
--------------
branches/R2_6/Docs/Developers/Changes.txt
Removed Paths:
-------------
branches/R2_6/Docs/Developers/readme-developers-InnoSetup.html
Modified: branches/R2_6/Docs/Developers/Changes.txt
===================================================================
--- branches/R2_6/Docs/Developers/Changes.txt 2006-11-09 20:17:21 UTC (rev 3800)
+++ branches/R2_6/Docs/Developers/Changes.txt 2006-11-09 20:18:15 UTC (rev 3801)
@@ -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: branches/R2_6/Docs/Developers/readme-developers-InnoSetup.html
===================================================================
--- branches/R2_6/Docs/Developers/readme-developers-InnoSetup.html 2006-11-09 20:17:21 UTC (rev 3800)
+++ branches/R2_6/Docs/Developers/readme-developers-InnoSetup.html 2006-11-09 20:18:15 UTC (rev 3801)
@@ -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: 3908
http://svn.sourceforge.net/winmerge/?rev=3908&view=rev
Author: kimmov
Date: 2006-12-04 12:24:38 -0800 (Mon, 04 Dec 2006)
Log Message:
-----------
Update SVN URLs
Modified Paths:
--------------
branches/R2_6/Docs/Developers/Changes.txt
branches/R2_6/Docs/Developers/readme-Subversion.html
Modified: branches/R2_6/Docs/Developers/Changes.txt
===================================================================
--- branches/R2_6/Docs/Developers/Changes.txt 2006-12-04 20:23:38 UTC (rev 3907)
+++ branches/R2_6/Docs/Developers/Changes.txt 2006-12-04 20:24:38 UTC (rev 3908)
@@ -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: branches/R2_6/Docs/Developers/readme-Subversion.html
===================================================================
--- branches/R2_6/Docs/Developers/readme-Subversion.html 2006-12-04 20:23:38 UTC (rev 3907)
+++ branches/R2_6/Docs/Developers/readme-Subversion.html 2006-12-04 20:24:38 UTC (rev 3908)
@@ -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-03-15 20:37:41
|
Revision: 4166
http://svn.sourceforge.net/winmerge/?rev=4166&view=rev
Author: gerundt
Date: 2007-03-15 13:37:36 -0700 (Thu, 15 Mar 2007)
Log Message:
-----------
PATCH: [ 1681099 ] Add "Plugins" folder to installer doc
Modified Paths:
--------------
branches/R2_6/Docs/Developers/Changes.txt
branches/R2_6/Docs/Developers/readme-InnoSetup.html
Modified: branches/R2_6/Docs/Developers/Changes.txt
===================================================================
--- branches/R2_6/Docs/Developers/Changes.txt 2007-03-15 20:37:04 UTC (rev 4165)
+++ branches/R2_6/Docs/Developers/Changes.txt 2007-03-15 20:37:36 UTC (rev 4166)
@@ -1,3 +1,7 @@
+2007-03-15 Tim
+ PATCH: [ 1681099 ] Add "Plugins" folder to installer doc
+ Developers: readme-InnoSetup.html
+
2006-12-04 Kimmo
Update SVN URLs
Developers: readme-Subversion.html
Modified: branches/R2_6/Docs/Developers/readme-InnoSetup.html
===================================================================
--- branches/R2_6/Docs/Developers/readme-InnoSetup.html 2007-03-15 20:37:04 UTC (rev 4165)
+++ branches/R2_6/Docs/Developers/readme-InnoSetup.html 2007-03-15 20:37:36 UTC (rev 4166)
@@ -88,7 +88,6 @@
<ul>
<li><code>ShellExtensionU.dll</code></li>
<li><code>WinMergeU.exe</code></li>
- <li><code>WinMergeU.exe.Manifest</code></li>
</ul>
</li>
<li>
@@ -123,6 +122,17 @@
<li><em>Copy the entire InnoSetup source folder to here</em></li>
</ul>
</li>
+ <li>
+ <code>Plugins/</code>
+ <ul>
+ <li>
+ <code>dlls/</code>
+ <ul>
+ <li><em>Copy the entire Plugins/dlls folder to here</em></li>
+ </ul>
+ </li>
+ </ul>
+ </li>
</ul>
<p><strong>NOTE</strong><br>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
