You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ge...@us...> - 2010-10-02 14:32:00
|
Revision: 7294
http://winmerge.svn.sourceforge.net/winmerge/?rev=7294&view=rev
Author: gerundt
Date: 2010-10-02 14:31:53 +0000 (Sat, 02 Oct 2010)
Log Message:
-----------
PATCH: [ 3079966 ] Installer: Don't install quick launch icon for Windows 7
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-10-02 14:24:45 UTC (rev 7293)
+++ trunk/Docs/Users/ChangeLog.txt 2010-10-02 14:31:53 UTC (rev 7294)
@@ -5,6 +5,8 @@
WinMerge 2.15.1
Update version number in trunk
+ Installer: Remove Uninstall shortcut from start menu folder (#3076909)
+ Installer: Don't install quick launch icon for Windows 7 (#3079966)
WinMerge 2.13.14 - 2010-09-15 (r7263)
Update release compiler and runtimes to VS2008
@@ -18,7 +20,6 @@
Comment filtering improvement (#3034083)
Allow giving encoding name as custom codepage (#2813825, #3010934)
Installer: Drop Windows 9x/ME/NT4 support from InnoSetup (#3025078)
- Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed
in status bar (#3025855)
Bugfix: Options dialog didn't update when importing settings
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2010-10-02 14:24:45 UTC (rev 7293)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2010-10-02 14:31:53 UTC (rev 7294)
@@ -272,7 +272,7 @@
Name: TortoiseSVN; Description: {cm:IntegrateTortoiseSVN}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseSVNInstalled; MinVersion: 0,5.0.2195sp3
Name: ClearCase; Description: {cm:IntegrateClearCase}; GroupDescription: {cm:OptionalFeatures}; Check: ClearCaseInstalled
Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
-Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}
+Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; OnlyBelowVersion: 0,6.1
[InstallDelete]
; Diff.txt is a file left over from previous versions of WinMerge (before version 2.0), we just delete it to be nice.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-02 14:24:52
|
Revision: 7293
http://winmerge.svn.sourceforge.net/winmerge/?rev=7293&view=rev
Author: gerundt
Date: 2010-10-02 14:24:45 +0000 (Sat, 02 Oct 2010)
Log Message:
-----------
Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Installer/InnoSetup/WinMerge.iss
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-02 11:05:38 UTC (rev 7292)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-02 14:24:45 UTC (rev 7293)
@@ -10,6 +10,7 @@
New translation: Serbian (#3017674, #3065119)
Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime
libraries installer (#3070254)
+ Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Bugfix: WinMerge was vulnerable to DLL hijacking as described in
Microsoft Security Advisory (2269637) (#33056008)
Bugfix: Location pane focus enabled "Save" (#3022292)
Modified: branches/R2_14/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-02 11:05:38 UTC (rev 7292)
+++ branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-02 14:24:45 UTC (rev 7293)
@@ -330,6 +330,9 @@
;This removes the desktop icon in case the user chooses not to install it after previously having it installed
Name: {commondesktop}\WinMerge.lnk; Type: files; Check: not IsTaskSelected('DesktopIcon')
+;Removes the Uninstall icon from the start menu...
+Name: {group}\{cm:UninstallProgram,WinMerge}.lnk; Type: files;
+
;Remove ANSI executable link from start menu for NT-based Windows versions
;This was installed earlier, but not anymore.
Name: {group}\WinMerge (ANSI).lnk; Type: files; MinVersion: 0,4
@@ -458,7 +461,6 @@
Name: {group}\WinMerge; Filename: {app}\{code:ExeName}
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe.txt; IconFileName: {win}\NOTEPAD.EXE
Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm
-Name: {group}\{cm:UninstallProgram,WinMerge}; Filename: {uninstallexe}
Name: {group}\{cm:ProgramOnTheWeb,WinMerge}; Filename: http://winmerge.org/
;Link to translated ReadMe in Start Menu
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-02 11:05:45
|
Revision: 7292
http://winmerge.svn.sourceforge.net/winmerge/?rev=7292&view=rev
Author: gerundt
Date: 2010-10-02 11:05:38 +0000 (Sat, 02 Oct 2010)
Log Message:
-----------
Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-09-30 05:57:20 UTC (rev 7291)
+++ trunk/Docs/Users/ChangeLog.txt 2010-10-02 11:05:38 UTC (rev 7292)
@@ -18,6 +18,7 @@
Comment filtering improvement (#3034083)
Allow giving encoding name as custom codepage (#2813825, #3010934)
Installer: Drop Windows 9x/ME/NT4 support from InnoSetup (#3025078)
+ Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed
in status bar (#3025855)
Bugfix: Options dialog didn't update when importing settings
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2010-09-30 05:57:20 UTC (rev 7291)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2010-10-02 11:05:38 UTC (rev 7292)
@@ -330,6 +330,9 @@
;This removes the desktop icon in case the user chooses not to install it after previously having it installed
Name: {commondesktop}\WinMerge.lnk; Type: files; Check: not IsTaskSelected('DesktopIcon')
+;Removes the Uninstall icon from the start menu...
+Name: {group}\{cm:UninstallProgram,WinMerge}.lnk; Type: files;
+
;Remove ANSI executable link from start menu for NT-based Windows versions
;This was installed earlier, but not anymore.
Name: {group}\WinMerge (ANSI).lnk; Type: files; MinVersion: 0,4
@@ -453,7 +456,6 @@
Name: {group}\WinMerge; Filename: {app}\{code:ExeName}
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe.txt; IconFileName: {win}\NOTEPAD.EXE
Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm
-Name: {group}\{cm:UninstallProgram,WinMerge}; Filename: {uninstallexe}
Name: {group}\{cm:ProgramOnTheWeb,WinMerge}; Filename: http://winmerge.org/
;Link to translated ReadMe in Start Menu
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-09-30 05:57:26
|
Revision: 7291
http://winmerge.svn.sourceforge.net/winmerge/?rev=7291&view=rev
Author: gerundt
Date: 2010-09-30 05:57:20 +0000 (Thu, 30 Sep 2010)
Log Message:
-----------
PATCH: [ 3078012 ] Drop text encoding note from manual
Modified Paths:
--------------
branches/R2_14/Docs/Users/Manual/Command_line.xml
branches/R2_14/Docs/Users/Manual/Compare_dirs.xml
branches/R2_14/Docs/Users/Manual/Compare_files.xml
branches/R2_14/Docs/Users/Manual/Install.xml
branches/R2_14/Docs/Users/Manual/WinMerge_help.xml
Removed Paths:
-------------
branches/R2_14/Docs/Users/Manual/Text_encoding.xml
Modified: branches/R2_14/Docs/Users/Manual/Command_line.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/Command_line.xml 2010-09-30 05:48:40 UTC (rev 7290)
+++ branches/R2_14/Docs/Users/Manual/Command_line.xml 2010-09-30 05:57:20 UTC (rev 7291)
@@ -16,13 +16,13 @@
<para>Use one of these formats for the WinMerge command:</para>
<para><cmdsynopsis sepchar=" ">
- <command>WinMerge<optional>U</optional></command>
+ <command>WinMergeU</command>
<arg choice="opt" rep="norepeat"><option>/?</option></arg>
</cmdsynopsis></para>
<para><cmdsynopsis sepchar=" ">
- <command>WinMerge<optional>U</optional></command>
+ <command>WinMergeU</command>
<arg choice="opt" rep="norepeat"><option>/r</option></arg>
@@ -66,36 +66,12 @@
</cmdsynopsis></para>
<cmdsynopsis sepchar=" ">
- <command>WinMerge<optional>U</optional></command>
+ <command>WinMergeU</command>
<arg choice="plain"
rep="norepeat"><replaceable>conflictfile</replaceable></arg>
</cmdsynopsis>
- <para>The command has two forms:</para>
-
- <variablelist>
- <varlistentry>
- <term>WinMergeU</term>
-
- <listitem>
- <para>Use <command>WinMergeU</command> if you are running the Unicode
- version of WinMerge, typically installed on recent Windows
- systems.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>WinMerge</term>
-
- <listitem>
- <para>Use <command>WinMerge</command> only if you are running the ANSI
- version of WinMerge, typically installed only on Windows
- 9<replaceable>x</replaceable> and WME systems.</para>
- </listitem>
- </varlistentry>
- </variablelist>
-
<para>Entering the command with no parameters or pathnames simply opens the
WinMerge window. Parameters are prefixed with either a forward slash (
<literal>/</literal> ) or dash ( <literal>-</literal> ) character. Pathnames
Modified: branches/R2_14/Docs/Users/Manual/Compare_dirs.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/Compare_dirs.xml 2010-09-30 05:48:40 UTC (rev 7290)
+++ branches/R2_14/Docs/Users/Manual/Compare_dirs.xml 2010-09-30 05:57:20 UTC (rev 7291)
@@ -7,9 +7,6 @@
<para>This topic describes how to compare and merge folders using the Folder
Compare window.</para>
- <xi:include href="Text_encoding.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
-
<section id="Compare_dirs_starting">
<title>Starting a folder compare operation</title>
Modified: branches/R2_14/Docs/Users/Manual/Compare_files.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/Compare_files.xml 2010-09-30 05:48:40 UTC (rev 7290)
+++ branches/R2_14/Docs/Users/Manual/Compare_files.xml 2010-09-30 05:57:20 UTC (rev 7291)
@@ -8,9 +8,6 @@
compare and merge files. To understand the basic concepts about differences
used here, we suggest you read <xref linkend="Intro_diffs" /> first.</para>
- <xi:include href="Text_encoding.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
-
<section id="Compare_files_starting">
<title>Starting a file compare operation</title>
Modified: branches/R2_14/Docs/Users/Manual/Install.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/Install.xml 2010-09-30 05:48:40 UTC (rev 7290)
+++ branches/R2_14/Docs/Users/Manual/Install.xml 2010-09-30 05:57:20 UTC (rev 7291)
@@ -33,7 +33,7 @@
<note>
<para>The installer requires Administrator user privileges in Windows
- NT4/2000/XP. If you don't have admin user privileges, you can install
+ 2000 or newer. If you don't have admin user privileges, you can install
WinMerge by unzipping from an archive file (see <xref
linkend="InstallFromArchive" />).</para>
</note>
@@ -82,9 +82,7 @@
</indexterm></term>
<listitem>
- <para>WinMerge executable (<filename>WinMerge.exe</filename> on
- Windows 9X and WME; <filename>WinMergeU.exe</filename> on all
- other Windows versions), Help, and other needed files. Cannot be
+ <para>WinMerge executable, Help, and other needed files. Cannot be
unchecked.</para>
</listitem>
</varlistentry>
Deleted: branches/R2_14/Docs/Users/Manual/Text_encoding.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/Text_encoding.xml 2010-09-30 05:48:40 UTC (rev 7290)
+++ branches/R2_14/Docs/Users/Manual/Text_encoding.xml 2010-09-30 05:57:20 UTC (rev 7291)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"build/dtd/docbookx.dtd">
-<note>
- <title>Important note for ANSI WinMerge users</title>
-
- <para>In the ANSI version of WinMerge (WinMerge.exe) that is typically
- installed on older versions of windows, comparisons are set by default to use
- the default Windows ANSI codepages on your system - for example, Windows-1252
- on many Western European systems). If the files you are comparing all use this
- format, the default settings are fine.</para>
-
- <para>However, if you plan to compare files with different encodings (for
- example, UTF or another Windows codepage), you might need to change the
- default codepage settings, as described in <xref
- linkend="Configuration_codepage" />. If you are running the Unicode version of
- WinMerge (WinMergeU.exe), comparisons handle different encodings
- transparently, and so codepage settings do not affect you.</para>
-</note>
\ No newline at end of file
Modified: branches/R2_14/Docs/Users/Manual/WinMerge_help.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/WinMerge_help.xml 2010-09-30 05:48:40 UTC (rev 7290)
+++ branches/R2_14/Docs/Users/Manual/WinMerge_help.xml 2010-09-30 05:57:20 UTC (rev 7291)
@@ -84,9 +84,12 @@
</authorgroup>
</bookinfo>
- <!--Note to maintainers: Not all doc files are included in this file. There are also fragment files included at the topic
-level. For example, several files include elements from replaceables.xml. Other fragment files are select-unpacker.xml
-and Text_encoding.xml. Pleaes do not delete xml files in this directory unless you know for sure that they are not used.-->
+ <!-- Note to maintainers:
+ Not all doc files are included in this file. There are also fragment files
+ included at the topic level. For example, several files include elements from
+ replaceables.xml. Other fragment file is select-unpacker.xml.
+ Please do not delete xml files in this directory unless you know for sure
+ that they are not used. -->
&AboutDoc;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-09-30 05:48:47
|
Revision: 7290
http://winmerge.svn.sourceforge.net/winmerge/?rev=7290&view=rev
Author: gerundt
Date: 2010-09-30 05:48:40 +0000 (Thu, 30 Sep 2010)
Log Message:
-----------
PATCH: [ 3078012 ] Drop text encoding note from manual
Modified Paths:
--------------
trunk/Docs/Users/Manual/Command_line.xml
trunk/Docs/Users/Manual/Compare_dirs.xml
trunk/Docs/Users/Manual/Compare_files.xml
trunk/Docs/Users/Manual/Install.xml
trunk/Docs/Users/Manual/WinMerge_help.xml
Removed Paths:
-------------
trunk/Docs/Users/Manual/Text_encoding.xml
Modified: trunk/Docs/Users/Manual/Command_line.xml
===================================================================
--- trunk/Docs/Users/Manual/Command_line.xml 2010-09-29 07:39:45 UTC (rev 7289)
+++ trunk/Docs/Users/Manual/Command_line.xml 2010-09-30 05:48:40 UTC (rev 7290)
@@ -16,13 +16,13 @@
<para>Use one of these formats for the WinMerge command:</para>
<para><cmdsynopsis sepchar=" ">
- <command>WinMerge<optional>U</optional></command>
+ <command>WinMergeU</command>
<arg choice="opt" rep="norepeat"><option>/?</option></arg>
</cmdsynopsis></para>
<para><cmdsynopsis sepchar=" ">
- <command>WinMerge<optional>U</optional></command>
+ <command>WinMergeU</command>
<arg choice="opt" rep="norepeat"><option>/r</option></arg>
@@ -68,36 +68,12 @@
</cmdsynopsis></para>
<cmdsynopsis sepchar=" ">
- <command>WinMerge<optional>U</optional></command>
+ <command>WinMergeU</command>
<arg choice="plain"
rep="norepeat"><replaceable>conflictfile</replaceable></arg>
</cmdsynopsis>
- <para>The command has two forms:</para>
-
- <variablelist>
- <varlistentry>
- <term>WinMergeU</term>
-
- <listitem>
- <para>Use <command>WinMergeU</command> if you are running the Unicode
- version of WinMerge, typically installed on recent Windows
- systems.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>WinMerge</term>
-
- <listitem>
- <para>Use <command>WinMerge</command> only if you are running the ANSI
- version of WinMerge, typically installed only on Windows
- 9<replaceable>x</replaceable> and WME systems.</para>
- </listitem>
- </varlistentry>
- </variablelist>
-
<para>Entering the command with no parameters or pathnames simply opens the
WinMerge window. Parameters are prefixed with either a forward slash (
<literal>/</literal> ) or dash ( <literal>-</literal> ) character. Pathnames
Modified: trunk/Docs/Users/Manual/Compare_dirs.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_dirs.xml 2010-09-29 07:39:45 UTC (rev 7289)
+++ trunk/Docs/Users/Manual/Compare_dirs.xml 2010-09-30 05:48:40 UTC (rev 7290)
@@ -7,9 +7,6 @@
<para>This topic describes how to compare and merge folders using the Folder
Compare window.</para>
- <xi:include href="Text_encoding.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
-
<section id="Compare_dirs_starting">
<title>Starting a folder compare operation</title>
Modified: trunk/Docs/Users/Manual/Compare_files.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_files.xml 2010-09-29 07:39:45 UTC (rev 7289)
+++ trunk/Docs/Users/Manual/Compare_files.xml 2010-09-30 05:48:40 UTC (rev 7290)
@@ -12,9 +12,6 @@
first. See <xref linkend="Intro_diffs" /> for related information about hex
files. </para>
- <xi:include href="Text_encoding.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
-
<section id="Compare_files_starting">
<title>Starting a file compare operation</title>
Modified: trunk/Docs/Users/Manual/Install.xml
===================================================================
--- trunk/Docs/Users/Manual/Install.xml 2010-09-29 07:39:45 UTC (rev 7289)
+++ trunk/Docs/Users/Manual/Install.xml 2010-09-30 05:48:40 UTC (rev 7290)
@@ -33,7 +33,7 @@
<note>
<para>The installer requires Administrator user privileges in Windows
- NT4/2000/XP. If you don't have admin user privileges, you can install
+ 2000 or newer. If you don't have admin user privileges, you can install
WinMerge by unzipping from an archive file (see <xref
linkend="InstallFromArchive" />).</para>
</note>
@@ -82,9 +82,7 @@
</indexterm></term>
<listitem>
- <para>WinMerge executable (<filename>WinMerge.exe</filename> on
- Windows 9X and WME; <filename>WinMergeU.exe</filename> on all
- other Windows versions), Help, and other needed files. Cannot be
+ <para>WinMerge executable, Help, and other needed files. Cannot be
unchecked.</para>
</listitem>
</varlistentry>
Deleted: trunk/Docs/Users/Manual/Text_encoding.xml
===================================================================
--- trunk/Docs/Users/Manual/Text_encoding.xml 2010-09-29 07:39:45 UTC (rev 7289)
+++ trunk/Docs/Users/Manual/Text_encoding.xml 2010-09-30 05:48:40 UTC (rev 7290)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"build/dtd/docbookx.dtd">
-<note>
- <title>Important note for ANSI WinMerge users</title>
-
- <para>In the ANSI version of WinMerge (WinMerge.exe) that is typically
- installed on older versions of windows, comparisons are set by default to use
- the default Windows ANSI codepages on your system - for example, Windows-1252
- on many Western European systems). If the files you are comparing all use this
- format, the default settings are fine.</para>
-
- <para>However, if you plan to compare files with different encodings (for
- example, UTF or another Windows codepage), you might need to change the
- default codepage settings, as described in <xref
- linkend="Configuration_codepage" />. If you are running the Unicode version of
- WinMerge (WinMergeU.exe), comparisons handle different encodings
- transparently, and so codepage settings do not affect you.</para>
-</note>
\ No newline at end of file
Modified: trunk/Docs/Users/Manual/WinMerge_help.xml
===================================================================
--- trunk/Docs/Users/Manual/WinMerge_help.xml 2010-09-29 07:39:45 UTC (rev 7289)
+++ trunk/Docs/Users/Manual/WinMerge_help.xml 2010-09-30 05:48:40 UTC (rev 7290)
@@ -85,9 +85,12 @@
</authorgroup>
</bookinfo>
- <!--Note to maintainers: Not all doc files are included in this file. There are also fragment files included at the topic
-level. For example, several files include elements from replaceables.xml. Other fragment files are select-unpacker.xml
-and Text_encoding.xml. Pleaes do not delete xml files in this directory unless you know for sure that they are not used.-->
+ <!-- Note to maintainers:
+ Not all doc files are included in this file. There are also fragment files
+ included at the topic level. For example, several files include elements from
+ replaceables.xml. Other fragment file is select-unpacker.xml.
+ Please do not delete xml files in this directory unless you know for sure
+ that they are not used. -->
&About_Doc;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-09-29 07:39:51
|
Revision: 7289
http://winmerge.svn.sourceforge.net/winmerge/?rev=7289&view=rev
Author: gerundt
Date: 2010-09-29 07:39:45 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Fix invalid syntax in ShellExtension project file from WinMerge 2.12
Modified Paths:
--------------
branches/R2_12/ShellExtension/ShellExtension.vcproj
Modified: branches/R2_12/ShellExtension/ShellExtension.vcproj
===================================================================
--- branches/R2_12/ShellExtension/ShellExtension.vcproj 2010-09-29 07:33:48 UTC (rev 7288)
+++ branches/R2_12/ShellExtension/ShellExtension.vcproj 2010-09-29 07:39:45 UTC (rev 7289)
@@ -1822,6 +1822,7 @@
PreprocessorDefinitions=""
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
+ </File>
<File
RelativePath="Languages\ShellExtensionPersian.rc">
<FileConfiguration
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-09-29 07:33:54
|
Revision: 7288
http://winmerge.svn.sourceforge.net/winmerge/?rev=7288&view=rev
Author: gerundt
Date: 2010-09-29 07:33:48 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Fix invalid syntax in ShellExtension project file from WinMerge 2.14
Modified Paths:
--------------
branches/R2_14/ShellExtension/ShellExtension.vcproj
Modified: branches/R2_14/ShellExtension/ShellExtension.vcproj
===================================================================
--- branches/R2_14/ShellExtension/ShellExtension.vcproj 2010-09-26 08:00:44 UTC (rev 7287)
+++ branches/R2_14/ShellExtension/ShellExtension.vcproj 2010-09-29 07:33:48 UTC (rev 7288)
@@ -1822,6 +1822,7 @@
PreprocessorDefinitions=""
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
+ </File>
<File
RelativePath="Languages\ShellExtensionPersian.rc">
<FileConfiguration
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2010-09-26 08:00:51
|
Revision: 7287
http://winmerge.svn.sourceforge.net/winmerge/?rev=7287&view=rev
Author: jtuc
Date: 2010-09-26 08:00:44 +0000 (Sun, 26 Sep 2010)
Log Message:
-----------
PATCH: [ 3026022 ] Turn STL exceptions into MFC exceptions
Modified Paths:
--------------
trunk/Src/Merge.cpp
trunk/Src/Merge.vcproj
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2010-09-25 15:56:58 UTC (rev 7286)
+++ trunk/Src/Merge.cpp 2010-09-26 08:00:44 UTC (rev 7287)
@@ -72,6 +72,52 @@
/** @brief Location for command line help to open. */
static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/Command_line.html");
+
+/**
+ * @brief Turn STL exceptions into MFC exceptions.
+ * Based on the article "Visual C++ Exception-Handling Instrumentation"
+ * by Eugene Gershnik, published at http://www.drdobbs.com/184416600.
+ */
+namespace Turn_STL_exceptions_into_MFC_exceptions
+{
+# ifndef _STATIC_CPPLIB
+# error This hack only works with _STATIC_CPPLIB defined.
+# endif
+
+ class CDisguisedSTLException : public CException
+ {
+ private:
+ std::exception *m_pSTLException;
+ public:
+ CDisguisedSTLException(std::exception *pSTLException)
+ : m_pSTLException(pSTLException)
+ {
+ }
+ virtual BOOL GetErrorMessage(LPTSTR lpszError, UINT nMaxError, PUINT)
+ {
+ _sntprintf(lpszError, nMaxError, _T("%hs"), m_pSTLException->what());
+ return TRUE;
+ }
+ };
+
+ const DWORD CPP_EXCEPTION = 0xE06D7363;
+ const DWORD MS_MAGIC = 0x19930520;
+
+ extern "C" void __stdcall _CxxThrowException(void *pObject, _s__ThrowInfo const *pObjectInfo)
+ {
+ if (int i = pObjectInfo->pCatchableTypeArray->nCatchableTypes)
+ {
+ const char *name = typeid(std::exception).raw_name();
+ if (pObjectInfo->pCatchableTypeArray->arrayOfCatchableTypes[i - 1]->pType->name == name)
+ {
+ throw new CDisguisedSTLException(static_cast<std::exception *>(pObject));
+ }
+ }
+ const ULONG_PTR args[] = { MS_MAGIC, (ULONG_PTR)pObject, (ULONG_PTR)pObjectInfo };
+ RaiseException(CPP_EXCEPTION, EXCEPTION_NONCONTINUABLE, _countof(args), args);
+ }
+}
+
/////////////////////////////////////////////////////////////////////////////
// CMergeApp
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2010-09-25 15:56:58 UTC (rev 7286)
+++ trunk/Src/Merge.vcproj 2010-09-26 08:00:44 UTC (rev 7287)
@@ -51,7 +51,7 @@
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -158,7 +158,7 @@
AdditionalOptions="/EHa "
Optimization="0"
AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
@@ -262,7 +262,7 @@
AdditionalOptions="/EHa "
Optimization="0"
AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
@@ -366,7 +366,7 @@
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -546,7 +546,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
/>
@@ -584,7 +584,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
/>
@@ -746,7 +746,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -778,7 +778,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -2136,7 +2136,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2168,7 +2168,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -2182,7 +2182,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2214,7 +2214,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -2382,7 +2382,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2414,7 +2414,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -3946,7 +3946,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -3978,7 +3978,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -4088,7 +4088,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -4120,29 +4120,13 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
RelativePath="Merge.rc"
>
- <FileConfiguration
- Name="UnicodeRelease|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="UnicodeDebug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)"
- />
- </FileConfiguration>
</File>
<File
RelativePath="MergeCmdLineInfo.cpp"
@@ -4258,7 +4242,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -4290,7 +4274,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -4680,7 +4664,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -4712,7 +4696,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -5812,7 +5796,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -5844,7 +5828,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -6000,7 +5984,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -6032,7 +6016,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -6566,7 +6550,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -6598,7 +6582,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -6750,7 +6734,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
UsePrecompiledHeader="1"
/>
</FileConfiguration>
@@ -6785,7 +6769,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
UsePrecompiledHeader="1"
/>
</FileConfiguration>
@@ -7628,7 +7612,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -7660,7 +7644,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-09-25 15:57:04
|
Revision: 7286
http://winmerge.svn.sourceforge.net/winmerge/?rev=7286&view=rev
Author: kimmov
Date: 2010-09-25 15:56:58 +0000 (Sat, 25 Sep 2010)
Log Message:
-----------
Docs: Add 2.14 branch to SVN doc.
Modified Paths:
--------------
branches/R2_14/Docs/Developers/readme-Subversion.html
Modified: branches/R2_14/Docs/Developers/readme-Subversion.html
===================================================================
--- branches/R2_14/Docs/Developers/readme-Subversion.html 2010-09-25 15:54:38 UTC (rev 7285)
+++ branches/R2_14/Docs/Developers/readme-Subversion.html 2010-09-25 15:56:58 UTC (rev 7286)
@@ -100,6 +100,8 @@
<code><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_10">https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_10</a></code></li>
<li>2.12 release branch<br>
<code><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_12">https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_12</a></code></li>
+ <li>2.14 release branch<br>
+ <code><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_14">https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_14</a></code></li>
</ul>
<p>Old branches (2.0 - 2.4 releases) are in CVS repository.</p>
<p>For every beta- and stable-release we add a tag. Tags are in folder:<br>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-09-25 15:54:44
|
Revision: 7285
http://winmerge.svn.sourceforge.net/winmerge/?rev=7285&view=rev
Author: kimmov
Date: 2010-09-25 15:54:38 +0000 (Sat, 25 Sep 2010)
Log Message:
-----------
Remove (old version) of CppUnit sources.
Modified Paths:
--------------
branches/R2_14/Docs/Developers/SVN_Organisation.txt
branches/R2_14/Externals/versions.txt
Removed Paths:
-------------
branches/R2_14/Externals/cppunit/
Modified: branches/R2_14/Docs/Developers/SVN_Organisation.txt
===================================================================
--- branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-25 14:20:18 UTC (rev 7284)
+++ branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-25 15:54:38 UTC (rev 7285)
@@ -12,7 +12,6 @@
- Languages
- Manual
- Externals
- - cppunit
- expat
- heksedit
- pcre
@@ -80,9 +79,6 @@
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/>
Modified: branches/R2_14/Externals/versions.txt
===================================================================
--- branches/R2_14/Externals/versions.txt 2010-09-25 14:20:18 UTC (rev 7284)
+++ branches/R2_14/Externals/versions.txt 2010-09-25 15:54:38 UTC (rev 7285)
@@ -3,7 +3,6 @@
This file lists versions of the external components we are using.
-CppUnit: 1.12.0
Expat: 2.0.1
PCRE: 7.8
Heksedit: Frhed SVN trunk r 45
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-09-25 14:20:24
|
Revision: 7284
http://winmerge.svn.sourceforge.net/winmerge/?rev=7284&view=rev
Author: gerundt
Date: 2010-09-25 14:20:18 +0000 (Sat, 25 Sep 2010)
Log Message:
-----------
BUG: [ 3033325 ] copy and advance: toolbar icons not automatically enabled
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/MergeEditView.cpp
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-09-25 13:56:28 UTC (rev 7283)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-09-25 14:20:18 UTC (rev 7284)
@@ -13,6 +13,7 @@
Bugfix: WinMerge was vulnerable to DLL hijacking as described in
Microsoft Security Advisory (2269637) (#33056008)
Bugfix: Location pane focus enabled "Save" (#3022292)
+ Bugfix: "Copy and advance" toolbar icons not automatically enabled (#3033325)
Translation updates:
- Chinese (#3033324)
- Dutch (#2804979)
Modified: branches/R2_14/Src/MergeEditView.cpp
===================================================================
--- branches/R2_14/Src/MergeEditView.cpp 2010-09-25 13:56:28 UTC (rev 7283)
+++ branches/R2_14/Src/MergeEditView.cpp 2010-09-25 14:20:18 UTC (rev 7284)
@@ -2169,10 +2169,6 @@
*/
void CMergeEditView::OnL2RNext()
{
- // Check that diff is selected
- if (GetDocument()->GetCurrentDiff() == -1)
- return;
-
OnL2r();
OnNextdiff();
}
@@ -2182,11 +2178,7 @@
*/
void CMergeEditView::OnUpdateL2RNext(CCmdUI* pCmdUI)
{
- // Check that right side is not readonly
- if (!IsReadOnly(1))
- pCmdUI->Enable(GetDocument()->GetCurrentDiff()!=-1);
- else
- pCmdUI->Enable(false);
+ OnUpdateL2r(pCmdUI);
}
/**
@@ -2194,10 +2186,6 @@
*/
void CMergeEditView::OnR2LNext()
{
- // Check that diff is selected
- if (GetDocument()->GetCurrentDiff() == -1)
- return;
-
OnR2l();
OnNextdiff();
}
@@ -2207,11 +2195,7 @@
*/
void CMergeEditView::OnUpdateR2LNext(CCmdUI* pCmdUI)
{
- // Check that left side is not readonly
- if (!IsReadOnly(0))
- pCmdUI->Enable(GetDocument()->GetCurrentDiff()!=-1);
- else
- pCmdUI->Enable(false);
+ OnUpdateR2l(pCmdUI);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-09-25 13:56:34
|
Revision: 7283
http://winmerge.svn.sourceforge.net/winmerge/?rev=7283&view=rev
Author: gerundt
Date: 2010-09-25 13:56:28 +0000 (Sat, 25 Sep 2010)
Log Message:
-----------
BUG: [ 3022292 ] Location pane focus enabled "Save"
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/LocationView.cpp
branches/R2_14/Src/LocationView.h
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-09-25 11:53:58 UTC (rev 7282)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-09-25 13:56:28 UTC (rev 7283)
@@ -12,6 +12,7 @@
libraries installer (#3070254)
Bugfix: WinMerge was vulnerable to DLL hijacking as described in
Microsoft Security Advisory (2269637) (#33056008)
+ Bugfix: Location pane focus enabled "Save" (#3022292)
Translation updates:
- Chinese (#3033324)
- Dutch (#2804979)
Modified: branches/R2_14/Src/LocationView.cpp
===================================================================
--- branches/R2_14/Src/LocationView.cpp 2010-09-25 11:53:58 UTC (rev 7282)
+++ branches/R2_14/Src/LocationView.cpp 2010-09-25 13:56:28 UTC (rev 7283)
@@ -118,6 +118,9 @@
ON_WM_SIZE()
ON_WM_VSCROLL()
ON_WM_ERASEBKGND()
+ ON_UPDATE_COMMAND_UI(ID_FILE_SAVE, OnUpdateFileSave)
+ ON_UPDATE_COMMAND_UI(ID_FILE_SAVE_LEFT, OnUpdateFileSaveLeft)
+ ON_UPDATE_COMMAND_UI(ID_FILE_SAVE_RIGHT, OnUpdateFileSaveRight)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -1074,3 +1077,42 @@
pDC->SelectObject(pOldBrush);
pDC->SelectObject(oldObj);
}
+
+/**
+ * @brief Called when "Save" item is updated
+ */
+void CLocationView::OnUpdateFileSave(CCmdUI* pCmdUI)
+{
+ CMergeDoc *pd = GetDocument();
+
+ if (pd->m_ptBuf[0]->IsModified() || pd->m_ptBuf[1]->IsModified())
+ pCmdUI->Enable(true);
+ else
+ pCmdUI->Enable(false);
+}
+
+/**
+ * @brief Called when "Save left (as...)" item is updated
+ */
+void CLocationView::OnUpdateFileSaveLeft(CCmdUI* pCmdUI)
+{
+ CMergeDoc *pd = GetDocument();
+
+ if (!pd->m_ptBuf[0]->GetReadOnly() && pd->m_ptBuf[0]->IsModified())
+ pCmdUI->Enable(true);
+ else
+ pCmdUI->Enable(false);
+}
+
+/**
+ * @brief Called when "Save right (as...)" item is updated
+ */
+void CLocationView::OnUpdateFileSaveRight(CCmdUI* pCmdUI)
+{
+ CMergeDoc *pd = GetDocument();
+
+ if (!pd->m_ptBuf[1]->GetReadOnly() && pd->m_ptBuf[1]->IsModified())
+ pCmdUI->Enable(true);
+ else
+ pCmdUI->Enable(false);
+}
\ No newline at end of file
Modified: branches/R2_14/Src/LocationView.h
===================================================================
--- branches/R2_14/Src/LocationView.h 2010-09-25 11:53:58 UTC (rev 7282)
+++ branches/R2_14/Src/LocationView.h 2010-09-25 13:56:28 UTC (rev 7283)
@@ -127,6 +127,9 @@
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg BOOL OnEraseBkgnd(CDC* pDC);
afx_msg void OnPaint();
+ afx_msg void OnUpdateFileSave(CCmdUI* pCmdUI);
+ afx_msg void OnUpdateFileSaveLeft(CCmdUI* pCmdUI);
+ afx_msg void OnUpdateFileSaveRight(CCmdUI* pCmdUI);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-09-25 11:54:04
|
Revision: 7282
http://winmerge.svn.sourceforge.net/winmerge/?rev=7282&view=rev
Author: gerundt
Date: 2010-09-25 11:53:58 +0000 (Sat, 25 Sep 2010)
Log Message:
-----------
Installer: Drop heksedit.dll from InnoSetup for WinMerge 2.14
Modified Paths:
--------------
branches/R2_14/Installer/InnoSetup/WinMerge.iss
Modified: branches/R2_14/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-09-25 11:52:07 UTC (rev 7281)
+++ branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-09-25 11:53:58 UTC (rev 7282)
@@ -386,8 +386,7 @@
Source: ..\..\Build\MergeUnicodeRelease\MergeLang.dll; DestDir: {app}; Flags: promptifolder; Components: Core
; Binary file editor
-Source: ..\..\Build\heksedit\heksedit.dll; DestDir: {app}; Flags: promptifolder; OnlyBelowVersion: 0, 4; Components: Core
-Source: ..\..\Build\heksedit\hekseditU.dll; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Components: Core
+Source: ..\..\Build\heksedit\hekseditU.dll; DestDir: {app}; Flags: promptifolder; Components: Core
; Language files
Source: ..\..\Src\Languages\Brazilian.po; DestDir: {app}\Languages; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-09-25 11:52:13
|
Revision: 7281
http://winmerge.svn.sourceforge.net/winmerge/?rev=7281&view=rev
Author: gerundt
Date: 2010-09-25 11:52:07 +0000 (Sat, 25 Sep 2010)
Log Message:
-----------
Docs: Update InnoSetup readme file for WinMerge 2.14
Modified Paths:
--------------
branches/R2_14/Docs/Developers/readme-InnoSetup.html
Modified: branches/R2_14/Docs/Developers/readme-InnoSetup.html
===================================================================
--- branches/R2_14/Docs/Developers/readme-InnoSetup.html 2010-09-25 11:33:20 UTC (rev 7280)
+++ branches/R2_14/Docs/Developers/readme-InnoSetup.html 2010-09-25 11:52:07 UTC (rev 7281)
@@ -94,9 +94,9 @@
</ul>
</li>
<li>
- <code>Languages</code>
+ <code>heksedit</code>
<ul>
- <li><code>*.lang</code></li>
+ <li><code>hekseditU.dll</code></li>
</ul>
</li>
<li>
@@ -108,6 +108,7 @@
<li>
<code>MergeUnicodeRelease/</code>
<ul>
+ <li><code>MergeLang.dll</code></li>
<li><code>ShellExtensionU.dll</code></li>
<li><code>WinMergeU.exe</code></li>
</ul>
@@ -150,7 +151,7 @@
<li>
<code>InnoSetup/</code>
<ul>
- <li><em>Copy the entire Installer/InnoSetup folder to here</em></li>
+ <li><em>Copy the entire <code>Installer/InnoSetup</code> folder to here</em></li>
</ul>
</li>
</ul>
@@ -161,11 +162,22 @@
<li>
<code>dlls/</code>
<ul>
- <li><em>Copy the entire Plugins/dlls folder to here</em></li>
+ <li><em>Copy the entire <code>Plugins/dlls</code> folder to here</em></li>
</ul>
</li>
</ul>
</li>
+ <li>
+ <code>Src/</code>
+ <ul>
+ <li>
+ <code>Languages/</code>
+ <ul>
+ <li><em>Copy the entire <code>Src/Languages</code> 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.
|
|
From: <ge...@us...> - 2010-09-25 11:33:26
|
Revision: 7280
http://winmerge.svn.sourceforge.net/winmerge/?rev=7280&view=rev
Author: gerundt
Date: 2010-09-25 11:33:20 +0000 (Sat, 25 Sep 2010)
Log Message:
-----------
Docs: Update InnoSetup and WIX readme files
Modified Paths:
--------------
trunk/Docs/Developers/readme-InnoSetup.html
trunk/Docs/Developers/readme-WIX.html
Modified: trunk/Docs/Developers/readme-InnoSetup.html
===================================================================
--- trunk/Docs/Developers/readme-InnoSetup.html 2010-09-24 06:36:26 UTC (rev 7279)
+++ trunk/Docs/Developers/readme-InnoSetup.html 2010-09-25 11:33:20 UTC (rev 7280)
@@ -53,7 +53,7 @@
<h3>Checklist:</h3>
<ul>
<li>
- Installer reads version number from <code>WinMerge.exe</code>. So make
+ Installer reads version number from <code>WinMergeU.exe</code>. So make
sure you have version resource correctly set.<br>
There is Python script <code>Tools/Scripts/SetVersions.py</code> which sets
version numbers to all components. The script reads version numbers from
@@ -121,6 +121,7 @@
<li>
<code>MergeUnicodeRelease/</code>
<ul>
+ <li><code>MergeLang.dll</code></li>
<li><code>ShellExtensionU.dll</code></li>
<li><code>WinMergeU.exe</code></li>
</ul>
@@ -163,7 +164,7 @@
<li>
<code>InnoSetup/</code>
<ul>
- <li><em>Copy the entire Installer/InnoSetup folder to here</em></li>
+ <li><em>Copy the entire <code>Installer/InnoSetup</code> folder to here</em></li>
</ul>
</li>
</ul>
@@ -174,7 +175,7 @@
<li>
<code>dlls/</code>
<ul>
- <li><em>Copy the entire Plugins/dlls folder to here</em></li>
+ <li><em>Copy the entire <code>Plugins/dlls</code> folder to here</em></li>
</ul>
</li>
</ul>
Modified: trunk/Docs/Developers/readme-WIX.html
===================================================================
--- trunk/Docs/Developers/readme-WIX.html 2010-09-24 06:36:26 UTC (rev 7279)
+++ trunk/Docs/Developers/readme-WIX.html 2010-09-25 11:33:20 UTC (rev 7280)
@@ -108,6 +108,7 @@
<li>
<code>MergeUnicodeRelease/</code>
<ul>
+ <li><code>MergeLang.dll</code></li>
<li><code>ShellExtensionU.dll</code></li>
<li><code>WinMergeU.exe</code></li>
</ul>
@@ -150,23 +151,12 @@
<li>
<code>WIX/</code>
<ul>
- <li><em>Copy the entire Installer/WIX folder to here</em></li>
+ <li><em>Copy the entire <code>Installer/WIX</code> folder to here</em></li>
</ul>
</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>
- <li>
<code>Translations/</code>
<ul>
<li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2010-09-24 06:36:32
|
Revision: 7279
http://winmerge.svn.sourceforge.net/winmerge/?rev=7279&view=rev
Author: jtuc
Date: 2010-09-24 06:36:26 +0000 (Fri, 24 Sep 2010)
Log Message:
-----------
Merge from trunk: Tolerate irregular whitespace in command lines.
Modified Paths:
--------------
branches/R2_14/Src/MergeCmdLineInfo.cpp
Modified: branches/R2_14/Src/MergeCmdLineInfo.cpp
===================================================================
--- branches/R2_14/Src/MergeCmdLineInfo.cpp 2010-09-24 06:25:00 UTC (rev 7278)
+++ branches/R2_14/Src/MergeCmdLineInfo.cpp 2010-09-24 06:36:26 UTC (rev 7279)
@@ -50,9 +50,21 @@
*/
LPCTSTR MergeCmdLineInfo::EatParam(LPCTSTR p, String ¶m, bool *flag)
{
- if (p && *(p += StrSpn(p, _T(" \t\r\n"))) == '\0')
+ if (p && *(p += StrSpn(p, _T(" \t\r\n"))) == _T('\0'))
p = 0;
- LPCTSTR q = PathGetArgs(p);
+ LPCTSTR q = p;
+ if (q)
+ {
+ TCHAR c = *q;
+ bool quoted = false;
+ do
+ {
+ if (c == _T('"'))
+ quoted = !quoted;
+ c = *++q;
+ } while (c != _T('\0') && (quoted ||
+ c != _T(' ') && c != _T('\t') && c != _T('\r') && c != _T('\n')));
+ }
if (q > p && flag)
{
if (*p == _T('-') || *p == _T('/'))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2010-09-24 06:25:07
|
Revision: 7278
http://winmerge.svn.sourceforge.net/winmerge/?rev=7278&view=rev
Author: jtuc
Date: 2010-09-24 06:25:00 +0000 (Fri, 24 Sep 2010)
Log Message:
-----------
Merge HexMerge* changes from trunk. This does not reenable the feature though, as decision whether to do so is up to Kimmo.
Modified Paths:
--------------
branches/R2_14/Src/HexMergeDoc.cpp
branches/R2_14/Src/HexMergeDoc.h
branches/R2_14/Src/HexMergeFrm.cpp
branches/R2_14/Src/HexMergeFrm.h
branches/R2_14/Src/HexMergeView.cpp
branches/R2_14/Src/HexMergeView.h
Added Paths:
-----------
branches/R2_14/Src/heksedit.h
Modified: branches/R2_14/Src/HexMergeDoc.cpp
===================================================================
--- branches/R2_14/Src/HexMergeDoc.cpp 2010-09-22 19:08:08 UTC (rev 7277)
+++ branches/R2_14/Src/HexMergeDoc.cpp 2010-09-24 06:25:00 UTC (rev 7278)
@@ -146,6 +146,8 @@
{
m_pView[MERGE_VIEW_LEFT] = NULL;
m_pView[MERGE_VIEW_RIGHT] = NULL;
+ m_nBufferType[0] = BUFFER_NORMAL;
+ m_nBufferType[1] = BUFFER_NORMAL;
}
/**
@@ -412,30 +414,48 @@
}
/**
+* @brief Load one file
+*/
+HRESULT CHexMergeDoc::LoadOneFile(int index, LPCTSTR filename, BOOL readOnly)
+{
+ if (Try(m_pView[index]->LoadFile(filename), MB_ICONSTOP) != 0)
+ return E_FAIL;
+ m_pView[index]->SetReadOnly(readOnly);
+ m_filePaths.SetPath(index, filename);
+ ASSERT(m_nBufferType[index] == BUFFER_NORMAL); // should have been initialized to BUFFER_NORMAL in constructor
+ String strDesc = GetMainFrame()->m_strDescriptions[index];
+ if (!strDesc.empty())
+ {
+ m_strDesc[index] = strDesc;
+ m_nBufferType[index] = BUFFER_NORMAL_NAMED;
+ }
+ UpdateHeaderPath(index);
+ m_pView[index]->ResizeWindow();
+ return S_OK;
+}
+
+/**
* @brief Load files and initialize frame's compare result icon
*/
HRESULT CHexMergeDoc::OpenDocs(LPCTSTR pathLeft, LPCTSTR pathRight, BOOL bROLeft, BOOL bRORight)
{
- if (Try(m_pView[MERGE_VIEW_LEFT]->LoadFile(pathLeft), MB_ICONSTOP) == 0)
+ CHexMergeFrame *pf = GetParentFrame();
+ ASSERT(pf);
+ HRESULT hr;
+ if (SUCCEEDED(hr = LoadOneFile(MERGE_VIEW_LEFT, pathLeft, bROLeft)) &&
+ SUCCEEDED(hr = LoadOneFile(MERGE_VIEW_RIGHT, pathRight, bRORight)))
{
- m_pView[MERGE_VIEW_LEFT]->SetReadOnly(bROLeft);
- m_filePaths.SetLeft(pathLeft);
- m_strDesc[MERGE_VIEW_LEFT] = pathLeft;
- UpdateHeaderPath(MERGE_VIEW_LEFT);
+ UpdateDiffItem(0);
+ pf->Invalidate();
+ if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST))
+ m_pView[MERGE_VIEW_LEFT]->SendMessage(WM_COMMAND, ID_FIRSTDIFF);
}
- if (Try(m_pView[MERGE_VIEW_RIGHT]->LoadFile(pathRight), MB_ICONSTOP) == 0)
+ else
{
- m_pView[MERGE_VIEW_RIGHT]->SetReadOnly(bRORight);
- m_filePaths.SetRight(pathRight);
- m_strDesc[MERGE_VIEW_RIGHT] = pathRight;
- UpdateHeaderPath(MERGE_VIEW_RIGHT);
+ // Use verify macro to trap possible error in debug.
+ VERIFY(pf->DestroyWindow());
}
- m_pView[MERGE_VIEW_LEFT]->ResizeWindow();
- m_pView[MERGE_VIEW_RIGHT]->ResizeWindow();
- UpdateDiffItem(0);
- if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST))
- m_pView[MERGE_VIEW_LEFT]->SendMessage(WM_COMMAND, ID_FIRSTDIFF);
- return S_OK;
+ return hr;
}
/**
Modified: branches/R2_14/Src/HexMergeDoc.h
===================================================================
--- branches/R2_14/Src/HexMergeDoc.h 2010-09-22 19:08:08 UTC (rev 7277)
+++ branches/R2_14/Src/HexMergeDoc.h 2010-09-24 06:25:00 UTC (rev 7278)
@@ -25,7 +25,6 @@
// RCS ID line follows -- this is updated by CVS
// $Id$
-#include "TempFile.h"
#include "PathContext.h"
#include "DiffFileInfo.h"
@@ -72,14 +71,14 @@
CHexMergeFrame * GetParentFrame();
void UpdateHeaderPath(int pane);
HRESULT OpenDocs(LPCTSTR pathLeft, LPCTSTR pathRight, BOOL bROLeft, BOOL bRORight);
-protected:
+private:
static void CopySel(CHexMergeView *pViewSrc, CHexMergeView *pViewDst);
static void CopyAll(CHexMergeView *pViewSrc, CHexMergeView *pViewDst);
+ HRESULT LoadOneFile(int index, LPCTSTR filename, BOOL readOnly);
// Implementation data
protected:
CHexMergeView * m_pView[MERGE_VIEW_COUNT]; /**< Pointer to left/right view */
CDirDoc * m_pDirDoc;
- TempFile m_tempFiles[2]; /**< Temp files for compared files */
String m_strDesc[2]; /**< Left/right side description text */
BUFFERTYPE m_nBufferType[2];
Modified: branches/R2_14/Src/HexMergeFrm.cpp
===================================================================
--- branches/R2_14/Src/HexMergeFrm.cpp 2010-09-22 19:08:08 UTC (rev 7277)
+++ branches/R2_14/Src/HexMergeFrm.cpp 2010-09-24 06:25:00 UTC (rev 7278)
@@ -41,11 +41,6 @@
static char THIS_FILE[] = __FILE__;
#endif
-/**
- * @brief RO status panel width
- */
-static UINT RO_PANEL_WIDTH = 40;
-
/////////////////////////////////////////////////////////////////////////////
// CHexMergeFrame
@@ -78,19 +73,6 @@
PANE_RIGHT_EOL,
};
-/**
- * @brief Bottom statusbar panels and indicators
- */
-static UINT indicatorsBottom[] =
-{
- ID_SEPARATOR,
- ID_SEPARATOR,
- ID_SEPARATOR,
- ID_SEPARATOR,
- ID_SEPARATOR,
- ID_SEPARATOR,
-};
-
/////////////////////////////////////////////////////////////////////////////
// CHexMergeFrame construction/destruction
@@ -98,7 +80,6 @@
: m_hIdentical(NULL)
, m_hDifferent(NULL)
{
- m_bActivated = FALSE;
m_nLastSplitPos = 0;
m_pMergeDoc = 0;
}
@@ -145,13 +126,15 @@
/**
* @brief Create a status bar to be associated with a heksedit control
*/
-void CHexMergeFrame::CreateHexWndStatusBar(CStatusBar &wndStatusBar)
+void CHexMergeFrame::CreateHexWndStatusBar(CStatusBar &wndStatusBar, CWnd *pwndPane)
{
- wndStatusBar.Create(this, WS_CHILD|WS_VISIBLE);
+ wndStatusBar.Create(pwndPane, WS_CHILD|WS_VISIBLE);
wndStatusBar.SetIndicators(0, 3);
wndStatusBar.SetPaneInfo(0, 0, SBPS_STRETCH, 0);
- wndStatusBar.SetPaneInfo(1, 0, 0, 72);
- wndStatusBar.SetPaneInfo(2, 0, 0, 72);
+ wndStatusBar.SetPaneInfo(1, 0, 0, 80);
+ wndStatusBar.SetPaneInfo(2, 0, 0, 80);
+ wndStatusBar.SetParent(this);
+ wndStatusBar.SetWindowPos(&wndBottom, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
}
/**
@@ -194,35 +177,31 @@
m_wndFilePathBar.SetActive(0, FALSE);
m_wndFilePathBar.SetActive(1, FALSE);
+ CHexMergeView *pLeft = static_cast<CHexMergeView *>(m_wndSplitter.GetPane(0, 0));
+ CHexMergeView *pRight = static_cast<CHexMergeView *>(m_wndSplitter.GetPane(0, 1));
+
m_wndLeftStatusBar.m_cxRightBorder = 4;
- ModifyStyle(WS_THICKFRAME, 0); // Prevent SBARS_SIZEGRIP
- CreateHexWndStatusBar(m_wndLeftStatusBar);
- ModifyStyle(0, WS_THICKFRAME);
- CreateHexWndStatusBar(m_wndRightStatusBar);
+ CreateHexWndStatusBar(m_wndLeftStatusBar, pLeft);
+ pRight->ModifyStyle(0, WS_THICKFRAME); // Create an SBARS_SIZEGRIP
+ CreateHexWndStatusBar(m_wndRightStatusBar, pRight);
+ pRight->ModifyStyle(WS_THICKFRAME, 0);
CSize size = m_wndLeftStatusBar.CalcFixedLayout(TRUE, TRUE);
m_rectBorder.bottom = size.cy;
- m_hIdentical = AfxGetApp()->LoadIcon(IDI_EQUALFILE);
- m_hDifferent = AfxGetApp()->LoadIcon(IDI_NOTEQUALFILE);
+ m_hIdentical = AfxGetApp()->LoadIcon(IDI_EQUALBINARY);
+ m_hDifferent = AfxGetApp()->LoadIcon(IDI_BINARYDIFF);
- // stash left & right pointers into the mergedoc
- CHexMergeView *pLeft = static_cast<CHexMergeView *>(m_wndSplitter.GetPane(0,0));
- CHexMergeView *pRight = static_cast<CHexMergeView *>(m_wndSplitter.GetPane(0,1));
+ // get the IHexEditorWindow interfaces
+ IHexEditorWindow *pifLeft = pLeft->GetInterface();
+ IHexEditorWindow *pifRight = pRight->GetInterface();
- IHexEditorWindow *pifLeft = reinterpret_cast<IHexEditorWindow *>(
- ::GetWindowLongPtr(pLeft->m_hWnd, GWLP_USERDATA));
- IHexEditorWindow *pifRight = reinterpret_cast<IHexEditorWindow *>(
- ::GetWindowLongPtr(pRight->m_hWnd, GWLP_USERDATA));
+ // tell the heksedit controls about each other
+ pifLeft->set_sibling(pifRight);
+ pifRight->set_sibling(pifLeft);
- if (pifLeft && pifRight)
- {
- pifLeft->set_sibling(pifRight);
- pifRight->set_sibling(pifLeft);
- pifLeft->set_status_bar(m_wndLeftStatusBar.m_hWnd);
- pifRight->set_status_bar(m_wndRightStatusBar.m_hWnd);
- Customize(pifLeft);
- Customize(pifRight);
- }
+ // adjust a few settings and colors
+ Customize(pifLeft);
+ Customize(pifRight);
// tell merge doc about these views
m_pMergeDoc = dynamic_cast<CHexMergeDoc *>(pContext->m_pCurrentDoc);
@@ -250,6 +229,15 @@
}
}
+void CHexMergeFrame::ActivateFrame(int nCmdShow)
+{
+ if (!GetMDIFrame()->MDIGetActive() && theApp.GetProfileInt(_T("Settings"), _T("ActiveFrameMax"), FALSE))
+ {
+ nCmdShow = SW_SHOWMAXIMIZED;
+ }
+ CMDIChildWnd::ActivateFrame(nCmdShow);
+}
+
/**
* @brief Save the window's position, free related resources, and destroy the window
*/
Modified: branches/R2_14/Src/HexMergeFrm.h
===================================================================
--- branches/R2_14/Src/HexMergeFrm.h 2010-09-22 19:08:08 UTC (rev 7277)
+++ branches/R2_14/Src/HexMergeFrm.h 2010-09-24 06:25:00 UTC (rev 7278)
@@ -28,8 +28,10 @@
#include "SplitterWndEx.h"
#include "EditorFilepathBar.h"
-#include "../externals/heksedit/heksedit.h"
+#define HEKSEDIT_INTERFACE_VERSION 1
+#include "heksedit.h"
+
class CHexMergeDoc;
/**
@@ -67,6 +69,7 @@
//{{AFX_VIRTUAL(CHexMergeFrame)
public:
virtual BOOL OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext);
+ virtual void ActivateFrame(int nCmdShow = -1);
virtual BOOL DestroyWindow();
protected:
//}}AFX_VIRTUAL
@@ -75,12 +78,11 @@
private:
void SavePosition();
virtual ~CHexMergeFrame();
- void CreateHexWndStatusBar(CStatusBar &);
+ void CreateHexWndStatusBar(CStatusBar &, CWnd *);
// Generated message map functions
private:
int m_nLastSplitPos;
void UpdateHeaderSizes();
- BOOL m_bActivated;
CHexMergeDoc * m_pMergeDoc;
HICON m_hIdentical;
HICON m_hDifferent;
Modified: branches/R2_14/Src/HexMergeView.cpp
===================================================================
--- branches/R2_14/Src/HexMergeView.cpp 2010-09-22 19:08:08 UTC (rev 7277)
+++ branches/R2_14/Src/HexMergeView.cpp 2010-09-24 06:25:00 UTC (rev 7278)
@@ -34,7 +34,6 @@
#include "HexMergeView.h"
#include "OptionsDef.h"
#include "Environment.h"
-#include "../externals/heksedit/version.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -122,14 +121,14 @@
*/
BOOL CHexMergeView::PreCreateWindow(CREATESTRUCT& cs)
{
- static const TCHAR pe[] = PE_HEKSEDIT;
- static const TCHAR wc[] = WC_HEKSEDIT;
- if ((cs.hInstance = ::GetModuleHandle(pe)) == 0 &&
- (cs.hInstance = ::LoadLibrary(pe)) == 0)
+ static void *pv = NULL;
+ if (pv == NULL)
{
- return FALSE;
+ static const CLSID clsid = { 0xBCA3CA6B, 0xCC6B, 0x4F79,
+ { 0xA2, 0xC2, 0xDD, 0xBE, 0x86, 0x4B, 0x1C, 0x90 } };
+ CoGetClassObject(clsid, CLSCTX_INPROC_SERVER, NULL, IID_IUnknown, &pv);
}
- cs.lpszClass = wc;
+ cs.lpszClass = _T("heksedit");
cs.style |= WS_HSCROLL | WS_VSCROLL;
return TRUE;
}
@@ -142,7 +141,7 @@
if (CView::OnCreate(lpCreateStruct) == -1)
return -1;
m_pif = reinterpret_cast<IHexEditorWindow *>(::GetWindowLongPtr(m_hWnd, GWLP_USERDATA));
- if (m_pif == 0)
+ if (m_pif == 0 || m_pif->get_interface_version() < HEKSEDIT_INTERFACE_VERSION)
return -1;
return 0;
}
@@ -276,7 +275,7 @@
if (hr != S_OK)
GetBuffer(0);
}
- else
+ else if (length != 0)
{
hr = E_OUTOFMEMORY;
}
@@ -336,7 +335,7 @@
if (hr != S_OK)
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- sIntermediateFilename.c_str(), GetSysError(hr)));
+ sIntermediateFilename.c_str(), GetSysError(hr).c_str()));
}
return S_OK;
}
Modified: branches/R2_14/Src/HexMergeView.h
===================================================================
--- branches/R2_14/Src/HexMergeView.h 2010-09-22 19:08:08 UTC (rev 7277)
+++ branches/R2_14/Src/HexMergeView.h 2010-09-24 06:25:00 UTC (rev 7278)
@@ -47,6 +47,7 @@
public:
HRESULT LoadFile(LPCTSTR);
HRESULT SaveFile(LPCTSTR);
+ IHexEditorWindow *GetInterface() const { return m_pif; }
IHexEditorWindow::Status *GetStatus();
BYTE *GetBuffer(int);
int GetLength();
Added: branches/R2_14/Src/heksedit.h
===================================================================
--- branches/R2_14/Src/heksedit.h (rev 0)
+++ branches/R2_14/Src/heksedit.h 2010-09-24 06:25:00 UTC (rev 7278)
@@ -0,0 +1,115 @@
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file heksedit.h
+ *
+ * @brief Interface definition for the hekseditor window.
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id: heksedit.h 492 2009-04-11 15:17:02Z jtuc $
+
+#ifndef _HEKSEDIT_H_
+#define _HEKSEDIT_H_
+
+#ifndef HEKSEDIT_INTERFACE_VERSION
+#define HEKSEDIT_INTERFACE_VERSION 1
+#endif
+
+/**
+ * @brief Interface for the Hexeditor window.
+ * @note This file is published to hosting applications. Do not add global declarations.
+ */
+class IHexEditorWindow
+{
+public:
+ /**
+ * @brief Byte endians.
+ */
+ enum BYTE_ENDIAN
+ {
+ ENDIAN_LITTLE, /**< Little endian used e.g. in Intel processors. */
+ ENDIAN_BIG /**< Big endian used e.g. in Motorola processors. */
+ };
+
+ struct Colors
+ {
+ COLORREF iTextColorValue, iBkColorValue, iSepColorValue;
+ COLORREF iSelBkColorValue, iSelTextColorValue;
+ COLORREF iBmkColor;
+ COLORREF iDiffBkColorValue, iDiffTextColorValue, iSelDiffBkColorValue, iSelDiffTextColorValue;
+ };
+
+ struct Settings
+ {
+ int iBytesPerLine;
+ int iAutomaticBPL;
+ BYTE_ENDIAN iBinaryMode;
+ int bReadOnly;
+ int bSaveIni;
+ int iFontSize;
+ int iCharacterSet;
+ int iMinOffsetLen;
+ int iMaxOffsetLen;
+ int bAutoOffsetLen;
+ int bCenterCaret;
+ int iFontZoom;
+ };
+
+ struct Status
+ {
+ int iFileChanged;
+ int iEnteringMode;
+ int iCurByte;
+ int iCurNibble;
+ int iVscrollMax;
+ int iVscrollPos;
+ int iHscrollMax;
+ int iHscrollPos;
+ int bSelected;
+ int iStartOfSelection;
+ int iEndOfSelection;
+ };
+
+ virtual unsigned STDMETHODCALLTYPE get_interface_version() = 0;
+ virtual unsigned char *STDMETHODCALLTYPE get_buffer(int) = 0;
+ virtual int STDMETHODCALLTYPE get_length() = 0;
+ virtual void STDMETHODCALLTYPE set_sibling(IHexEditorWindow *) = 0;
+ virtual Colors *STDMETHODCALLTYPE get_colors() = 0;
+ virtual Settings *STDMETHODCALLTYPE get_settings() = 0;
+ virtual Status *STDMETHODCALLTYPE get_status() = 0;
+ virtual void STDMETHODCALLTYPE resize_window() = 0;
+ virtual void STDMETHODCALLTYPE repaint(int from, int to) = 0;
+ virtual void STDMETHODCALLTYPE adjust_hscrollbar() = 0;
+ virtual void STDMETHODCALLTYPE adjust_vscrollbar() = 0;
+ virtual int STDMETHODCALLTYPE translate_accelerator(MSG *) = 0;
+ virtual void STDMETHODCALLTYPE CMD_find() = 0;
+ virtual void STDMETHODCALLTYPE CMD_findprev() = 0;
+ virtual void STDMETHODCALLTYPE CMD_findnext() = 0;
+ virtual void STDMETHODCALLTYPE CMD_replace() = 0;
+ virtual void STDMETHODCALLTYPE CMD_edit_cut() = 0;
+ virtual void STDMETHODCALLTYPE CMD_edit_copy() = 0;
+ virtual void STDMETHODCALLTYPE CMD_edit_paste() = 0;
+ virtual void STDMETHODCALLTYPE CMD_edit_clear() = 0;
+ virtual BOOL STDMETHODCALLTYPE select_next_diff(BOOL bFromStart) = 0;
+ virtual BOOL STDMETHODCALLTYPE select_prev_diff(BOOL bFromEnd) = 0;
+ virtual BOOL STDMETHODCALLTYPE load_lang(LANGID langid, LPCWSTR langdir = NULL) = 0;
+ virtual void STDMETHODCALLTYPE CMD_zoom(int) = 0;
+ virtual void STDMETHODCALLTYPE CMD_select_all() = 0;
+};
+
+#endif // _HEKSEDIT_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-09-22 19:08:14
|
Revision: 7277
http://winmerge.svn.sourceforge.net/winmerge/?rev=7277&view=rev
Author: gerundt
Date: 2010-09-22 19:08:08 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
Drop website sources from SVN - We use now a bitbucket project for the website
Modified Paths:
--------------
branches/R2_14/Docs/Developers/SVN_Organisation.txt
Removed Paths:
-------------
branches/R2_14/Web/
Modified: branches/R2_14/Docs/Developers/SVN_Organisation.txt
===================================================================
--- branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-22 19:01:43 UTC (rev 7276)
+++ branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-22 19:08:08 UTC (rev 7277)
@@ -44,7 +44,6 @@
- Tools
- diff2winmerge
- Scripts
- - Web
WinMerge/ArchiveSupport/
@@ -171,6 +170,3 @@
WinMerge/Tools/diff2winmerge/
- Commandline wrapper for WinMerge executable, offers
diffutils -style commandline switches (needed by Perl selftests).
-
-WinMerge/Web/
- - Homepages.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-09-22 19:01:49
|
Revision: 7276
http://winmerge.svn.sourceforge.net/winmerge/?rev=7276&view=rev
Author: gerundt
Date: 2010-09-22 19:01:43 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
Drop readme file from MakePatchDirs too
Removed Paths:
-------------
branches/R2_14/Docs/Developers/readme-developers-MakePatchDirs.html
Deleted: branches/R2_14/Docs/Developers/readme-developers-MakePatchDirs.html
===================================================================
--- branches/R2_14/Docs/Developers/readme-developers-MakePatchDirs.html 2010-09-22 17:01:54 UTC (rev 7275)
+++ branches/R2_14/Docs/Developers/readme-developers-MakePatchDirs.html 2010-09-22 19:01:43 UTC (rev 7276)
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <title>MakePatchDirs</title>
- <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;
- }
- -->
- </style>
-</head>
-<body>
-<h2>MakePatchDirs</h2>
-
-<h3>Perry's patch process with MakePatchDirs</h3>
-<p>Perry wrote a small program, which he is happy to share in source or binary form,
-that he uses to generate patch directories. Here is his process:</p>
-<ul>
- <li><p>Update local cvs copy to ensure starting with most recent sources (optional).</p></li>
- <li><p>Create a new directory for the patch, eg, "<code>Somewhere\WinMerge\patches\new_nifty_patch</code>".</p></li>
- <li><p>Create a subdirectory called "<code>new_nifty_patch\original_all</code>" and copy WinMerge and common directories into it.</p></li>
- <li><p>Copy this directory and rename the copy as "<code>new_nifty_patch\applied</code>"</p></li>
- <li><p>Make changes to the code in the applied version and test until happy.</p></li>
- <li>
- <p>Run <code>MakePatchDirs</code>, and drag and drop the patch directory root
- (<code>Somewhere\WinMerge\patches\new_nifty_patch</code>) into the edit box, then push the Go button.
- This wipes and regenerates the directories <code>new_nifty_patch\original</code> and <code>new_nifty_patch\altered</code>, which contain all files altered
- in the applied version, and the corresponding original files. (This purely uses timestamps;
- it is not nearly as clever as WinMerge itself.)</p>
- </li>
- <li>
- <p>Zip up the altered and original directories, and attach them to the patch. (I always
- create the patch, then attach files afterwards, because SourceForge seems to always
- lose attachments if they were attached when the patch is first created.)</p>
- </li>
-</ul>
-
-<p>This process is optional; you are welcome to adopt it if you like. If you have
-a better system, please consider posting it on the developers forum so we may
-all potentially benefit.</p>
-
-<p>I, Perry, like having the applied subdirectory around to rerun tests with,
-for a little while, and like having the altered and original subdirectories
-which I can compare with WinMerge. :)</p>
-
-<p><a href="readme-developers.html">Back to readme-developers</a></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...> - 2010-09-22 17:02:01
|
Revision: 7275
http://winmerge.svn.sourceforge.net/winmerge/?rev=7275&view=rev
Author: kimmov
Date: 2010-09-22 17:01:54 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
Merging misc documentation updates from trunk to 2.14 branch.
Modified Paths:
--------------
branches/R2_14/Docs/Developers/Compiling.html
branches/R2_14/Docs/Developers/Releasing.html
branches/R2_14/Docs/Developers/SVN_Organisation.txt
branches/R2_14/Docs/Developers/readme-InnoSetup.html
branches/R2_14/Docs/Developers/readme-developers.html
Modified: branches/R2_14/Docs/Developers/Compiling.html
===================================================================
--- branches/R2_14/Docs/Developers/Compiling.html 2010-09-22 16:49:32 UTC (rev 7274)
+++ branches/R2_14/Docs/Developers/Compiling.html 2010-09-22 17:01:54 UTC (rev 7275)
@@ -76,9 +76,11 @@
MFC for the GUI.</p>
<ul>
- <li>Visual Studio 2003.Net + Service Pack 1 (used for releases)</li>
- <li>Visual Studio 2005 (occasional checks for compiling) (Service Pack 1 recommended)</li>
- <li>Visual Studio 2008 (Service Pack 1 recommended)</li>
+ <li>Visual Studio 2003.Net + Service Pack 1</li>
+ <li>Visual Studio 2005 (occasional checks for compiling) (Service Pack 1
+ recommended)</li>
+ <li>Visual Studio 2008 (Service Pack 1 recommended) [<i>used for releases</i>]</li>
+ <li>Visual Studio 2010</li>
</ul>
<h4>Libraries</h4>
@@ -97,6 +99,8 @@
<li><code>Externals\scew\win32\scew.vcproj</code></li>
<li><code>Externals\pcre\pcre.sln</code></li>
</ul>
+There is a Python script <code>/Tools/Scripts/UpgradeProjects.py</code> which
+updates most solution/project files.</p>
<h4>Additional requirements (out of source tree)</h4>
<ul>
Modified: branches/R2_14/Docs/Developers/Releasing.html
===================================================================
--- branches/R2_14/Docs/Developers/Releasing.html 2010-09-22 16:49:32 UTC (rev 7274)
+++ branches/R2_14/Docs/Developers/Releasing.html 2010-09-22 17:01:54 UTC (rev 7275)
@@ -69,7 +69,7 @@
<ol>
<li>Executable and libraries build tools are documented in <a href="Compiling.html">Compiling.html</a></li>
- <li>Installer building is explained in <a href="readme-InnoSetup.html">readme-manual.html</a></li>
+ <li>Installer building is explained in <a href="readme-InnoSetup.html">readme-InnoSetup.html</a></li>
<li>Manual building is explained in <a href="readme-manual.html">readme-manual.html</a></li>
</ol>
@@ -101,7 +101,7 @@
<li>Build executables and libraries (see <a href="Compiling.html">Compiling
instructions</a>)</li>
<li>Build manual (see <a href="readme-manual.html">readme-manual.html</a>)</li>
- <li>Build installer (see <a href="readme-InnoSetup.html">readme-manual.html</a>)</li>
+ <li>Build installer (see <a href="readme-InnoSetup.html">readme-InnoSetup.html</a>)</li>
<li>Create binary distribution folder:
<ol><li>Copy executables and libraries to distribution folder</li>
<li>Copy manual to <code>Docs</code> -subfolder</li>
@@ -163,8 +163,8 @@
-script)</li>
<li>updates POT and PO files</li>
<li>builds libraries (expat, scew, pcre)</li>
- <li>builds WinMerge.exe and WinMergeU.exe</li>
- <li>builds 32-bit ShellExtension targets</li>
+ <li>builds WinMergeU.exe</li>
+ <li>builds 32-bit ShellExtension target</li>
<li>builds user manual</li>
<li>builds the InnoSetup installer</li>
<li>creates per-version distribution folder</li>
Modified: branches/R2_14/Docs/Developers/SVN_Organisation.txt
===================================================================
--- branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-22 16:49:32 UTC (rev 7274)
+++ branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-22 17:01:54 UTC (rev 7275)
@@ -166,7 +166,7 @@
- Tests using Perl run WinMerge executable to test compare functionality.
WinMerge/Tools/
- - Tools needed/used with WinMerge development (e.g. language file compiler).
+ - Tools needed/used with WinMerge development.
WinMerge/Tools/diff2winmerge/
- Commandline wrapper for WinMerge executable, offers
Modified: branches/R2_14/Docs/Developers/readme-InnoSetup.html
===================================================================
--- branches/R2_14/Docs/Developers/readme-InnoSetup.html 2010-09-22 16:49:32 UTC (rev 7274)
+++ branches/R2_14/Docs/Developers/readme-InnoSetup.html 2010-09-22 17:01:54 UTC (rev 7275)
@@ -46,12 +46,12 @@
<h3>Checklist:</h3>
<ul>
<li>
- Installer reads version number from <code>WinMerge.exe</code>. So make
+ Installer reads version number from <code>WinMergeU.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.
+ There is Python script <code>Tools/Scripts/SetVersions.py</code> which sets
+ version numbers to all components. The script reads version numbers from
+ <code>/versions.ini</code> file. See more info about the script from
+ <code>Tools/Scripts/SetVersions.txt</code>
</li>
<li>
Installer checks that files listed are present. But some files are
Modified: branches/R2_14/Docs/Developers/readme-developers.html
===================================================================
--- branches/R2_14/Docs/Developers/readme-developers.html 2010-09-22 16:49:32 UTC (rev 7274)
+++ branches/R2_14/Docs/Developers/readme-developers.html 2010-09-22 17:01:54 UTC (rev 7275)
@@ -150,6 +150,26 @@
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="Minor_code_changes_and_bug_fixes">Minor code changes and bug fixes</a></h3>
+
+<p>It is reasonable to post small snippets of code showing small changes
+directly in the text in bug postings, or patch postings. For example, see
+<a href="http://sourceforge.net/tracker/?group_id=13216&atid=313216&func=detail&aid=824987">PATCH [ 824987 ] "Change binary-file detection (look only for zeros)"</a>,
+which gives the change directly in the text.</p>
+
+<p>Note, however, that sourceforge trackers currently ignore tabs, so if you
+can convert tabs to spaces in your posting, it helps greatly.</p>
+
+<p>Bugfixes may be treated less formally, especially for simple ones, or for
+fixes to code you know well -- eg, you caused the bug yourself with a
+recent patch :)</p>
+
+<p>Consider still posting something to the tracker lists, even if it is
+simply a summary in English. If the fix is something like
+"misspelled variable name foo as fooz in many places", it is quite
+understandable that you prefer to just fix the instances rather than
+doing a full patch for it.</p>
+
<h3><a name="Coding_conventions">Coding conventions</a></h3>
<p>Please conform to the prevalent coding conventions. There are quite a number of
@@ -213,10 +233,41 @@
<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,
-so everybody can figure out what we have released by just looking at the release number.
-However, some of our older releases do not follow this scheme.</p>
+so everybody can figure out what we have released by just looking at the
+release number. Unfortunately the original 4-number version numbering didn't
+work as well as we thought and caused a lot of confusion. So WinMerge 2.13.x
+and later use new 3-number version numbers:</p>
<pre>
+2.14.2
+| | |
+| | |
+| | |
+| | `--------- Denotes a beta release, an experimental release
+| | or a minor bug fix of a major release.
+| | For experimental and stable releases this number increases by
+| | one. For beta releases we may increase few numbers more.
+| `----------- Denotes a major release.
+| even numbers means "stable".
+| odd numbers means "unstable".
+`------------- Denotes a major release with major changes.
+</pre>
+
+<p>In this case:</p>
+<ul>
+ <li>The next experimental release will have the number 2.15.1 (and then
+ 2.15.2 and then 2.15.3 and so on)</li>
+ <li>The next beta release will likely have the number 2.15.10 or 2.15.20</li>
+ <li>The next major release will have the number 2.16.0</li>
+</ul>
+
+<p>And if we decide to rewrite most of the code, the next major release will
+have the number 3.0.0. This is something big like cross-platform support, 3-way
+merge etc.</p>
+
+<p>WinMerge 2.12.x and earlier releases used a four-number version numbers:
+
+<pre>
2.1.2.0
| | | |
| | | `------- This number increases for each experimental,
@@ -231,14 +282,6 @@
`------------- Denotes a major release with major changes.
</pre>
-<p>In this case:</p>
-<ul>
- <li>The next experimental release will have the number 2.1.3.0 (and then 2.1.3.1 and then 2.1.3.2 and so on)</li>
- <li>The next beta release will have the number 2.1.4.0</li>
- <li>The next major release will have the number 2.2.0.0</li>
-</ul>
-<p>And if we decide to rewrite most of the code, the next major release will have the number 3.0.0.0</p>
-
<h3><a name="Packaging_file_releases">Packaging file releases</a></h3>
<p>On SourceForge there is some space to enter Release Notes and Change Notes.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-09-22 16:49:38
|
Revision: 7274
http://winmerge.svn.sourceforge.net/winmerge/?rev=7274&view=rev
Author: kimmov
Date: 2010-09-22 16:49:32 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
Remove VS2003 runtime files from 2.14 branch.
Modified Paths:
--------------
branches/R2_14/Docs/Developers/SVN_Organisation.txt
Removed Paths:
-------------
branches/R2_14/Installer/Runtimes/
Modified: branches/R2_14/Docs/Developers/SVN_Organisation.txt
===================================================================
--- branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-22 16:40:48 UTC (rev 7273)
+++ branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-22 16:49:32 UTC (rev 7274)
@@ -22,7 +22,6 @@
- InnoSetup
- Art
- Languages
- - Runtimes
- Plugins
- dlls
- Src_Delphi
@@ -112,9 +111,6 @@
WinMerge/Installer/InnoSetup/Languages/
- Installer translations
-WinMerge/Installer/Runtimes/
- - Libraries for WinMerge added to install package
-
WinMerge/Plugins/
- Plugins files. Also plugins documentation at the moment.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-09-22 16:40:54
|
Revision: 7273
http://winmerge.svn.sourceforge.net/winmerge/?rev=7273&view=rev
Author: kimmov
Date: 2010-09-22 16:40:48 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
Remove the MakePatchDirs tool from 2.14 branch.
This tool hasn't been maintained or actively used for a long time so
we don't want to ship it with stable release.
Modified Paths:
--------------
branches/R2_14/Docs/Developers/SVN_Organisation.txt
branches/R2_14/Docs/Developers/readme-developers.html
Removed Paths:
-------------
branches/R2_14/Tools/MakePatchDirs/
Modified: branches/R2_14/Docs/Developers/SVN_Organisation.txt
===================================================================
--- branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-22 16:27:16 UTC (rev 7272)
+++ branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-22 16:40:48 UTC (rev 7273)
@@ -44,7 +44,7 @@
- selftests
- Tools
- diff2winmerge
- - MakePatchDirs
+ - Scripts
- Web
@@ -176,11 +176,5 @@
- 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/Web/
- Homepages.
Modified: branches/R2_14/Docs/Developers/readme-developers.html
===================================================================
--- branches/R2_14/Docs/Developers/readme-developers.html 2010-09-22 16:27:16 UTC (rev 7272)
+++ branches/R2_14/Docs/Developers/readme-developers.html 2010-09-22 16:40:48 UTC (rev 7273)
@@ -52,7 +52,6 @@
<h3>Table of Contents</h3>
<ol>
<li><a href="#Code_changes">Code changes</a></li>
- <li><a href="#MakePatchDirs">MakePatchDirs</a></li>
<li><a href="#Minor_code_changes_and_bug_fixes">Minor code changes and bug fixes</a></li>
<li><a href="#Coding_conventions">Coding conventions</a></li>
<li><a href="#Doxygen_comments">Doxygen comments</a></li>
@@ -151,32 +150,6 @@
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>
-
-<p>Perry wrote a small program called
-<a href="readme-developers-MakePatchDirs.html">MakePatchDirs</a>, which helps
-in his patch process -- read the link for more information.</p>
-
-<h3><a name="Minor_code_changes_and_bug_fixes">Minor code changes and bug fixes</a></h3>
-
-<p>It is reasonable to post small snippets of code showing small changes
-directly in the text in bug postings, or patch postings. For example, see
-<a href="http://sourceforge.net/tracker/?group_id=13216&atid=313216&func=detail&aid=824987">PATCH [ 824987 ] "Change binary-file detection (look only for zeros)"</a>,
-which gives the change directly in the text.</p>
-
-<p>Note, however, that sourceforge trackers currently ignore tabs, so if you
-can convert tabs to spaces in your posting, it helps greatly.</p>
-
-<p>Bugfixes may be treated less formally, especially for simple ones, or for
-fixes to code you know well -- eg, you caused the bug yourself with a
-recent patch :)</p>
-
-<p>Consider still posting something to the tracker lists, even if it is
-simply a summary in English. If the fix is something like
-"misspelled variable name foo as fooz in many places", it is quite
-understandable that you prefer to just fix the instances rather than
-doing a full patch for it.</p>
-
<h3><a name="Coding_conventions">Coding conventions</a></h3>
<p>Please conform to the prevalent coding conventions. There are quite a number of
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-09-22 16:27:23
|
Revision: 7272
http://winmerge.svn.sourceforge.net/winmerge/?rev=7272&view=rev
Author: kimmov
Date: 2010-09-22 16:27:16 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
Update version number in 2.14 branch to 2.13.19.
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/versions.ini
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-09-22 16:22:45 UTC (rev 7271)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-09-22 16:27:16 UTC (rev 7272)
@@ -3,7 +3,7 @@
to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
http://winmerge.org/tracker/[tracker-id]
-WinMerge 2.12.6
+WinMerge 2.13.19
Add missing keywords to Pascal highlighter (#2834192)
Fix help locations (#2988974)
New translation: Persian (#2877121, #3065119)
Modified: branches/R2_14/versions.ini
===================================================================
--- branches/R2_14/versions.ini 2010-09-22 16:22:45 UTC (rev 7271)
+++ branches/R2_14/versions.ini 2010-09-22 16:27:16 UTC (rev 7272)
@@ -7,13 +7,13 @@
description = WinMerge InnoSetup installer
path = Installer/InnoSetup/WinMerge.iss
macro = AppVersion
-version = "2.12.9"
+version = "2.13.19"
[Executable]
type = WinRC
description = WinMerge executable
path = Src/Merge.rc
-version = "2.12.9"
+version = "2.13.19"
[Dll]
type = WinRC
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-09-22 16:22:54
|
Revision: 7271
http://winmerge.svn.sourceforge.net/winmerge/?rev=7271&view=rev
Author: kimmov
Date: 2010-09-22 16:22:45 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
Update version number in trunk to 2.15.1.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/versions.ini
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-09-22 15:38:43 UTC (rev 7270)
+++ trunk/Docs/Users/ChangeLog.txt 2010-09-22 16:22:45 UTC (rev 7271)
@@ -3,6 +3,9 @@
to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
http://winmerge.org/tracker/[tracker-id]
+WinMerge 2.15.1
+ Update version number in trunk
+
WinMerge 2.13.14 - 2010-09-15 (r7263)
Update release compiler and runtimes to VS2008
Remove ANSI binaries from distribution
Modified: trunk/versions.ini
===================================================================
--- trunk/versions.ini 2010-09-22 15:38:43 UTC (rev 7270)
+++ trunk/versions.ini 2010-09-22 16:22:45 UTC (rev 7271)
@@ -7,13 +7,13 @@
description = WinMerge InnoSetup installer
path = Installer/InnoSetup/WinMerge.iss
macro = AppVersion
-version = "2.13.14"
+version = "2.15.1"
[Executable]
type = WinRC
description = WinMerge executable
path = Src/Merge.rc
-version = "2.13.14"
+version = "2.15.1"
[Dll]
type = WinRC
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-09-22 15:38:50
|
Revision: 7270
http://winmerge.svn.sourceforge.net/winmerge/?rev=7270&view=rev
Author: kimmov
Date: 2010-09-22 15:38:43 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
Create a 2.14.x stable release branch.
Added Paths:
-----------
branches/R2_14/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
