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: <ki...@us...> - 2009-12-29 14:22:56
|
Revision: 7067
http://winmerge.svn.sourceforge.net/winmerge/?rev=7067&view=rev
Author: kimmov
Date: 2009-12-29 14:22:46 +0000 (Tue, 29 Dec 2009)
Log Message:
-----------
PATCH: [ 2922223 ] MergeDocLineDiffs clean up
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Src/MergeDocLineDiffs.cpp
Modified: trunk/Src/MergeDocLineDiffs.cpp
===================================================================
--- trunk/Src/MergeDocLineDiffs.cpp 2009-12-28 20:28:18 UTC (rev 7066)
+++ trunk/Src/MergeDocLineDiffs.cpp 2009-12-29 14:22:46 UTC (rev 7067)
@@ -193,31 +193,14 @@
DIFFOPTIONS diffOptions = {0};
m_diffWrapper.GetOptions(&diffOptions);
+ i1 = m_pView[0]->GetLineLength(line);
+ i2 = m_pView[1]->GetLineLength(line);
+ String str1(m_pView[0]->GetLineChars(line), i1);
+ String str2(m_pView[1]->GetLineChars(line), i2);
- String str1(pView1->GetLineChars(line), pView1->GetFullLineLength(line));
- String str2(pView2->GetLineChars(line), pView2->GetFullLineLength(line));
-
- /* Commented out code because GetLineActualLength is buggy
- // Chop of eol (end of line) characters
- int len1 = pView1->GetLineActualLength(line);
- str1 = str1.Left(len1);
- int len2 = pView2->GetLineActualLength(line);
- str2 = str2.Left(len2);
- */
- i1 = str1.length() - 1;
- while (i1 >= 0 && (str1[i1] == '\r' || str1[i1] == '\n'))
- --i1;
- if (i1 + 1 < str1.length())
- str1.resize(i1 + 1);
- i2 = str2.length() - 1;
- while (i2 >= 0 && (str2[i2]=='\r' || str2[i2]=='\n'))
- --i2;
- if (i2+1 < str2.length())
- str2.resize(i2 + 1);
-
// We truncate diffs to remain inside line (ie, to not flag eol characters)
- int width1 = pView1->GetLineLength(line);
- int width2 = pView2->GetLineLength(line);
+ int width1 = i1;
+ int width2 = i2;
// Options that affect comparison
bool casitive = !diffOptions.bIgnoreCase;
@@ -232,7 +215,7 @@
{
if (pView1->GetTextBufferEol(line) != pView1->GetTextBufferEol(line))
{
- wdiff *wdf = new wdiff(++i1, i1, ++i2, i2);
+ wdiff *wdf = new wdiff(i1, i1, i2, i2);
worddiffs.push_back(wdf);
}
}
@@ -335,28 +318,11 @@
DIFFOPTIONS diffOptions = {0};
m_diffWrapper.GetOptions(&diffOptions);
+ i1 = m_pView[0]->GetLineLength(nLineIndex);
+ i2 = m_pView[1]->GetLineLength(nLineIndex);
+ String str1(m_pView[0]->GetLineChars(nLineIndex), i1);
+ String str2(m_pView[1]->GetLineChars(nLineIndex), i2);
- String str1(m_pView[0]->GetLineChars(nLineIndex), m_pView[0]->GetFullLineLength(nLineIndex));
- String str2(m_pView[1]->GetLineChars(nLineIndex), m_pView[1]->GetFullLineLength(nLineIndex));
-
- /* Commented out code because GetLineActualLength is buggy
- // Chop of eol (end of line) characters
- int len1 = pView1->GetLineActualLength(line);
- str1 = str1.Left(len1);
- int len2 = pView2->GetLineActualLength(line);
- str2 = str2.Left(len2);
- */
- i1 = str1.length() - 1;
- while (i1 >= 0 && (str1[i1] == '\r' || str1[i1] == '\n'))
- --i1;
- if (i1 + 1 < str1.length())
- str1.resize(i1 + 1);
- i2 = str2.length() - 1;
- while (i2 >= 0 && (str2[i2]=='\r' || str2[i2]=='\n'))
- --i2;
- if (i2+1 < str2.length())
- str2.resize(i2 + 1);
-
// Options that affect comparison
bool casitive = !diffOptions.bIgnoreCase;
int xwhite = diffOptions.nIgnoreWhitespace;
@@ -370,7 +336,7 @@
{
if (m_pView[0]->GetTextBufferEol(nLineIndex) != m_pView[1]->GetTextBufferEol(nLineIndex))
{
- wdiff *wdf = new wdiff(++i1, i1, ++i2, i2);
+ wdiff *wdf = new wdiff(i1, i1, i2, i2);
pworddiffs->push_back(wdf);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-28 20:28:28
|
Revision: 7066
http://winmerge.svn.sourceforge.net/winmerge/?rev=7066&view=rev
Author: kimmov
Date: 2009-12-28 20:28:18 +0000 (Mon, 28 Dec 2009)
Log Message:
-----------
More fixing for X64 project file. More precompiled header file removing.
Modified Paths:
--------------
trunk/Src/MergeX64.vcproj
Modified: trunk/Src/MergeX64.vcproj
===================================================================
--- trunk/Src/MergeX64.vcproj 2009-12-28 20:16:21 UTC (rev 7065)
+++ trunk/Src/MergeX64.vcproj 2009-12-28 20:28:18 UTC (rev 7066)
@@ -3055,6 +3055,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -3120,6 +3121,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -3142,6 +3144,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
@@ -7545,6 +7548,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="UnicodeRelease|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="UnicodeDebug|Win32"
>
<Tool
@@ -7553,6 +7564,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="UnicodeDebug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -7561,6 +7580,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="X64 Release|Win32"
>
<Tool
@@ -7568,6 +7595,14 @@
UsePrecompiledHeader="0"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="FileFilterHelper.cpp"
@@ -7591,6 +7626,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -7613,6 +7649,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -7678,6 +7715,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -7700,6 +7738,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
@@ -7725,6 +7764,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -7747,6 +7787,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -7812,6 +7853,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -7834,6 +7876,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
@@ -30139,6 +30182,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -30161,6 +30205,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -30226,6 +30271,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -30248,6 +30294,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-28 20:16:33
|
Revision: 7065
http://winmerge.svn.sourceforge.net/winmerge/?rev=7065&view=rev
Author: kimmov
Date: 2009-12-28 20:16:21 +0000 (Mon, 28 Dec 2009)
Log Message:
-----------
Fix X64 project file. Was missing some new files and removal of precompiled headers from several files.
Modified Paths:
--------------
trunk/Src/MergeX64.vcproj
Modified: trunk/Src/MergeX64.vcproj
===================================================================
--- trunk/Src/MergeX64.vcproj 2009-12-28 11:54:11 UTC (rev 7064)
+++ trunk/Src/MergeX64.vcproj 2009-12-28 20:16:21 UTC (rev 7065)
@@ -2746,6 +2746,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -2768,6 +2769,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -2838,6 +2840,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -2862,6 +2865,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -3018,6 +3022,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -3038,6 +3043,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -3102,6 +3108,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -3124,6 +3131,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -4200,6 +4208,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -4222,6 +4231,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -4292,6 +4302,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -4316,6 +4327,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -4482,6 +4494,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -4504,6 +4517,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -4574,6 +4588,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -4598,6 +4613,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -5928,6 +5944,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -5950,6 +5967,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -6020,6 +6038,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -6044,6 +6063,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -7514,6 +7534,42 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\FileFilter.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="FileFilterHelper.cpp"
>
<FileConfiguration
@@ -7524,6 +7580,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -7544,6 +7601,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -7608,6 +7666,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -7630,6 +7689,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -7654,6 +7714,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -7674,6 +7735,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -7738,6 +7800,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -7760,6 +7823,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -8564,6 +8628,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -8586,6 +8651,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -8656,6 +8722,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -8680,6 +8747,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -8836,6 +8904,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -8858,6 +8927,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -8928,6 +8998,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -8952,6 +9023,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -11064,6 +11136,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -11086,6 +11159,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -11156,6 +11230,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -11180,6 +11255,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -12910,6 +12986,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\OptionsPanel.cpp"
+ >
+ </File>
+ <File
RelativePath="OutputDlg.cpp"
>
<FileConfiguration
@@ -15010,6 +15090,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\PropCompareFolder.cpp"
+ >
+ </File>
+ <File
RelativePath="PropEditor.cpp"
>
<FileConfiguration
@@ -16823,6 +16907,14 @@
RelativePath=".\Common\ShellFileOperations.cpp"
>
<FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="UnicodeRelease|x64"
>
<Tool
@@ -16832,6 +16924,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="UnicodeDebug|x64"
>
<Tool
@@ -16859,6 +16959,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="X64 Debug|x64"
>
<Tool
@@ -16868,6 +16976,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="X64 Release|x64"
>
<Tool
@@ -17933,6 +18049,14 @@
RelativePath=".\Common\string_util.cpp"
>
<FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="UnicodeRelease|x64"
>
<Tool
@@ -17942,6 +18066,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="UnicodeDebug|x64"
>
<Tool
@@ -17969,6 +18101,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="X64 Debug|x64"
>
<Tool
@@ -17978,6 +18118,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="X64 Release|x64"
>
<Tool
@@ -17998,6 +18146,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -18020,6 +18169,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -18090,6 +18240,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -18114,6 +18265,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -19543,6 +19695,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -19565,6 +19718,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -19635,6 +19789,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -19659,6 +19814,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -19685,6 +19841,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -19707,6 +19864,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -19777,6 +19935,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -19801,6 +19960,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -20814,6 +20974,10 @@
>
</File>
<File
+ RelativePath=".\FileFilter.h"
+ >
+ </File>
+ <File
RelativePath="FileFilterHelper.h"
>
</File>
@@ -21002,6 +21166,10 @@
>
</File>
<File
+ RelativePath=".\OptionsPanel.h"
+ >
+ </File>
+ <File
RelativePath="OutputDlg.h"
>
</File>
@@ -21074,6 +21242,10 @@
>
</File>
<File
+ RelativePath=".\PropCompareFolder.h"
+ >
+ </File>
+ <File
RelativePath="PropEditor.h"
>
</File>
@@ -29956,6 +30128,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -29976,6 +30149,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -30040,6 +30214,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -30062,6 +30237,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -30347,6 +30523,14 @@
RelativePath="CompareEngines\DiffUtils.h"
>
</File>
+ <File
+ RelativePath=".\CompareEngines\TimeSizeCompare.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\CompareEngines\TimeSizeCompare.h"
+ >
+ </File>
</Filter>
</Files>
<Globals>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-28 11:54:21
|
Revision: 7064
http://winmerge.svn.sourceforge.net/winmerge/?rev=7064&view=rev
Author: kimmov
Date: 2009-12-28 11:54:11 +0000 (Mon, 28 Dec 2009)
Log Message:
-----------
Wix: Remove already implemented TODO-item (C++ runtimes).
Modified Paths:
--------------
trunk/Installer/WiX/WinMerge.wxs
Modified: trunk/Installer/WiX/WinMerge.wxs
===================================================================
--- trunk/Installer/WiX/WinMerge.wxs 2009-12-27 15:28:16 UTC (rev 7063)
+++ trunk/Installer/WiX/WinMerge.wxs 2009-12-28 11:54:11 UTC (rev 7064)
@@ -16,7 +16,6 @@
* ClearCase
* Modify Path
* Don't install 32 bit version von Windows x64
- * Install C++ Runtime files
* Separate page for tasks (shortcuts, TortoiseSVN, ...)
* Install translated readme files
* Set WinMerge language
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-27 15:28:24
|
Revision: 7063
http://winmerge.svn.sourceforge.net/winmerge/?rev=7063&view=rev
Author: kimmov
Date: 2009-12-27 15:28:16 +0000 (Sun, 27 Dec 2009)
Log Message:
-----------
Unify DIFFITEM method naming and remove unused method.
Modified Paths:
--------------
trunk/Src/7zCommon.cpp
trunk/Src/DiffContext.cpp
trunk/Src/DiffItem.cpp
trunk/Src/DiffItem.h
trunk/Src/DirView.cpp
trunk/Src/DirViewColItems.cpp
trunk/Src/MainFrm.cpp
Modified: trunk/Src/7zCommon.cpp
===================================================================
--- trunk/Src/7zCommon.cpp 2009-12-27 14:43:51 UTC (rev 7062)
+++ trunk/Src/7zCommon.cpp 2009-12-27 15:28:16 UTC (rev 7063)
@@ -911,8 +911,8 @@
envelope->FullPath = sFilename;
envelope->FullPath.insert(0, _T("\\"));
envelope->FullPath.insert(0, m_bRight ?
- di.getRightFilepath(pDoc->GetRightBasePath()) :
- di.getLeftFilepath(pDoc->GetLeftBasePath()));
+ di.GetRightFilepath(pDoc->GetRightBasePath()) :
+ di.GetLeftFilepath(pDoc->GetLeftBasePath()));
UINT32 Recurse = item.Mask.Recurse;
@@ -930,7 +930,7 @@
// Folder is not implied by some other file, and has
// not been enumerated so far, so enumerate it now!
envelope->Name = di.left.path;
- envelope->FullPath = di.getLeftFilepath(pDoc->GetLeftBasePath());
+ envelope->FullPath = di.GetLeftFilepath(pDoc->GetLeftBasePath());
implied = PVOID(2); // Don't enumerate same folder twice!
isSideLeft = false;
Recurse = 0;
@@ -949,7 +949,7 @@
// Folder is not implied by some other file, and has
// not been enumerated so far, so enumerate it now!
envelope->Name = di.right.path;
- envelope->FullPath = di.getRightFilepath(pDoc->GetRightBasePath());
+ envelope->FullPath = di.GetRightFilepath(pDoc->GetRightBasePath());
implied = PVOID(2); // Don't enumerate same folder twice!
isSideRight = false;
Recurse = 0;
@@ -1105,7 +1105,7 @@
{
cchBuffer +=
(
- m_bRight ? di.getRightFilepath(sLeftRootPath) : di.getLeftFilepath(sRightRootPath)
+ m_bRight ? di.GetRightFilepath(sLeftRootPath) : di.GetLeftFilepath(sRightRootPath)
).length() + (m_bRight ? di.right.filename : di.left.filename).length() + 2;
}
}
@@ -1119,7 +1119,7 @@
(
pchBuffer,
_T("%s\\%s"),
- m_bRight ? di.getRightFilepath(sLeftRootPath).c_str() : di.getLeftFilepath(sRightRootPath).c_str(),
+ m_bRight ? di.GetRightFilepath(sLeftRootPath).c_str() : di.GetLeftFilepath(sRightRootPath).c_str(),
m_bRight ? di.right.filename.c_str() : di.left.filename.c_str()
) + 1;
}
Modified: trunk/Src/DiffContext.cpp
===================================================================
--- trunk/Src/DiffContext.cpp 2009-12-27 14:43:51 UTC (rev 7062)
+++ trunk/Src/DiffContext.cpp 2009-12-27 15:28:16 UTC (rev 7063)
@@ -130,9 +130,9 @@
String filepath;
if (bLeft == TRUE)
- filepath = paths_ConcatPath(di.getLeftFilepath(GetNormalizedLeft()), di.left.filename);
+ filepath = paths_ConcatPath(di.GetLeftFilepath(GetNormalizedLeft()), di.left.filename);
else
- filepath = paths_ConcatPath(di.getRightFilepath(GetNormalizedRight()), di.right.filename);
+ filepath = paths_ConcatPath(di.GetRightFilepath(GetNormalizedRight()), di.right.filename);
DiffFileInfo & dfi = bLeft ? di.left : di.right;
if (!dfi.Update(filepath.c_str()))
@@ -190,7 +190,7 @@
LPCTSTR ext = PathFindExtension(di.left.filename.c_str());
if (!CheckFileForVersion(ext))
return;
- spath = di.getLeftFilepath(GetNormalizedLeft());
+ spath = di.GetLeftFilepath(GetNormalizedLeft());
spath = paths_ConcatPath(spath, di.left.filename);
}
else
@@ -200,7 +200,7 @@
LPCTSTR ext = PathFindExtension(di.right.filename.c_str());
if (!CheckFileForVersion(ext))
return;
- spath = di.getRightFilepath(GetNormalizedRight());
+ spath = di.GetRightFilepath(GetNormalizedRight());
spath = paths_ConcatPath(spath, di.right.filename);
}
Modified: trunk/Src/DiffItem.cpp
===================================================================
--- trunk/Src/DiffItem.cpp 2009-12-27 14:43:51 UTC (rev 7062)
+++ trunk/Src/DiffItem.cpp 2009-12-27 15:28:16 UTC (rev 7063)
@@ -24,7 +24,7 @@
}
/** @brief Return path to left file, including all but file name */
-String DIFFITEM::getLeftFilepath(const String &sLeftRoot) const
+String DIFFITEM::GetLeftFilepath(const String &sLeftRoot) const
{
String sPath;
if (!diffcode.isSideRightOnly())
@@ -35,7 +35,7 @@
}
/** @brief Return path to right file, including all but file name */
-String DIFFITEM::getRightFilepath(const String &sRightRoot) const
+String DIFFITEM::GetRightFilepath(const String &sRightRoot) const
{
String sPath;
if (!diffcode.isSideLeftOnly())
Modified: trunk/Src/DiffItem.h
===================================================================
--- trunk/Src/DiffItem.h 2009-12-27 14:43:51 UTC (rev 7062)
+++ trunk/Src/DiffItem.h 2009-12-27 15:28:16 UTC (rev 7063)
@@ -144,9 +144,8 @@
DIFFITEM() : parent(NULL), nidiffs(-1), nsdiffs(-1), customFlags1(0) { }
~DIFFITEM();
- bool isEmpty() const { return this == &emptyitem; }
- String getLeftFilepath(const String &sLeftRoot) const;
- String getRightFilepath(const String &sRightRoot) const;
+ String GetLeftFilepath(const String &sLeftRoot) const;
+ String GetRightFilepath(const String &sRightRoot) const;
int GetDepth() const;
bool IsAncestor(const DIFFITEM *pdi) const;
bool HasChildren() const;
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2009-12-27 14:43:51 UTC (rev 7062)
+++ trunk/Src/DirView.cpp 2009-12-27 15:28:16 UTC (rev 7063)
@@ -738,9 +738,9 @@
!di.diffcode.isSideLeftOnly() && !di.diffcode.isSideRightOnly() &&
!di.diffcode.isResultFiltered())
{
- String leftPath(di.getLeftFilepath(pDoc->GetLeftBasePath()));
+ String leftPath(di.GetLeftFilepath(pDoc->GetLeftBasePath()));
leftPath = paths_ConcatPath(leftPath, di.left.filename);
- String rightPath(di.getRightFilepath(pDoc->GetRightBasePath()));
+ String rightPath(di.GetRightFilepath(pDoc->GetRightBasePath()));
rightPath = paths_ConcatPath(rightPath, di.right.filename);
CString filteredFilenames;
filteredFilenames.Format(_T("%s|%s"), leftPath.c_str(), rightPath.c_str());
@@ -827,8 +827,8 @@
continue;
String currentDir = (side == SIDE_LEFT) ?
- di.getLeftFilepath(pDoc->GetLeftBasePath()) :
- di.getRightFilepath(pDoc->GetRightBasePath());
+ di.GetLeftFilepath(pDoc->GetLeftBasePath()) :
+ di.GetRightFilepath(pDoc->GetRightBasePath());
String filename = ((side == SIDE_LEFT) ? di.left.filename : di.right.filename);
@@ -1289,7 +1289,7 @@
// right side base path (where to create)
subdir = di.left.filename;
basedir = GetDocument()->GetRightBasePath();
- basedir = di.getLeftFilepath(basedir);
+ basedir = di.GetLeftFilepath(basedir);
}
else
{
@@ -1297,7 +1297,7 @@
// left side base path (where to create)
subdir = di.right.filename;
basedir = GetDocument()->GetLeftBasePath();
- basedir = di.getRightFilepath(basedir);
+ basedir = di.GetRightFilepath(basedir);
}
String createpath = paths_ConcatPath(basedir, subdir);
newFolder = createpath;
@@ -3105,7 +3105,7 @@
const DIFFITEM& di = GetDiffItem(sel);
if (!di.diffcode.isSideRightOnly())
{
- strPaths += di.getLeftFilepath(GetDocument()->GetLeftBasePath());
+ strPaths += di.GetLeftFilepath(GetDocument()->GetLeftBasePath());
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
strPaths = paths_ConcatPath(strPaths, di.left.filename);
@@ -3132,7 +3132,7 @@
const DIFFITEM& di = GetDiffItem(sel);
if (!di.diffcode.isSideLeftOnly())
{
- strPaths += di.getRightFilepath(pDoc->GetRightBasePath());
+ strPaths += di.GetRightFilepath(pDoc->GetRightBasePath());
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
strPaths = paths_ConcatPath(strPaths, di.right.filename);
@@ -3159,7 +3159,7 @@
const DIFFITEM& di = GetDiffItem(sel);
if (!di.diffcode.isSideRightOnly())
{
- strPaths += di.getLeftFilepath(pDoc->GetLeftBasePath());
+ strPaths += di.GetLeftFilepath(pDoc->GetLeftBasePath());
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
strPaths = paths_ConcatPath(strPaths, di.left.filename);
@@ -3170,7 +3170,7 @@
if (!di.diffcode.isSideLeftOnly())
{
- strPaths += di. getRightFilepath(pDoc->GetRightBasePath());
+ strPaths += di. GetRightFilepath(pDoc->GetRightBasePath());
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
strPaths = paths_ConcatPath(strPaths, di.right.filename);
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2009-12-27 14:43:51 UTC (rev 7062)
+++ trunk/Src/DirViewColItems.cpp 2009-12-27 15:28:16 UTC (rev 7063)
@@ -277,12 +277,12 @@
else if (di.diffcode.isSideLeftOnly())
{
s = theApp.LoadString(IDS_LEFT_ONLY_IN_FMT);
- string_replace(s, _T("%1"), di.getLeftFilepath(pCtxt->GetNormalizedLeft()).c_str());
+ string_replace(s, _T("%1"), di.GetLeftFilepath(pCtxt->GetNormalizedLeft()).c_str());
}
else if (di.diffcode.isSideRightOnly())
{
s = theApp.LoadString(IDS_RIGHT_ONLY_IN_FMT);
- string_replace(s, _T("%1"), di.getRightFilepath(pCtxt->GetNormalizedRight()).c_str());
+ string_replace(s, _T("%1"), di.GetRightFilepath(pCtxt->GetNormalizedRight()).c_str());
}
else if (di.diffcode.isResultSame())
{
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2009-12-27 14:43:51 UTC (rev 7062)
+++ trunk/Src/MainFrm.cpp 2009-12-27 15:28:16 UTC (rev 7063)
@@ -2087,10 +2087,10 @@
if (bValidFiles)
{
// Format full paths to files (leftFile/rightFile)
- String leftFile = item.getLeftFilepath(pDoc->GetLeftBasePath());
+ String leftFile = item.GetLeftFilepath(pDoc->GetLeftBasePath());
if (!leftFile.empty())
leftFile = paths_ConcatPath(leftFile, item.left.filename);
- String rightFile = item.getRightFilepath(pDoc->GetRightBasePath());
+ String rightFile = item.GetRightFilepath(pDoc->GetRightBasePath());
if (!rightFile.empty())
rightFile = paths_ConcatPath(rightFile, item.right.filename);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-27 14:44:01
|
Revision: 7062
http://winmerge.svn.sourceforge.net/winmerge/?rev=7062&view=rev
Author: kimmov
Date: 2009-12-27 14:43:51 +0000 (Sun, 27 Dec 2009)
Log Message:
-----------
BUG: [ 2890961 ] Creation of matching folder is wrong in recursive view mode
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/DirView.cpp
trunk/Src/DirView.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-12-27 12:51:35 UTC (rev 7061)
+++ trunk/Docs/Users/ChangeLog.txt 2009-12-27 14:43:51 UTC (rev 7062)
@@ -8,6 +8,7 @@
Bugfix: Plugin error after interrupting folder compare (#2919475)
Bugfix: GUI Word Wrap missing text (#2921400, #2894033)
Bugfix: Selected custom odepage was not used (#2921555)
+ Bugfix: Created new matching folder to wrong folder (#2890961)
WinMerge 2.13.10 2009-12-21 (r7051)
Visual Studio project files upgraded to VS2005 format (r7045)
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2009-12-27 12:51:35 UTC (rev 7061)
+++ trunk/Src/DirView.cpp 2009-12-27 14:43:51 UTC (rev 7062)
@@ -1276,9 +1276,10 @@
* contents and don't necessarily need to copy whole folder structure.
* @param [in] di DIFFITEM for folder compare item.
* @param [in] side1 true if our unique folder item is side1 item.
+ * @param [out] newFolder New created folder (full folder path).
* @return true if user agreed and folder was created.
*/
-bool CDirView::CreateFoldersPair(DIFFITEM & di, bool side1)
+bool CDirView::CreateFoldersPair(DIFFITEM & di, bool side1, String &newFolder)
{
String subdir;
String basedir;
@@ -1288,6 +1289,7 @@
// right side base path (where to create)
subdir = di.left.filename;
basedir = GetDocument()->GetRightBasePath();
+ basedir = di.getLeftFilepath(basedir);
}
else
{
@@ -1295,8 +1297,10 @@
// left side base path (where to create)
subdir = di.right.filename;
basedir = GetDocument()->GetLeftBasePath();
+ basedir = di.getRightFilepath(basedir);
}
String createpath = paths_ConcatPath(basedir, subdir);
+ newFolder = createpath;
CString message;
LangFormatString1(message, IDS_CREATE_PAIR_FOLDER, createpath.c_str());
@@ -1351,7 +1355,7 @@
// Open left-only item to editor if its not a folder or binary
if (isDir)
{
- if (CreateFoldersPair(**di1, true))
+ if (CreateFoldersPair(**di1, true, path2))
{
return true;
}
@@ -1367,7 +1371,7 @@
// Open right-only item to editor if its not a folder or binary
if (isDir)
{
- if (CreateFoldersPair(**di1, false))
+ if (CreateFoldersPair(**di1, false, path1))
{
return true;
}
Modified: trunk/Src/DirView.h
===================================================================
--- trunk/Src/DirView.h 2009-12-27 12:51:35 UTC (rev 7061)
+++ trunk/Src/DirView.h 2009-12-27 14:43:51 UTC (rev 7062)
@@ -254,7 +254,7 @@
String &path1, String &path2, int & sel1, bool & isDir);
bool OpenTwoItems(UINT_PTR pos1, UINT_PTR pos2, DIFFITEM **di1, DIFFITEM **di2,
String &path1, String &path2, int & sel1, int & sel2, bool & isDir);
- bool CreateFoldersPair(DIFFITEM & di, bool side1);
+ bool CreateFoldersPair(DIFFITEM & di, bool side1, String &newFolder);
// Implementation data
protected:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-27 12:51:43
|
Revision: 7061
http://winmerge.svn.sourceforge.net/winmerge/?rev=7061&view=rev
Author: kimmov
Date: 2009-12-27 12:51:35 +0000 (Sun, 27 Dec 2009)
Log Message:
-----------
PATCH: [ 2921555 ] selected codepage is not used
Fixes bug #2907951.
Submitted by Matthias Mayer.
Modified Paths:
--------------
trunk/Src/MergeDoc.cpp
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2009-12-27 12:46:20 UTC (rev 7060)
+++ trunk/Src/MergeDoc.cpp 2009-12-27 12:51:35 UTC (rev 7061)
@@ -84,7 +84,7 @@
_T ("\x0d") // Macintosh style
};
-static void SaveBuffForDiff(CDiffTextBuffer & buf, LPCTSTR filepath);
+static void SaveBuffForDiff(CDiffTextBuffer & buf, CDiffTextBuffer & buf2, LPCTSTR filepath);
static void UnescapeControlChars(CString &s);
/////////////////////////////////////////////////////////////////////////////
@@ -336,14 +336,14 @@
* (the plugins are optional, not the conversion)
* @todo Show SaveToFile() errors?
*/
-static void SaveBuffForDiff(CDiffTextBuffer & buf, LPCTSTR filepath)
+static void SaveBuffForDiff(CDiffTextBuffer & buf, CDiffTextBuffer & buf2, LPCTSTR filepath)
{
ASSERT(buf.m_nSourceEncoding == buf.m_nDefaultEncoding);
int orig_codepage = buf.getCodepage();
ucr::UNICODESET orig_unicoding = buf.getUnicoding();
// If file was in Unicode
- if (orig_unicoding!=ucr::NONE)
+ if ((orig_unicoding != ucr::NONE) || (buf2.getUnicoding() != ucr::NONE))
{
// we subvert the buffer's memory of the original file encoding
buf.setUnicoding(ucr::UCS2LE); // write as UCS-2LE (for preprocessing)
@@ -485,8 +485,8 @@
// output buffers to temp files (in UTF-8 if TCHAR=wchar_t or buffer was Unicode)
if (bBinary == FALSE)
{
- SaveBuffForDiff(*m_ptBuf[0], m_tempFiles[0].GetPath().c_str());
- SaveBuffForDiff(*m_ptBuf[1], m_tempFiles[1].GetPath().c_str());
+ SaveBuffForDiff(*m_ptBuf[0], *m_ptBuf[1], m_tempFiles[0].GetPath().c_str());
+ SaveBuffForDiff(*m_ptBuf[1], *m_ptBuf[0], m_tempFiles[1].GetPath().c_str());
}
// Set up DiffWrapper
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-27 12:46:27
|
Revision: 7060
http://winmerge.svn.sourceforge.net/winmerge/?rev=7060&view=rev
Author: kimmov
Date: 2009-12-27 12:46:20 +0000 (Sun, 27 Dec 2009)
Log Message:
-----------
PATCH: [ 2921555 ] selected codepage is not used
Fixes bug #2907951.
Submitted by Matthias Mayer.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Common/multiformatText.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-12-27 00:06:59 UTC (rev 7059)
+++ trunk/Docs/Users/ChangeLog.txt 2009-12-27 12:46:20 UTC (rev 7060)
@@ -7,6 +7,7 @@
Write config log as UTF-8 file (r7057)
Bugfix: Plugin error after interrupting folder compare (#2919475)
Bugfix: GUI Word Wrap missing text (#2921400, #2894033)
+ Bugfix: Selected custom odepage was not used (#2921555)
WinMerge 2.13.10 2009-12-21 (r7051)
Visual Studio project files upgraded to VS2005 format (r7045)
Modified: trunk/Src/Common/multiformatText.cpp
===================================================================
--- trunk/Src/Common/multiformatText.cpp 2009-12-27 00:06:59 UTC (rev 7059)
+++ trunk/Src/Common/multiformatText.cpp 2009-12-27 12:46:20 UTC (rev 7060)
@@ -737,9 +737,9 @@
DWORD flags =0;
UINT nDstSize;
//First convert to unicode UCS16
- nDstSize = MultiByteToWideChar(CP_ACP, flags, (const char*)(pszBuf + nSizeOldBOM),nchars,0,0);
+ nDstSize = MultiByteToWideChar(ufile.GetCodepage(), flags, (const char*)(pszBuf + nSizeOldBOM),nchars,0,0);
wchar_t *szTemp = new wchar_t[nDstSize];
- nDstSize = MultiByteToWideChar(CP_ACP, flags, (const char*)(pszBuf + nSizeOldBOM),nchars,szTemp,nDstSize);
+ nDstSize = MultiByteToWideChar(ufile.GetCodepage(), flags, (const char*)(pszBuf + nSizeOldBOM),nchars,szTemp,nDstSize);
//now convert to unicode UTF8
nDstSize = WideCharToMultiByte(CP_UTF8, flags, szTemp, nDstSize, NULL, 0, NULL, NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-27 00:07:06
|
Revision: 7059
http://winmerge.svn.sourceforge.net/winmerge/?rev=7059&view=rev
Author: kimmov
Date: 2009-12-27 00:06:59 +0000 (Sun, 27 Dec 2009)
Log Message:
-----------
Convert most of the config log code to use String instead of CString.
Modified Paths:
--------------
trunk/Src/ConfigLog.cpp
trunk/Src/ConfigLog.h
trunk/Src/MainFrm.cpp
Modified: trunk/Src/ConfigLog.cpp
===================================================================
--- trunk/Src/ConfigLog.cpp 2009-12-26 23:11:18 UTC (rev 7058)
+++ trunk/Src/ConfigLog.cpp 2009-12-27 00:06:59 UTC (rev 7059)
@@ -60,7 +60,7 @@
/**
* @brief Return logfile name and path
*/
-CString CConfigLog::GetFileName() const
+String CConfigLog::GetFileName() const
{
return m_sFileName;
}
@@ -93,12 +93,12 @@
}
/**
- * @brief CString wrapper around API call GetLocaleInfo
+ * @brief String wrapper around API call GetLocaleInfo
*/
-static CString GetLocaleString(LCID locid, LCTYPE lctype)
+static String GetLocaleString(LCID locid, LCTYPE lctype)
{
TCHAR buffer[512];
- if (!GetLocaleInfo(locid, lctype, buffer, sizeof(buffer)/sizeof(buffer[0])))
+ if (!GetLocaleInfo(locid, lctype, buffer, countof(buffer)))
buffer[0] = 0;
return buffer;
}
@@ -106,7 +106,7 @@
/**
* @brief Return Windows font charset constant name from constant value, eg, FontCharsetName() => "Hebrew"
*/
-static CString FontCharsetName(BYTE charset)
+static String FontCharsetName(BYTE charset)
{
switch(charset)
{
@@ -142,12 +142,19 @@
if (!m_writing)
return;
- CString text;
- text.Format(value ? _T("%*.0s%s: %s\r\n") : _T("%*.0s%s:\r\n"), indent, key, key, value);
- m_pfile->WriteString((LPCTSTR)text);
+ String text = string_format(value ? _T("%*.0s%s: %s\r\n") : _T("%*.0s%s:\r\n"), indent, key, key, value);
+ m_pfile->WriteString(text);
}
/**
+ * @brief Write string item
+ */
+void CConfigLog::WriteItem(int indent, LPCTSTR key, const String &str)
+{
+ WriteItem(indent, key, str.c_str());
+}
+
+/**
* @brief Write int item
*/
void CConfigLog::WriteItem(int indent, LPCTSTR key, long value)
@@ -156,9 +163,8 @@
if (!m_writing)
return;
- CString text;
- text.Format(_T("%*.0s%s: %ld\r\n"), indent, key, key, value);
- m_pfile->WriteString((LPCTSTR)text);
+ String text = string_format(_T("%*.0s%s: %ld\r\n"), indent, key, key, value);
+ m_pfile->WriteString(text);
}
/**
@@ -168,9 +174,8 @@
{
if (m_writing)
{
- CString text;
- text.Format(_T("%*.0s%s: %s\r\n"), indent, key, key, *pvalue ? _T("Yes") : _T("No"));
- m_pfile->WriteString((LPCTSTR)text);
+ String text = string_format(_T("%*.0s%s: %s\r\n"), indent, key, key, *pvalue ? _T("Yes") : _T("No"));
+ m_pfile->WriteString(text);
}
else
{
@@ -227,8 +232,7 @@
LPTSTR name = PathFindFileName(path);
CVersionInfo vi(path, TRUE);
- CString text;
- text.Format
+ String text = string_format
(
name == path
? _T("%*s%-20s %s=%u.%02u %s=%04u\r\n")
@@ -248,7 +252,7 @@
vi.m_dvi.dwBuildNumber,
path
);
- m_pfile->WriteString((LPCTSTR)text);
+ m_pfile->WriteString(text);
}
/**
@@ -344,8 +348,7 @@
/**
* @brief Write boolean item using keywords (Yes|No)
*/
-void CConfigLog::
-WriteItemWhitespace(int indent, LPCTSTR key, int *pvalue)
+void CConfigLog::WriteItemWhitespace(int indent, LPCTSTR key, int *pvalue)
{
static NameMap namemap[] = {
{ WHITESPACE_COMPARE_ALL, _T("Compare all") }
@@ -379,10 +382,10 @@
/**
* @brief Write logfile
*/
-bool CConfigLog::DoFile(bool writing, CString &sError)
+bool CConfigLog::DoFile(bool writing, String &sError)
{
CVersionInfo version;
- CString text;
+ String text;
m_writing = writing;
@@ -390,17 +393,16 @@
{
String sFileName = paths_ConcatPath(env_GetMyDocuments(NULL), WinMergeDocumentsFolder);
paths_CreateIfNeeded(sFileName.c_str());
- sFileName = paths_ConcatPath(sFileName, _T("WinMerge.txt"));
- m_sFileName = sFileName.c_str();
+ m_sFileName = paths_ConcatPath(sFileName, _T("WinMerge.txt"));
#ifdef _UNICODE
- if (!m_pfile->OpenCreateUtf8(m_sFileName))
+ if (!m_pfile->OpenCreateUtf8(m_sFileName.c_str()))
#else
- if (!m_pfile->OpenCreate(m_sFileName))
+ if (!m_pfile->OpenCreate(m_sFileName.c_str()))
#endif
{
const UniFile::UniError &err = m_pfile->GetLastUniError();
- sError = err.GetError().c_str();
+ sError = err.GetError();
return false;
}
#ifdef _UNICODE
@@ -413,7 +415,7 @@
FileWriteString(_T("WinMerge configuration log\r\n"));
FileWriteString(_T("--------------------------\r\n"));
FileWriteString(_T("Saved to: "));
- FileWriteString(m_sFileName);
+ FileWriteString(m_sFileName.c_str());
FileWriteString(_T("\r\n* Please add this information (or attach this file)\r\n"));
FileWriteString(_T("* when reporting bugs.\r\n"));
FileWriteString(_T("Module names prefixed with tilda (~) are currently loaded in WinMerge process.\r\n"));
@@ -432,7 +434,7 @@
text = GetBuildFlags();
FileWriteString(_T("\r\n Build config: "));
- FileWriteString(text);
+ FileWriteString(text.c_str());
LPCTSTR szCmdLine = ::GetCommandLine();
ASSERT(szCmdLine != NULL);
@@ -464,7 +466,7 @@
FileWriteString(_T("\r\n Windows: "));
text = GetWindowsVer();
- FileWriteString(text);
+ FileWriteString(text.c_str());
FileWriteString(_T("\r\n"));
WriteVersionOf1(1, _T("COMCTL32.dll"));
@@ -518,7 +520,7 @@
// Font settings
FileWriteString(_T("\r\n Font:\r\n"));
- FileWriteString(Fmt(_T(" Font facename: %s\r\n"), m_fontSettings.sFacename));
+ FileWriteString(Fmt(_T(" Font facename: %s\r\n"), m_fontSettings.sFacename.c_str()));
FileWriteString(Fmt(_T(" Font charset: %d (%s)\r\n"), m_fontSettings.nCharset,
FontCharsetName(m_fontSettings.nCharset)));
@@ -582,9 +584,9 @@
/**
* @brief Extract any helpful product details from version info
*/
-static CString GetProductFromOsvi(const OSVERSIONINFOEX & osvi)
+static String GetProductFromOsvi(const OSVERSIONINFOEX & osvi)
{
- CString sProduct;
+ String sProduct;
BYTE productType = GetProductTypeFromOsvc(osvi);
WORD suiteMask = GetSuiteMaskFromOsvc(osvi);
@@ -639,13 +641,13 @@
/**
* @brief Extract any helpful product details from registry (for WinNT)
*/
-static CString GetNtProductFromRegistry(const OSVERSIONINFOEX & osvi)
+static String GetNtProductFromRegistry(const OSVERSIONINFOEX & osvi)
{
- CString sProduct;
+ String sProduct;
HKEY hKey;
TCHAR szProductType[REGBUFSIZE];
- DWORD dwBufLen=sizeof(szProductType)/sizeof(szProductType[0]);
+ DWORD dwBufLen = countof(szProductType);
LONG lRet;
lRet = RegOpenKeyEx( HKEY_LOCAL_MACHINE,
@@ -668,8 +670,7 @@
if ( _tcsicmp( _T("SERVERNT"), szProductType) == 0 )
sProduct = _T( "Advanced Server " );
- CString ver;
- ver.Format( _T("%d.%d "), osvi.dwMajorVersion, osvi.dwMinorVersion );
+ String ver = string_format( _T("%d.%d "), osvi.dwMajorVersion, osvi.dwMinorVersion );
sProduct += ver;
return sProduct;
}
@@ -680,10 +681,10 @@
* http://msdn.microsoft.com/en-us/library/ms724833(VS.85).aspx
* @return String describing Windows version.
*/
-CString CConfigLog::GetWindowsVer()
+String CConfigLog::GetWindowsVer()
{
OSVERSIONINFOEX osvi;
- CString sVersion;
+ String sVersion;
// Try calling GetVersionEx using the OSVERSIONINFOEX structure.
// If that fails, try using the OSVERSIONINFO structure.
@@ -727,19 +728,19 @@
sVersion = _T("Microsoft Windows Server 2008 R2 ");
}
else
- sVersion.Format(_T("[? WindowsNT %d.%d] "),
+ sVersion = string_format(_T("[? WindowsNT %d.%d] "),
osvi.dwMajorVersion, osvi.dwMinorVersion);
if (osvi.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEX))
{
// Test for specific product on Windows NT 4.0 SP6 and later.
- CString sProduct = GetProductFromOsvi(osvi);
+ String sProduct = GetProductFromOsvi(osvi);
sVersion += sProduct;
}
else
{
// Test for specific product on Windows NT 4.0 SP5 and earlier
- CString sProduct = GetNtProductFromRegistry(osvi);
+ String sProduct = GetNtProductFromRegistry(osvi);
sVersion += sProduct;
}
@@ -754,12 +755,12 @@
lRet = RegOpenKeyEx( HKEY_LOCAL_MACHINE,
_T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Hotfix\\Q246009"),
0, KEY_QUERY_VALUE, &hKey );
- CString ver;
+ String ver;
if( lRet == ERROR_SUCCESS )
- ver.Format(_T("Service Pack 6a (Build %d)"), osvi.dwBuildNumber & 0xFFFF );
+ ver = string_format(_T("Service Pack 6a (Build %d)"), osvi.dwBuildNumber & 0xFFFF );
else // Windows NT 4.0 prior to SP6a
{
- ver.Format(_T("%s (Build %d)"),
+ ver = string_format(_T("%s (Build %d)"),
osvi.szCSDVersion,
osvi.dwBuildNumber & 0xFFFF);
}
@@ -769,8 +770,7 @@
}
else // Windows NT 3.51 and earlier or Windows 2000 and later
{
- CString ver;
- ver.Format( _T("%s (Build %d)"),
+ String ver = string_format( _T("%s (Build %d)"),
osvi.szCSDVersion,
osvi.dwBuildNumber & 0xFFFF);
sVersion += ver;
@@ -798,7 +798,7 @@
}
else
{
- sVersion.Format(_T("[? Windows9x %d.%d] "),
+ sVersion = string_format(_T("[? Windows9x %d.%d] "),
osvi.dwMajorVersion, osvi.dwMinorVersion);
}
break;
@@ -808,7 +808,7 @@
break;
default:
- sVersion.Format(_T(" [? Windows? %d.%d] "),
+ sVersion = string_format(_T(" [? Windows? %d.%d] "),
osvi.dwMajorVersion, osvi.dwMinorVersion);
}
return sVersion;
@@ -817,32 +817,32 @@
/**
* @brief Return string representation of build flags (for reporting in config log)
*/
-CString CConfigLog::GetBuildFlags()
+String CConfigLog::GetBuildFlags() const
{
- CString flags;
+ String flags;
#ifdef _DEBUG
- flags += " _DEBUG ";
+ flags += _T(" _DEBUG ");
#endif
#ifdef NDEBUG
- flags += " NDEBUG ";
+ flags += _T(" NDEBUG ");
#endif
#ifdef UNICODE
- flags += " UNICODE ";
+ flags += _T(" UNICODE ");
#endif
#ifdef _UNICODE
- flags += " _UNICODE ";
+ flags += _T(" _UNICODE ");
#endif
#ifdef _MBCS
- flags += " _MBCS ";
+ flags += _T(" _MBCS ");
#endif
#ifdef WIN64
- flags += " WIN64 ";
+ flags += _T(" WIN64 ");
#endif
return flags;
@@ -884,8 +884,7 @@
return false;
}
-bool
-CConfigLog::WriteLogFile(CString &sError)
+bool CConfigLog::WriteLogFile(String &sError)
{
CloseFile();
@@ -893,15 +892,15 @@
return DoFile(writing, sError);
}
-void
-CConfigLog::ReadLogFile(const CString & Filepath)
+void CConfigLog::ReadLogFile(const String & Filepath)
{
CloseFile();
bool writing = false;
- CString sError;
+ String sError;
m_pCfgSettings = new CfgSettings;
- if (!ParseSettings(Filepath)) return;
+ if (!ParseSettings(Filepath))
+ return;
DoFile(writing, sError);
}
@@ -928,36 +927,31 @@
/**
* @brief Store all name:value strings from file into m_pCfgSettings
*/
-bool
-CConfigLog::ParseSettings(const CString & Filepath)
+bool CConfigLog::ParseSettings(const String & Filepath)
{
- CStdioFile file;
- if (!file.Open(Filepath, CFile::modeRead))
+ UniMemFile file;
+ if (!file.Open(Filepath.c_str()))
return false;
- CString strline;
- while (file.ReadString(strline))
+ String strline;
+ bool lossy;
+ while (file.ReadString(strline, &lossy))
{
- int colon = strline.Find(':');
+ int colon = strline.find(_T(":"));
if (colon > 0)
{
- CString name = strline.Left(colon);
- CString value = strline.Mid(colon+1);
- name.TrimLeft();
- name.TrimRight();
- value.TrimLeft();
- value.TrimRight();
- m_pCfgSettings->Add(name, value);
+ String name = strline.substr(0, colon);
+ String value = strline.substr(colon + 1);
+ name = string_trim_ws(name);
+ value = string_trim_ws(value);
+ m_pCfgSettings->Add(name.c_str(), value.c_str());
}
}
file.Close();
return true;
-
-
}
-CString
-CConfigLog::GetValueFromConfig(const CString & key)
+CString CConfigLog::GetValueFromConfig(const CString & key)
{
CString value;
if (m_pCfgSettings->Lookup(key, value))
Modified: trunk/Src/ConfigLog.h
===================================================================
--- trunk/Src/ConfigLog.h 2009-12-26 23:11:18 UTC (rev 7058)
+++ trunk/Src/ConfigLog.h 2009-12-27 00:06:59 UTC (rev 7059)
@@ -90,7 +90,7 @@
struct FONTSETTINGS
{
BYTE nCharset;
- CString sFacename;
+ String sFacename;
};
/**
@@ -109,13 +109,14 @@
CPSETTINGS m_cpSettings;
FONTSETTINGS m_fontSettings;
- CString GetFileName() const;
- bool WriteLogFile(CString &sError);
- void ReadLogFile(const CString & Filepath);
+ String GetFileName() const;
+ bool WriteLogFile(String &sError);
+ void ReadLogFile(const String & Filepath);
// Implementation methods
protected:
void WriteItem(int indent, LPCTSTR key, LPCTSTR value = 0);
+ void WriteItem(int indent, LPCTSTR key, const String &str);
void WriteItem(int indent, LPCTSTR key, long value);
void WriteVersionOf1(int indent, LPTSTR path);
void WriteVersionOf(int indent, LPTSTR path);
@@ -124,22 +125,22 @@
void WriteVersionOf7z(LPTSTR path);
private:
- bool DoFile(bool writing, CString &sError);
+ bool DoFile(bool writing, String &sError);
void WritePluginsInLogFile(LPCWSTR transformationEvent);
- CString GetWindowsVer();
- CString GetBuildFlags();
+ String GetWindowsVer();
+ String GetBuildFlags() const;
void FileWriteString(LPCTSTR lpsz);
void CloseFile();
void WriteItemYesNo(int indent, LPCTSTR key, bool *pvalue);
void WriteItemYesNoInverted(int indent, LPCTSTR key, bool *pvalue);
void WriteItemYesNoInverted(int indent, LPCTSTR key, int *pvalue);
void WriteItemWhitespace(int indent, LPCTSTR key, int *pvalue);
- bool ParseSettings(const CString & Filepath);
+ bool ParseSettings(const String & Filepath);
CString GetValueFromConfig(const CString & key);
// Implementation data
private:
- CString m_sFileName;
+ String m_sFileName;
UniStdioFile *m_pfile;
bool m_writing;
CfgSettings * m_pCfgSettings;
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2009-12-26 23:11:18 UTC (rev 7058)
+++ trunk/Src/MainFrm.cpp 2009-12-27 00:06:59 UTC (rev 7059)
@@ -2501,7 +2501,7 @@
else
{
lfDiff.lfCharSet = configLog.m_fontSettings.nCharset;
- _tcsncpy(lfDiff.lfFaceName, configLog.m_fontSettings.sFacename, sizeof(lfDiff.lfFaceName)/sizeof(lfDiff.lfFaceName[0]));
+ _tcsncpy(lfDiff.lfFaceName, configLog.m_fontSettings.sFacename.c_str(), countof(lfDiff.lfFaceName));
}
}
@@ -2512,20 +2512,20 @@
void CMainFrame::OnSaveConfigData()
{
CConfigLog configLog;
- CString sError;
+ String sError;
LoadConfigLog(configLog, GetOptionsMgr(), m_lfDiff, ToConfigLog);
if (configLog.WriteLogFile(sError))
{
- CString sFileName = configLog.GetFileName();
- OpenFileToExternalEditor(sFileName);
+ String sFileName = configLog.GetFileName();
+ OpenFileToExternalEditor(sFileName.c_str());
}
else
{
CString msg;
- CString sFileName = configLog.GetFileName();
- LangFormatString2(msg, IDS_ERROR_FILEOPEN, sFileName, sError);
+ String sFileName = configLog.GetFileName();
+ LangFormatString2(msg, IDS_ERROR_FILEOPEN, sFileName.c_str(), sError.c_str());
AfxMessageBox(msg, MB_OK | MB_ICONSTOP);
}
}
@@ -2931,7 +2931,7 @@
if (dlg.DoModal() != IDOK)
return;
- CString filepath = dlg.GetPathName();
+ String filepath = (LPCTSTR) dlg.GetPathName();
CConfigLog configLog;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-26 23:11:26
|
Revision: 7058
http://winmerge.svn.sourceforge.net/winmerge/?rev=7058&view=rev
Author: kimmov
Date: 2009-12-26 23:11:18 +0000 (Sat, 26 Dec 2009)
Log Message:
-----------
Add printf()-style formatting function for String.
Code originally from Paul Senzee.
Modified Paths:
--------------
trunk/Docs/Users/Contributors.txt
trunk/Src/Common/UnicodeString.cpp
trunk/Src/Common/UnicodeString.h
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2009-12-26 20:51:16 UTC (rev 7057)
+++ trunk/Docs/Users/Contributors.txt 2009-12-26 23:11:18 UTC (rev 7058)
@@ -189,6 +189,7 @@
* Cristi Posea (CSizingControlBar)
* Ferdinand Prantl (CrystalEditor syntax rules)
* Keith Rule (CMemDC - memory DC)
+* Paul Senzee (String formatting)
* Henry Spencer (CRegExp)
* Andrei Stcherbatchenko (CrystalEditor)
Modified: trunk/Src/Common/UnicodeString.cpp
===================================================================
--- trunk/Src/Common/UnicodeString.cpp 2009-12-26 20:51:16 UTC (rev 7057)
+++ trunk/Src/Common/UnicodeString.cpp 2009-12-26 23:11:18 UTC (rev 7058)
@@ -23,9 +23,15 @@
// ID line follows -- this is updated by SVN
// $Id$
+// String formatting code originally from Paul Senzee:
+// http://www.senzee5.com/2006/05/c-formatting-stdstring.html
+
#include <tchar.h>
+#include <stdarg.h>
#include "UnicodeString.h"
+static String format_arg_list(const TCHAR *fmt, va_list args);
+
/**
* @brief Convert a string to lower case string.
* @param [in] str String to convert to lower case.
@@ -148,3 +154,37 @@
result.erase(it + 1, result.end());
return result;
}
+
+static String format_arg_list(const TCHAR *fmt, va_list args)
+{
+ if (!fmt)
+ return _T("");
+ int result = -1;
+ int length = 256;
+ TCHAR *buffer = 0;
+ while (result == -1)
+ {
+ if (buffer)
+ delete [] buffer;
+ buffer = new TCHAR[length + 1];
+ memset(buffer, 0, (length + 1) * sizeof(TCHAR));
+ result = _vsntprintf(buffer, length, fmt, args);
+ length *= 2;
+ }
+ String s(buffer);
+ delete [] buffer;
+ return s;
+}
+
+/**
+ * @brief printf()-style formatting for STL string.
+ * Use this function to format String:s in printf() style.
+ */
+String string_format(const TCHAR *fmt, ...)
+{
+ va_list args;
+ va_start(args, fmt);
+ String s = format_arg_list(fmt, args);
+ va_end(args);
+ return s;
+}
Modified: trunk/Src/Common/UnicodeString.h
===================================================================
--- trunk/Src/Common/UnicodeString.h 2009-12-26 20:51:16 UTC (rev 7057)
+++ trunk/Src/Common/UnicodeString.h 2009-12-26 23:11:18 UTC (rev 7058)
@@ -49,4 +49,7 @@
String string_trim_ws_begin(const String & str);
String string_trim_ws_end(const String & str);
+// Formatting
+String string_format(const TCHAR *fmt, ...);
+
#endif // _UNICODE_STRING_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-26 20:51:27
|
Revision: 7057
http://winmerge.svn.sourceforge.net/winmerge/?rev=7057&view=rev
Author: kimmov
Date: 2009-12-26 20:51:16 +0000 (Sat, 26 Dec 2009)
Log Message:
-----------
Write config log as UTF-8 file.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/ConfigLog.cpp
trunk/Src/ConfigLog.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-12-26 19:49:14 UTC (rev 7056)
+++ trunk/Docs/Users/ChangeLog.txt 2009-12-26 20:51:16 UTC (rev 7057)
@@ -4,6 +4,7 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.3.11
+ Write config log as UTF-8 file (r7057)
Bugfix: Plugin error after interrupting folder compare (#2919475)
Bugfix: GUI Word Wrap missing text (#2921400, #2894033)
Modified: trunk/Src/ConfigLog.cpp
===================================================================
--- trunk/Src/ConfigLog.cpp 2009-12-26 19:49:14 UTC (rev 7056)
+++ trunk/Src/ConfigLog.cpp 2009-12-26 20:51:16 UTC (rev 7057)
@@ -23,12 +23,10 @@
// $Id$
#include "StdAfx.h"
-#ifndef UNICODE
-#include <mbctype.h>
-#endif
#include "Constants.h"
#include "version.h"
#include "dllver.h"
+#include "UniFile.h"
#include "DiffWrapper.h"
#include "ConfigLog.h"
#include "winnt_supp.h"
@@ -48,11 +46,13 @@
CConfigLog::CConfigLog()
: m_pCfgSettings(NULL)
{
+ m_pfile = new UniStdioFile();
}
CConfigLog::~CConfigLog()
{
CloseFile();
+ delete m_pfile;
}
@@ -68,10 +68,11 @@
/**
* @brief Write plugin names
*/
-void CConfigLog::WritePluginsInLogFile(LPCWSTR transformationEvent, CStdioFile & file)
+void CConfigLog::WritePluginsInLogFile(LPCWSTR transformationEvent)
{
// do nothing if actually reading config file
- if (file.m_hFile == CFile::hFileNull) return;
+ if (!m_writing)
+ return;
// get an array with the available scripts
PluginArray * piPluginArray;
@@ -83,11 +84,11 @@
for (iPlugin = 0 ; iPlugin < piPluginArray->GetSize() ; iPlugin++)
{
PluginInfo & plugin = piPluginArray->ElementAt(iPlugin);
- file.WriteString(_T("\n "));
- file.WriteString(plugin.m_name.c_str());
- file.WriteString(_T(" ["));
- file.WriteString(plugin.m_filepath.c_str());
- file.WriteString(_T("]"));
+ m_pfile->WriteString(_T("\r\n "));
+ m_pfile->WriteString(plugin.m_name.c_str());
+ m_pfile->WriteString(_T(" ["));
+ m_pfile->WriteString(plugin.m_filepath.c_str());
+ m_pfile->WriteString(_T("]"));
}
}
@@ -135,27 +136,29 @@
/**
* @brief Write string item
*/
-static void WriteItem(CStdioFile &file, int indent, LPCTSTR key, LPCTSTR value = 0)
+void CConfigLog::WriteItem(int indent, LPCTSTR key, LPCTSTR value)
{
// do nothing if actually reading config file
- if (file.m_hFile == CFile::hFileNull) return;
+ if (!m_writing)
+ return;
CString text;
- text.Format(value ? _T("%*.0s%s: %s\n") : _T("%*.0s%s:\n"), indent, key, key, value);
- file.WriteString(text);
+ text.Format(value ? _T("%*.0s%s: %s\r\n") : _T("%*.0s%s:\r\n"), indent, key, key, value);
+ m_pfile->WriteString((LPCTSTR)text);
}
/**
* @brief Write int item
*/
-static void WriteItem(CStdioFile &file, int indent, LPCTSTR key, long value)
+void CConfigLog::WriteItem(int indent, LPCTSTR key, long value)
{
// do nothing if actually reading config file
- if (file.m_hFile == CFile::hFileNull) return;
+ if (!m_writing)
+ return;
CString text;
- text.Format(_T("%*.0s%s: %ld\n"), indent, key, key, value);
- file.WriteString(text);
+ text.Format(_T("%*.0s%s: %ld\r\n"), indent, key, key, value);
+ m_pfile->WriteString((LPCTSTR)text);
}
/**
@@ -166,8 +169,8 @@
if (m_writing)
{
CString text;
- text.Format(_T("%*.0s%s: %s\n"), indent, key, key, *pvalue ? _T("Yes") : _T("No"));
- m_file.WriteString(text);
+ text.Format(_T("%*.0s%s: %s\r\n"), indent, key, key, *pvalue ? _T("Yes") : _T("No"));
+ m_pfile->WriteString((LPCTSTR)text);
}
else
{
@@ -198,27 +201,29 @@
/**
* @brief Write out various possibly relevant windows locale information
*/
-static void WriteLocaleSettings(CStdioFile & file, LCID locid, LPCTSTR title)
+void CConfigLog::WriteLocaleSettings(LCID locid, LPCTSTR title)
{
// do nothing if actually reading config file
- if (file.m_hFile == CFile::hFileNull) return;
+ if (!m_writing)
+ return;
- WriteItem(file, 1, title);
- WriteItem(file, 2, _T("Def ANSI codepage"), GetLocaleString(locid, LOCALE_IDEFAULTANSICODEPAGE));
- WriteItem(file, 2, _T("Def OEM codepage"), GetLocaleString(locid, LOCALE_IDEFAULTCODEPAGE));
- WriteItem(file, 2, _T("Country"), GetLocaleString(locid, LOCALE_SENGCOUNTRY));
- WriteItem(file, 2, _T("Language"), GetLocaleString(locid, LOCALE_SENGLANGUAGE));
- WriteItem(file, 2, _T("Language code"), GetLocaleString(locid, LOCALE_ILANGUAGE));
- WriteItem(file, 2, _T("ISO Language code"), GetLocaleString(locid, LOCALE_SISO639LANGNAME));
+ WriteItem(1, title);
+ WriteItem(2, _T("Def ANSI codepage"), GetLocaleString(locid, LOCALE_IDEFAULTANSICODEPAGE));
+ WriteItem(2, _T("Def OEM codepage"), GetLocaleString(locid, LOCALE_IDEFAULTCODEPAGE));
+ WriteItem(2, _T("Country"), GetLocaleString(locid, LOCALE_SENGCOUNTRY));
+ WriteItem(2, _T("Language"), GetLocaleString(locid, LOCALE_SENGLANGUAGE));
+ WriteItem(2, _T("Language code"), GetLocaleString(locid, LOCALE_ILANGUAGE));
+ WriteItem(2, _T("ISO Language code"), GetLocaleString(locid, LOCALE_SISO639LANGNAME));
}
/**
* @brief Write version of a single executable file
*/
-static void WriteVersionOf1(CStdioFile &file, int indent, LPTSTR path)
+void CConfigLog::WriteVersionOf1(int indent, LPTSTR path)
{
- // do nothing if actually reading config file
- if (file.m_hFile == CFile::hFileNull) return;
+ // Do nothing if actually reading config file
+ if (!m_writing)
+ return;
LPTSTR name = PathFindFileName(path);
CVersionInfo vi(path, TRUE);
@@ -226,8 +231,8 @@
text.Format
(
name == path
- ? _T("%*s%-20s %s=%u.%02u %s=%04u\n")
- : _T("%*s%-20s %s=%u.%02u %s=%04u path=%s\n"),
+ ? _T("%*s%-20s %s=%u.%02u %s=%04u\r\n")
+ : _T("%*s%-20s %s=%u.%02u %s=%04u path=%s\r\n"),
indent,
// Tilde prefix for modules currently mapped into WinMerge
GetModuleHandle(path) ? _T("~") : _T("")/*name*/,
@@ -243,13 +248,13 @@
vi.m_dvi.dwBuildNumber,
path
);
- file.WriteString(text);
+ m_pfile->WriteString((LPCTSTR)text);
}
/**
* @brief Write version of a set of executable files
*/
-static void WriteVersionOf(CStdioFile &file, int indent, LPTSTR path)
+void CConfigLog::WriteVersionOf(int indent, LPTSTR path)
{
LPTSTR name = PathFindFileName(path);
WIN32_FIND_DATA ff;
@@ -259,7 +264,7 @@
do
{
lstrcpy(name, ff.cFileName);
- WriteVersionOf1(file, indent, path);
+ WriteVersionOf1(indent, path);
} while (FindNextFile(h, &ff));
FindClose(h);
}
@@ -268,23 +273,23 @@
/**
* @brief Write version of 7-Zip plugins and shell context menu handler
*/
-static void WriteVersionOf7z(CStdioFile &file, LPTSTR path)
+void CConfigLog::WriteVersionOf7z(LPTSTR path)
{
lstrcat(path, _T("\\7-zip*.dll"));
LPTSTR pattern = PathFindFileName(path);
- WriteVersionOf(file, 2, path);
- WriteItem(file, 2, _T("Codecs"));
+ WriteVersionOf(2, path);
+ WriteItem(2, _T("Codecs"));
lstrcpy(pattern, _T("codecs\\*.dll"));
- WriteVersionOf(file, 3, path);
- WriteItem(file, 2, _T("Formats"));
+ WriteVersionOf(3, path);
+ WriteItem(2, _T("Formats"));
lstrcpy(pattern, _T("formats\\*.dll"));
- WriteVersionOf(file, 3, path);
+ WriteVersionOf(3, path);
}
/**
* @brief Write archive support stuff
*/
-static void WriteArchiveSupport(CStdioFile &file)
+void CConfigLog::WriteArchiveSupport()
{
DWORD registered = VersionOf7z(FALSE);
DWORD standalone = VersionOf7z(TRUE);
@@ -292,27 +297,27 @@
DWORD type = 0;
DWORD size = sizeof path;
- WriteItem(file, 0, _T("Archive support"));
- WriteItem(file, 1, _T("Enable"),
+ WriteItem(0, _T("Archive support"));
+ WriteItem(1, _T("Enable"),
AfxGetApp()->GetProfileInt(_T("Merge7z"), _T("Enable"), 0));
wsprintf(path, _T("%u.%02u"), UINT HIWORD(registered), UINT LOWORD(registered));
- WriteItem(file, 1, _T("7-Zip software installed on your computer"), path);
+ WriteItem(1, _T("7-Zip software installed on your computer"), path);
static const TCHAR szSubKey[] = _T("Software\\7-Zip");
static const TCHAR szValue[] = _T("Path");
SHGetValue(HKEY_LOCAL_MACHINE, szSubKey, szValue, &type, path, &size);
- WriteVersionOf7z(file, path);
+ WriteVersionOf7z(path);
wsprintf(path, _T("%u.%02u"), UINT HIWORD(standalone), UINT LOWORD(standalone));
- WriteItem(file, 1, _T("7-Zip components for standalone operation"), path);
+ WriteItem(1, _T("7-Zip components for standalone operation"), path);
GetModuleFileName(0, path, countof(path));
LPTSTR pattern = PathFindFileName(path);
PathRemoveFileSpec(path);
- WriteVersionOf7z(file, path);
+ WriteVersionOf7z(path);
- WriteItem(file, 1, _T("Merge7z plugins on path"));
+ WriteItem(1, _T("Merge7z plugins on path"));
lstrcpy(pattern, _T("Merge7z*.dll"));
- WriteVersionOf(file, 2, path);
+ WriteVersionOf(2, path);
// now see what's on the path:
if (DWORD cchPath = GetEnvironmentVariable(_T("path"), 0, 0))
{
@@ -327,7 +332,7 @@
CopyMemory(path, pchItem, cchItem*sizeof*pchItem);
path[cchItem] = 0;
PathAppend(path, _T("Merge7z*.dll"));
- WriteVersionOf(file, 2, path);
+ WriteVersionOf(2, path);
}
pchItem += cchItem;
}
@@ -356,7 +361,7 @@
if (*pvalue == namemap[i].ival)
text = namemap[i].sval;
}
- WriteItem(m_file, indent, key, text);
+ WriteItem(indent, key, text);
}
else
{
@@ -376,7 +381,6 @@
*/
bool CConfigLog::DoFile(bool writing, CString &sError)
{
- CFileException e;
CVersionInfo version;
CString text;
@@ -389,26 +393,33 @@
sFileName = paths_ConcatPath(sFileName, _T("WinMerge.txt"));
m_sFileName = sFileName.c_str();
- if (!m_file.Open(m_sFileName, CFile::modeCreate | CFile::modeWrite, &e))
+#ifdef _UNICODE
+ if (!m_pfile->OpenCreateUtf8(m_sFileName))
+#else
+ if (!m_pfile->OpenCreate(m_sFileName))
+#endif
{
- TCHAR szError[1024];
- e.GetErrorMessage(szError, 1024);
- sError = szError;
+ const UniFile::UniError &err = m_pfile->GetLastUniError();
+ sError = err.GetError().c_str();
return false;
}
+#ifdef _UNICODE
+ m_pfile->SetBom(true);
+ m_pfile->WriteBom();
+#endif
}
// Begin log
- FileWriteString(_T("WinMerge configuration log\n"));
- FileWriteString(_T("--------------------------\n"));
+ FileWriteString(_T("WinMerge configuration log\r\n"));
+ FileWriteString(_T("--------------------------\r\n"));
FileWriteString(_T("Saved to: "));
FileWriteString(m_sFileName);
- FileWriteString(_T("\n* Please add this information (or attach this file)\n"));
- FileWriteString(_T("* when reporting bugs.\n"));
- FileWriteString(_T("Module names prefixed with tilda (~) are currently loaded in WinMerge process.\n"));
+ FileWriteString(_T("\r\n* Please add this information (or attach this file)\r\n"));
+ FileWriteString(_T("* when reporting bugs.\r\n"));
+ FileWriteString(_T("Module names prefixed with tilda (~) are currently loaded in WinMerge process.\r\n"));
// Platform stuff
- FileWriteString(_T("\n\nVersion information:\n"));
+ FileWriteString(_T("\r\n\r\nVersion information:\r\n"));
FileWriteString(_T(" WinMerge.exe: "));
FileWriteString(version.GetFixedProductVersion().c_str());
@@ -420,7 +431,7 @@
}
text = GetBuildFlags();
- FileWriteString(_T("\n Build config: "));
+ FileWriteString(_T("\r\n Build config: "));
FileWriteString(text);
LPCTSTR szCmdLine = ::GetCommandLine();
@@ -448,24 +459,24 @@
szCmdLine = _T(" none");
}
- FileWriteString(_T("\n Command Line: "));
+ FileWriteString(_T("\r\n Command Line: "));
FileWriteString(szCmdLine);
- FileWriteString(_T("\n Windows: "));
+ FileWriteString(_T("\r\n Windows: "));
text = GetWindowsVer();
FileWriteString(text);
- FileWriteString(_T("\n"));
- WriteVersionOf1(m_file, 1, _T("COMCTL32.dll"));
- WriteVersionOf1(m_file, 1, _T("shlwapi.dll"));
- WriteVersionOf1(m_file, 1, _T("MergeLang.dll"));
- WriteVersionOf1(m_file, 1, _T("ShellExtension.dll"));
- WriteVersionOf1(m_file, 1, _T("ShellExtensionU.dll"));
- WriteVersionOf1(m_file, 1, _T("ShellExtensionX64.dll"));
+ FileWriteString(_T("\r\n"));
+ WriteVersionOf1(1, _T("COMCTL32.dll"));
+ WriteVersionOf1(1, _T("shlwapi.dll"));
+ WriteVersionOf1(1, _T("MergeLang.dll"));
+ WriteVersionOf1(1, _T("ShellExtension.dll"));
+ WriteVersionOf1(1, _T("ShellExtensionU.dll"));
+ WriteVersionOf1(1, _T("ShellExtensionX64.dll"));
// WinMerge settings
- FileWriteString(_T("\nWinMerge configuration:\n"));
- FileWriteString(_T(" Compare settings:\n"));
+ FileWriteString(_T("\r\nWinMerge configuration:\r\n"));
+ FileWriteString(_T(" Compare settings:\r\n"));
WriteItemYesNo(2, _T("Ignore blank lines"), &m_diffOptions.bIgnoreBlankLines);
WriteItemYesNo(2, _T("Ignore case"), &m_diffOptions.bIgnoreCase);
@@ -474,16 +485,16 @@
WriteItemWhitespace(2, _T("Whitespace compare"), &m_diffOptions.nIgnoreWhitespace);
WriteItemYesNo(2, _T("Detect moved blocks"), &m_miscSettings.bMovedBlocks);
- WriteItem(m_file, 2, _T("Compare method"), m_compareSettings.nCompareMethod);
+ WriteItem(2, _T("Compare method"), m_compareSettings.nCompareMethod);
WriteItemYesNo(2, _T("Stop after first diff"), &m_compareSettings.bStopAfterFirst);
- FileWriteString(_T("\n Other settings:\n"));
+ FileWriteString(_T("\r\n Other settings:\r\n"));
WriteItemYesNo(2, _T("Automatic rescan"), &m_miscSettings.bAutomaticRescan);
WriteItemYesNoInverted(2, _T("Simple EOL"), &m_miscSettings.bAllowMixedEol);
WriteItemYesNo(2, _T("Automatic scroll to 1st difference"), &m_miscSettings.bScrollToFirst);
WriteItemYesNo(2, _T("Backup original file"), &m_miscSettings.bBackup);
- FileWriteString(_T("\n Folder compare:\n"));
+ FileWriteString(_T("\r\n Folder compare:\r\n"));
WriteItemYesNo(2, _T("Identical files"), &m_viewSettings.bShowIdent);
WriteItemYesNo(2, _T("Different files"), &m_viewSettings.bShowDiff);
WriteItemYesNo(2, _T("Left Unique files"), &m_viewSettings.bShowUniqueLeft);
@@ -492,57 +503,57 @@
WriteItemYesNo(2, _T("Skipped files"), &m_viewSettings.bShowSkipped);
WriteItemYesNo(2, _T("Tree-mode enabled"), &m_viewSettings.bTreeView);
- FileWriteString(_T("\n File compare:\n"));
+ FileWriteString(_T("\r\n File compare:\r\n"));
WriteItemYesNo(2, _T("Preserve filetimes"), &m_miscSettings.bPreserveFiletimes);
WriteItemYesNo(2, _T("Match similar lines"), &m_miscSettings.bMatchSimilarLines);
- FileWriteString(_T("\n Editor settings:\n"));
+ FileWriteString(_T("\r\n Editor settings:\r\n"));
WriteItemYesNo(2, _T("View Whitespace"), &m_miscSettings.bViewWhitespace);
WriteItemYesNo(2, _T("Merge Mode enabled"), &m_miscSettings.bMergeMode);
WriteItemYesNo(2, _T("Show linenumbers"), &m_miscSettings.bShowLinenumbers);
WriteItemYesNo(2, _T("Wrap lines"), &m_miscSettings.bWrapLines);
WriteItemYesNo(2, _T("Syntax Highlight"), &m_miscSettings.bSyntaxHighlight);
- WriteItem(m_file, 2, _T("Tab size"), m_miscSettings.nTabSize);
+ WriteItem(2, _T("Tab size"), m_miscSettings.nTabSize);
WriteItemYesNoInverted(2, _T("Insert tabs"), &m_miscSettings.nInsertTabs);
// Font settings
- FileWriteString(_T("\n Font:\n"));
- FileWriteString(Fmt(_T(" Font facename: %s\n"), m_fontSettings.sFacename));
- FileWriteString(Fmt(_T(" Font charset: %d (%s)\n"), m_fontSettings.nCharset,
+ FileWriteString(_T("\r\n Font:\r\n"));
+ FileWriteString(Fmt(_T(" Font facename: %s\r\n"), m_fontSettings.sFacename));
+ FileWriteString(Fmt(_T(" Font charset: %d (%s)\r\n"), m_fontSettings.nCharset,
FontCharsetName(m_fontSettings.nCharset)));
// System settings
- FileWriteString(_T("\nSystem settings:\n"));
- FileWriteString(_T(" codepage settings:\n"));
- WriteItem(m_file, 2, _T("ANSI codepage"), GetACP());
- WriteItem(m_file, 2, _T("OEM codepage"), GetOEMCP());
+ FileWriteString(_T("\r\nSystem settings:\r\n"));
+ FileWriteString(_T(" codepage settings:\r\n"));
+ WriteItem(2, _T("ANSI codepage"), GetACP());
+ WriteItem(2, _T("OEM codepage"), GetOEMCP());
#ifndef UNICODE
- WriteItem(m_file, 2, _T("multibyte codepage"), _getmbcp());
+ WriteItem(2, _T("multibyte codepage"), _getmbcp());
#endif
- WriteLocaleSettings(m_file, GetThreadLocale(), _T("Locale (Thread)"));
- WriteLocaleSettings(m_file, LOCALE_USER_DEFAULT, _T("Locale (User)"));
- WriteLocaleSettings(m_file, LOCALE_SYSTEM_DEFAULT, _T("Locale (System)"));
+ WriteLocaleSettings(GetThreadLocale(), _T("Locale (Thread)"));
+ WriteLocaleSettings(LOCALE_USER_DEFAULT, _T("Locale (User)"));
+ WriteLocaleSettings(LOCALE_SYSTEM_DEFAULT, _T("Locale (System)"));
// Codepage settings
WriteItemYesNo(1, _T("Detect codepage automatically for RC and HTML files"), &m_cpSettings.bDetectCodepage);
- WriteItem(m_file, 1, _T("unicoder codepage"), getDefaultCodepage());
+ WriteItem(1, _T("unicoder codepage"), getDefaultCodepage());
// Plugins
- FileWriteString(_T("\nPlugins:\n"));
+ FileWriteString(_T("\r\nPlugins:\r\n"));
WriteItemYesNo(1, _T("Plugins enabled"), &m_miscSettings.bPluginsEnabled);
FileWriteString(_T(" Unpackers: "));
- WritePluginsInLogFile(L"FILE_PACK_UNPACK", m_file);
- WritePluginsInLogFile(L"BUFFER_PACK_UNPACK", m_file);
- FileWriteString(_T("\n Prediffers: "));
- WritePluginsInLogFile(L"FILE_PREDIFF", m_file);
- WritePluginsInLogFile(L"BUFFER_PREDIFF", m_file);
- FileWriteString(_T("\n Editor scripts: "));
- WritePluginsInLogFile(L"EDITOR_SCRIPT", m_file);
+ WritePluginsInLogFile(L"FILE_PACK_UNPACK");
+ WritePluginsInLogFile(L"BUFFER_PACK_UNPACK");
+ FileWriteString(_T("\r\n Prediffers: "));
+ WritePluginsInLogFile(L"FILE_PREDIFF");
+ WritePluginsInLogFile(L"BUFFER_PREDIFF");
+ FileWriteString(_T("\r\n Editor scripts: "));
+ WritePluginsInLogFile(L"EDITOR_SCRIPT");
if (IsWindowsScriptThere() == FALSE)
- FileWriteString(_T("\n .sct scripts disabled (Windows Script Host not found)\n"));
+ FileWriteString(_T("\r\n .sct scripts disabled (Windows Script Host not found)\r\n"));
- FileWriteString(_T("\n\n"));
- WriteArchiveSupport(m_file);
+ FileWriteString(_T("\r\n\r\n"));
+ WriteArchiveSupport();
CloseFile();
@@ -793,7 +804,7 @@
break;
case VER_PLATFORM_WIN32s:
- sVersion = _T("Microsoft Win32s\n");
+ sVersion = _T("Microsoft Win32s\r\n");
break;
default:
@@ -899,7 +910,7 @@
CConfigLog::FileWriteString(LPCTSTR lpsz)
{
if (m_writing)
- m_file.WriteString(lpsz);
+ m_pfile->WriteString(lpsz);
}
/**
@@ -908,8 +919,8 @@
void
CConfigLog::CloseFile()
{
- if (m_file.m_hFile != CFile::hFileNull)
- m_file.Close();
+ if (m_pfile->IsOpen())
+ m_pfile->Close();
delete m_pCfgSettings;
m_pCfgSettings = 0;
}
Modified: trunk/Src/ConfigLog.h
===================================================================
--- trunk/Src/ConfigLog.h 2009-12-26 19:49:14 UTC (rev 7056)
+++ trunk/Src/ConfigLog.h 2009-12-26 20:51:16 UTC (rev 7057)
@@ -26,6 +26,7 @@
#define _CONFIGLOG_H_
class CfgSettings;
+class UniStdioFile;
/**
* @brief Compare-related settings.
@@ -112,11 +113,19 @@
bool WriteLogFile(CString &sError);
void ReadLogFile(const CString & Filepath);
+ // Implementation methods
+protected:
+ void WriteItem(int indent, LPCTSTR key, LPCTSTR value = 0);
+ void WriteItem(int indent, LPCTSTR key, long value);
+ void WriteVersionOf1(int indent, LPTSTR path);
+ void WriteVersionOf(int indent, LPTSTR path);
+ void WriteLocaleSettings(LCID locid, LPCTSTR title);
+ void WriteArchiveSupport();
+ void WriteVersionOf7z(LPTSTR path);
- // Implementation methods
private:
bool DoFile(bool writing, CString &sError);
- void WritePluginsInLogFile(LPCWSTR transformationEvent, CStdioFile & file);
+ void WritePluginsInLogFile(LPCWSTR transformationEvent);
CString GetWindowsVer();
CString GetBuildFlags();
void FileWriteString(LPCTSTR lpsz);
@@ -128,11 +137,10 @@
bool ParseSettings(const CString & Filepath);
CString GetValueFromConfig(const CString & key);
-
// Implementation data
private:
CString m_sFileName;
- CStdioFile m_file;
+ UniStdioFile *m_pfile;
bool m_writing;
CfgSettings * m_pCfgSettings;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-26 19:49:24
|
Revision: 7056
http://winmerge.svn.sourceforge.net/winmerge/?rev=7056&view=rev
Author: kimmov
Date: 2009-12-26 19:49:14 +0000 (Sat, 26 Dec 2009)
Log Message:
-----------
Make UniError::GetError() a const method.
Modified Paths:
--------------
trunk/Src/Common/UniFile.cpp
trunk/Src/Common/UniFile.h
Modified: trunk/Src/Common/UniFile.cpp
===================================================================
--- trunk/Src/Common/UniFile.cpp 2009-12-26 13:42:28 UTC (rev 7055)
+++ trunk/Src/Common/UniFile.cpp 2009-12-26 19:49:14 UTC (rev 7056)
@@ -78,7 +78,7 @@
* @brief Get the error string.
* @return Error string.
*/
-String UniFile::UniError::GetError()
+String UniFile::UniError::GetError() const
{
String sError;
if (apiname.empty())
Modified: trunk/Src/Common/UniFile.h
===================================================================
--- trunk/Src/Common/UniFile.h 2009-12-26 13:42:28 UTC (rev 7055)
+++ trunk/Src/Common/UniFile.h 2009-12-26 19:49:14 UTC (rev 7056)
@@ -33,7 +33,7 @@
UniError();
bool HasError() const;
void ClearError();
- String GetError();
+ String GetError() const;
};
virtual ~UniFile() { }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-26 13:42:39
|
Revision: 7055
http://winmerge.svn.sourceforge.net/winmerge/?rev=7055&view=rev
Author: kimmov
Date: 2009-12-26 13:42:28 +0000 (Sat, 26 Dec 2009)
Log Message:
-----------
PATCH: [ 2921400 ] MergeDocLineDiffs
Fixes bug #2894033 GUI Word Wrap missing text, differences not highlighted
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/MergeDocLineDiffs.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-12-22 17:59:08 UTC (rev 7054)
+++ trunk/Docs/Users/ChangeLog.txt 2009-12-26 13:42:28 UTC (rev 7055)
@@ -5,6 +5,7 @@
WinMerge 2.3.11
Bugfix: Plugin error after interrupting folder compare (#2919475)
+ Bugfix: GUI Word Wrap missing text (#2921400, #2894033)
WinMerge 2.13.10 2009-12-21 (r7051)
Visual Studio project files upgraded to VS2005 format (r7045)
Modified: trunk/Src/MergeDocLineDiffs.cpp
===================================================================
--- trunk/Src/MergeDocLineDiffs.cpp 2009-12-22 17:59:08 UTC (rev 7054)
+++ trunk/Src/MergeDocLineDiffs.cpp 2009-12-26 13:42:28 UTC (rev 7055)
@@ -15,6 +15,7 @@
#include "MergeEditView.h"
#include "MergeDiffDetailView.h"
#include "stringdiffs.h"
+#include "UnicodeString.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -193,8 +194,8 @@
DIFFOPTIONS diffOptions = {0};
m_diffWrapper.GetOptions(&diffOptions);
- CString str1(pView1->GetLineChars(line), pView1->GetFullLineLength(line));
- CString str2(pView2->GetLineChars(line), pView2->GetFullLineLength(line));
+ String str1(pView1->GetLineChars(line), pView1->GetFullLineLength(line));
+ String str2(pView2->GetLineChars(line), pView2->GetFullLineLength(line));
/* Commented out code because GetLineActualLength is buggy
// Chop of eol (end of line) characters
@@ -203,16 +204,16 @@
int len2 = pView2->GetLineActualLength(line);
str2 = str2.Left(len2);
*/
- i1 = str1.GetLength() - 1;
+ i1 = str1.length() - 1;
while (i1 >= 0 && (str1[i1] == '\r' || str1[i1] == '\n'))
--i1;
- if (i1 + 1 < str1.GetLength())
- str1 = str1.Left(i1 + 1);
- i2 = str2.GetLength() - 1;
- while (i2 >= 0 && (str2[i2] == '\r' || str2[i2] == '\n'))
+ if (i1 + 1 < str1.length())
+ str1.resize(i1 + 1);
+ i2 = str2.length() - 1;
+ while (i2 >= 0 && (str2[i2]=='\r' || str2[i2]=='\n'))
--i2;
- if (i2+1 < str2.GetLength())
- str2 = str2.Left(i2 + 1);
+ if (i2+1 < str2.length())
+ str2.resize(i2 + 1);
// We truncate diffs to remain inside line (ie, to not flag eol characters)
int width1 = pView1->GetLineLength(line);
@@ -225,7 +226,7 @@
// Make the call to stringdiffs, which does all the hard & tedious computations
vector<wdiff*> worddiffs;
bool breakType = GetBreakType();
- sd_ComputeWordDiffs((LPCTSTR)str1, (LPCTSTR)str2, casitive, xwhite, breakType, difflvl == BYTEDIFF, &worddiffs);
+ sd_ComputeWordDiffs(str1, str2, casitive, xwhite, breakType, difflvl == BYTEDIFF, &worddiffs);
//Add a diff in case of EOL difference
if (!diffOptions.bIgnoreEol)
{
@@ -335,8 +336,8 @@
DIFFOPTIONS diffOptions = {0};
m_diffWrapper.GetOptions(&diffOptions);
- CString str1(m_pView[0]->GetLineChars(nLineIndex), m_pView[0]->GetFullLineLength(nLineIndex));
- CString str2(m_pView[1]->GetLineChars(nLineIndex), m_pView[1]->GetFullLineLength(nLineIndex));
+ String str1(m_pView[0]->GetLineChars(nLineIndex), m_pView[0]->GetFullLineLength(nLineIndex));
+ String str2(m_pView[1]->GetLineChars(nLineIndex), m_pView[1]->GetFullLineLength(nLineIndex));
/* Commented out code because GetLineActualLength is buggy
// Chop of eol (end of line) characters
@@ -345,16 +346,16 @@
int len2 = pView2->GetLineActualLength(line);
str2 = str2.Left(len2);
*/
- i1 = str1.GetLength() - 1;
+ i1 = str1.length() - 1;
while (i1 >= 0 && (str1[i1] == '\r' || str1[i1] == '\n'))
--i1;
- if (i1 + 1 < str1.GetLength())
- str1 = str1.Left(i1 + 1);
- i2 = str2.GetLength() - 1;
+ if (i1 + 1 < str1.length())
+ str1.resize(i1 + 1);
+ i2 = str2.length() - 1;
while (i2 >= 0 && (str2[i2]=='\r' || str2[i2]=='\n'))
--i2;
- if (i2+1 < str2.GetLength())
- str2 = str2.Left(i2 + 1);
+ if (i2+1 < str2.length())
+ str2.resize(i2 + 1);
// Options that affect comparison
bool casitive = !diffOptions.bIgnoreCase;
@@ -363,7 +364,7 @@
bool byteColoring = GetByteColoringOption();
// Make the call to stringdiffs, which does all the hard & tedious computations
- sd_ComputeWordDiffs((LPCTSTR)str1, (LPCTSTR)str2, casitive, xwhite, breakType, byteColoring, pworddiffs);
+ sd_ComputeWordDiffs(str1, str2, casitive, xwhite, breakType, byteColoring, pworddiffs);
//Add a diff in case of EOL difference
if (!diffOptions.bIgnoreEol)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-22 17:59:21
|
Revision: 7054
http://winmerge.svn.sourceforge.net/winmerge/?rev=7054&view=rev
Author: kimmov
Date: 2009-12-22 17:59:08 +0000 (Tue, 22 Dec 2009)
Log Message:
-----------
Convert CMergeDoc::GetMatchCost() to use String:s as parameters.
Modified Paths:
--------------
trunk/Src/MergeDoc.h
trunk/Src/MergeDocDiffSync.cpp
Modified: trunk/Src/MergeDoc.h
===================================================================
--- trunk/Src/MergeDoc.h 2009-12-22 17:51:13 UTC (rev 7053)
+++ trunk/Src/MergeDoc.h 2009-12-22 17:59:08 UTC (rev 7054)
@@ -283,7 +283,7 @@
void PrimeTextBuffers();
void AdjustDiffBlocks();
void AdjustDiffBlock(DiffMap & diffmap, const DIFFRANGE & diffrange, int lo0, int hi0, int lo1, int hi1);
- int GetMatchCost(const CString &Line0, const CString &Line1);
+ int GetMatchCost(const String &Line0, const String &Line1);
void FlagMovedLines(MovedLines * pMovedLines, CDiffTextBuffer * pBuffer1,
CDiffTextBuffer * pBuffer2);
String GetFileExt(LPCTSTR sFileName, LPCTSTR sDescription);
Modified: trunk/Src/MergeDocDiffSync.cpp
===================================================================
--- trunk/Src/MergeDocDiffSync.cpp 2009-12-22 17:51:13 UTC (rev 7053)
+++ trunk/Src/MergeDocDiffSync.cpp 2009-12-22 17:59:08 UTC (rev 7054)
@@ -157,7 +157,7 @@
* The cost of making them equal is the measure of their dissimilarity
* which is their Levenshtein distance.
*/
-int CMergeDoc::GetMatchCost(const CString &sLine0, const CString &sLine1)
+int CMergeDoc::GetMatchCost(const String &sLine0, const String &sLine1)
{
DIFFOPTIONS diffOptions = {0};
m_diffWrapper.GetOptions(&diffOptions);
@@ -169,7 +169,7 @@
bool byteColoring = GetByteColoringOption();
vector<wdiff*> worddiffs;
- sd_ComputeWordDiffs((LPCTSTR)sLine0, (LPCTSTR)sLine1, casitive, xwhite, breakType, byteColoring, &worddiffs);
+ sd_ComputeWordDiffs(sLine0, sLine1, casitive, xwhite, breakType, byteColoring, &worddiffs);
int nDiffLenSum = 0, nDiffLen0, nDiffLen1;
int i;
@@ -260,7 +260,7 @@
for (int j=lo1; j<=hi1; ++j)
{
m_ptBuf[1]->GetLine(offset1 + j, sLine1);
- int savings = GetMatchCost(sLine0, sLine1);
+ int savings = GetMatchCost((LPCTSTR)sLine0, (LPCTSTR)sLine1);
// TODO
// Need to penalize assignments that push us outside the box
// further than is required
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-22 17:51:20
|
Revision: 7053
http://winmerge.svn.sourceforge.net/winmerge/?rev=7053&view=rev
Author: kimmov
Date: 2009-12-22 17:51:13 +0000 (Tue, 22 Dec 2009)
Log Message:
-----------
PATCH: [ 2919475 ] plug in error after ESC in foldercompare
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/FileTransform.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-12-22 17:45:22 UTC (rev 7052)
+++ trunk/Docs/Users/ChangeLog.txt 2009-12-22 17:51:13 UTC (rev 7053)
@@ -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.3.11
+ Bugfix: Plugin error after interrupting folder compare (#2919475)
+
WinMerge 2.13.10 2009-12-21 (r7051)
Visual Studio project files upgraded to VS2005 format (r7045)
Bugfix: New Persian translation don't work (#2884856)
Modified: trunk/Src/FileTransform.cpp
===================================================================
--- trunk/Src/FileTransform.cpp 2009-12-22 17:45:22 UTC (rev 7052)
+++ trunk/Src/FileTransform.cpp 2009-12-22 17:51:13 UTC (rev 7053)
@@ -137,6 +137,9 @@
PluginInfo * plugin = CAllThreadsScripts::GetActiveSet()->GetPluginByName(L"FILE_PACK_UNPACK", handler->pluginName.c_str());
if (plugin == NULL)
plugin = CAllThreadsScripts::GetActiveSet()->GetPluginByName(L"BUFFER_PACK_UNPACK", handler->pluginName.c_str());
+ if (plugin == NULL)
+ return FALSE;
+
LPDISPATCH piScript = plugin->m_lpDispatch;
if (handler->bWithFile)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-22 17:45:31
|
Revision: 7052
http://winmerge.svn.sourceforge.net/winmerge/?rev=7052&view=rev
Author: kimmov
Date: 2009-12-22 17:45:22 +0000 (Tue, 22 Dec 2009)
Log Message:
-----------
PATCH: [ 2919477 ] plugin remove double call
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Src/Plugins.cpp
Modified: trunk/Src/Plugins.cpp
===================================================================
--- trunk/Src/Plugins.cpp 2009-12-21 20:05:46 UTC (rev 7051)
+++ trunk/Src/Plugins.cpp 2009-12-22 17:45:22 UTC (rev 7052)
@@ -456,7 +456,6 @@
// get optional property PluginDescription
if (SearchScriptForDefinedProperties(lpDispatch, L"PluginDescription"))
- if (SearchScriptForDefinedProperties(lpDispatch, L"PluginDescription"))
{
h = ::invokeW(lpDispatch, &ret, L"PluginDescription", opGet[0], NULL);
if (FAILED(h) || ret.vt != VT_BSTR)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-21 20:06:00
|
Revision: 7051
http://winmerge.svn.sourceforge.net/winmerge/?rev=7051&view=rev
Author: kimmov
Date: 2009-12-21 20:05:46 +0000 (Mon, 21 Dec 2009)
Log Message:
-----------
WinMerge experimental release 2.13.10. (SVN r7051)
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-12-21 19:44:15 UTC (rev 7050)
+++ trunk/Docs/Users/ChangeLog.txt 2009-12-21 20:05:46 UTC (rev 7051)
@@ -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.13.10
+WinMerge 2.13.10 2009-12-21 (r7051)
Visual Studio project files upgraded to VS2005 format (r7045)
Bugfix: New Persian translation don't work (#2884856)
Bugfix: German shortcut key conflict resolution (#2894257)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-21 19:50:32
|
Revision: 7047
http://winmerge.svn.sourceforge.net/winmerge/?rev=7047&view=rev
Author: kimmov
Date: 2009-12-21 19:08:49 +0000 (Mon, 21 Dec 2009)
Log Message:
-----------
PATCH: [ 2876480 ] stringdiff more details
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/stringdiffs.cpp
trunk/Src/stringdiffsi.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-12-21 18:28:45 UTC (rev 7046)
+++ trunk/Docs/Users/ChangeLog.txt 2009-12-21 19:08:49 UTC (rev 7047)
@@ -7,6 +7,7 @@
Visual Studio project files upgraded to VS2005 format (r7045)
Bugfix: New Persian translation don't work (#2884856)
Bugfix: German shortcut key conflict resolution (#2894257)
+ Bugfix: More details to in-line difference highlighting (#2876480)
WinMerge 2.13.9 - 2009-10-22 (r7025)
Update PCRE to version 7.9 (r6903)
Modified: trunk/Src/stringdiffs.cpp
===================================================================
--- trunk/Src/stringdiffs.cpp 2009-12-21 18:28:45 UTC (rev 7046)
+++ trunk/Src/stringdiffs.cpp 2009-12-21 19:08:49 UTC (rev 7047)
@@ -221,69 +221,69 @@
w2 = w1;
// Not found, not same, check whitch distance is shorter
if (w1 == -1 || (w1 - bw1) > 0)
- {
- // Are we looking for a spacebreak, so just look for word->bBreak
- if (IsSpace(*m_words1[bw1]))
- w2 = FindNextSpaceInWords2(bw2);
- else
- w2 = FindNextMatchInWords2(*m_words1[bw1], bw2);
- // Execption both are not found in other string
- // so all between keep as a differ
- if (w1 == -1 && w2 == -1)
- {
- // check if it would be same if we remove the spaceblock
- // we must only ckeck on the side with the shortes word
- if ((m_words1[bw1]->end - m_words1[bw1]->start) > (m_words2[bw2]->end - m_words2[bw2]->start))
- {
- // first we check for size word2 and next word as space
- if ((bw2 < (int)m_words2.size() - 2) && IsSpace(*m_words2[bw2 + 1]))
- {
- // Are the contents same
- if (m_words1[bw1]->hash ==
- Hash(m_str2, m_words2[bw2 + 2]->start, m_words2[bw2 + 2]->end, m_words2[bw2]->hash))
- {
- m_words2[bw2]->end = m_words2[bw2 + 2]->end;
- m_words2[bw1]->hash = m_words1[bw1]->hash;
- // Now remove the detected blocks on side2.
- RemoveItem2(bw2 + 1);
- RemoveItem2(bw2 + 1);
- bw1++;
- bw2++;
- continue;
- }
- }
- }
- else if ((m_words1[bw1]->end - m_words1[bw1]->start) < (m_words2[bw2]->end - m_words2[bw2]->start))
- {
- // first we check for size word1 and next word as space
- if ((bw1 < (int)m_words1.size() - 2) && IsSpace(*m_words1[bw1 + 1]))
- {
- // Are the contents same
- if (m_words2[bw2]->hash ==
- Hash(m_str1, m_words1[bw1 + 2]->start, m_words1[bw1 + 2]->end, m_words1[bw1]->hash))
- {
- m_words1[bw1]->end = m_words1[bw1 + 2]->end;
- m_words1[bw1]->hash = m_words2[bw1]->hash;
- // Now remove the detected blocks on side2.
- RemoveItem1(bw1 + 1);
- RemoveItem1(bw1 + 1);
- bw1++;
- bw2++;
- continue;
- }
- }
- }
- // Otherwise keep as diff
- bw1++;
- bw2++;
- continue;
- }
- // Not found on one side, so check if we are synchron again on
- // next words (try not to check breaks)
+ {
+ // Are we looking for a spacebreak, so just look for word->bBreak
+ if (IsSpace(*m_words1[bw1]))
+ w2 = FindNextSpaceInWords2(bw2);
+ else
+ w2 = FindNextMatchInWords2(*m_words1[bw1], bw2);
+ // Execption both are not found in other string
+ // so all between keep as a differ
+ if (w1 == -1 && w2 == -1)
+ {
+ // check if it would be same if we remove the spaceblock
+ // we must only ckeck on the side with the shortes word
+ if ((m_words1[bw1]->end - m_words1[bw1]->start) > (m_words2[bw2]->end - m_words2[bw2]->start))
+ {
+ // first we check for size word2 and next word as space
+ if ((bw2 < (int)m_words2.size() - 2) && IsSpace(*m_words2[bw2 + 1]))
+ {
+ // Are the contents same
+ if (m_words1[bw1]->hash ==
+ Hash(m_str2, m_words2[bw2 + 2]->start, m_words2[bw2 + 2]->end, m_words2[bw2]->hash))
+ {
+ m_words2[bw2]->end = m_words2[bw2 + 2]->end;
+ m_words2[bw1]->hash = m_words1[bw1]->hash;
+ // Now remove the detected blocks on side2.
+ RemoveItem2(bw2 + 1);
+ RemoveItem2(bw2 + 1);
+ bw1++;
+ bw2++;
+ continue;
+ }
+ }
+ }
+ else if ((m_words1[bw1]->end - m_words1[bw1]->start) < (m_words2[bw2]->end - m_words2[bw2]->start))
+ {
+ // first we check for size word1 and next word as space
+ if ((bw1 < (int)m_words1.size() - 2) && IsSpace(*m_words1[bw1 + 1]))
+ {
+ // Are the contents same
+ if (m_words2[bw2]->hash ==
+ Hash(m_str1, m_words1[bw1 + 2]->start, m_words1[bw1 + 2]->end, m_words1[bw1]->hash))
+ {
+ m_words1[bw1]->end = m_words1[bw1 + 2]->end;
+ m_words1[bw1]->hash = m_words2[bw1]->hash;
+ // Now remove the detected blocks on side2.
+ RemoveItem1(bw1 + 1);
+ RemoveItem1(bw1 + 1);
+ bw1++;
+ bw2++;
+ continue;
+ }
+ }
+ }
+ // Otherwise keep as diff
+ bw1++;
+ bw2++;
+ continue;
+ }
+ // Not found on one side, so check if we are synchron again on
+ // next words (try not to check breaks)
if ((w1 == -1) || (w2 == -1))
{
- // In relation to words.size()
- // Check if in distance 2 and (3 or 4) is equal again
+ // In relation to words.size()
+ // Check if in distance 2 and (3 or 4) is equal again
if (bw1 + 4 < (int)m_words1.size() && (bw2 + 4 < (int)m_words2.size()))
{
if (AreWordsSame(*m_words1[bw1 + 2], *m_words2[bw2 + 2]))
@@ -297,33 +297,34 @@
}
}
}
- // Check if in distance 2 is equal again
+ // Check if in distance 2 is equal again
else if (bw1 + 2 < (int)m_words1.size() && (bw2 + 2 < (int)m_words2.size()))
{
if (AreWordsSame(*m_words1[bw1 + 1], *m_words2[bw2 + 1]))
- {
- // Ok than keep it as a differ
- bw1 = bw1 + 2;
- bw2 = bw2 + 2;
- continue;
- }
+ {
+ // Ok than keep it as a differ
+ bw1 = bw1 + 2;
+ bw2 = bw2 + 2;
+ continue;
+ }
}
}
}
// distance from word1 to word2 is too far away on both side
- // or too far away and not found on the other side
- if (((w1 - bw1 > 4) && (w2 - bw2 > 4))
- || ((w1 - bw1 > 4) && (w2 == -1))
- || ((w2 - bw2 > 4) && (w1 == -1)))
- {
- // keep as diff
- bw1++;
- bw2++;
- continue;
- }
+ // or too far away and not found on the other side
+ const int maxDistance = 4;
+ if (((w1 - bw1 > maxDistance) && (w2 - bw2 > maxDistance))
+ || ((w1 - bw1 > maxDistance) && (w2 == -1))
+ || ((w2 - bw2 > maxDistance) && (w1 == -1)))
+ {
+ // keep as diff
+ bw1++;
+ bw2++;
+ continue;
+ }
else if ((w2 > bw2) && ((w1 == -1 || (w2 - bw2) < (w1 - bw1))))
{
- // Numbers of inserts in word1
+ // Numbers of inserts in word1
int k = w2 - bw2;
for (int l = 0; l < k; l++)
{
@@ -341,14 +342,14 @@
word *wd = new word(start, end, dlinsert, 0);
m_words1.insert(iter, wd);
}
- bw1 = bw1 + k + 2;
- bw2 = bw2 + k + 2; // Next record
- continue;
+ bw1 = bw1 + k + 1;
+ bw2 = bw2 + k + 1; // Next record
+ continue;
}
else if (w1 > bw2)
{
- // Numbers of inserts in word2
- int k = w1 - bw2;
+ // Numbers of inserts in word2
+ int k = w1 - bw2;
for (int l = 0; l < k; l++)
{
// Remember last start end
@@ -365,8 +366,8 @@
word *wd = new word(start, end, dlinsert, 0);
m_words2.insert(iter, wd);
}
- bw1 = bw1 + k + 2;
- bw2 = bw2 + k + 2; // Next record
+ bw1 = bw1 + k + 1;
+ bw2 = bw2 + k + 1; // Next record
continue;
}
else if (w1 == bw2)
@@ -376,8 +377,6 @@
}
}
}
- // If needed, this is the place to merge from back again
- // to get more acurated matches
// Make both array to same length
if ((int) m_words1.size() > 0 || (int) m_words2.size() > 0)
@@ -390,62 +389,136 @@
if (length1 < length2)
{
- // Mark char on side2 as inserted
+ // Numbers of inserts in word1
+ int k = length2 - length1;
+ // Remember last start end
if (length1 == -1)
{
- end = - 1;
- start = end + 1;
- word *wd = new word(start, end, dlinsert, 0);
- m_words1.push_back(wd);
- // connect inserted char to one diff
- m_words2[0]->start = 0;
- m_words2[0]->end = m_words2[(int)m_words2.size() - 1]->end;
- length1++;
+ end = -1;
}
else
{
- start = m_words1[length1]->end + 1;
- end = start - 1;
- word *wd = new word(start, end, dlinsert, 0);
- m_words1.push_back(wd);
- length1++;
- // connect inserted char to one diff
- m_words2[length1]->end = m_words2[length2]->end;
+ end = m_words1[length1]->end - 1;
}
- while ((length1 + 2) < (int)m_words2.size())
+ start = end + 1;
+ for (int l = 0; l < k; l++)
{
- RemoveItem2(length1 + 1);
+ word *wd = new word(start, end, dlinsert, 0);
+ m_words1.push_back(wd);
}
}
else if (length1 > length2)
{
- // Mark char on side1 as inserted
+ // Numbers of inserts in word2
+ int k = length1 - length2;
+ // Remember last start end
if (length2 == -1)
{
- end = - 1;
- start = 0;
- word *wd = new word(start, end, dlinsert, 0);
- m_words2.push_back(wd);
- // connect inserted char to one diff
- m_words1[0]->start = 0;
- m_words1[0]->end = m_words1[(int)m_words1.size() - 1]->end;
- length2++;
+ end = -1;
}
else
{
- start = m_words2[length2]->end + 1;
- end = start - 1;
+ end = m_words2[length2]->end - 1;
+ }
+ start = end + 1;
+ for (int l = 0; l < k; l++)
+ {
word *wd = new word(start, end, dlinsert, 0);
m_words2.push_back(wd);
- length2++;
- // connect inserted char to one diff
- m_words1[length2]->end = m_words1[length1]->end;
}
+ }
+ }
- while ((length2 + 2) < (int)m_words1.size())
+ // Look for a match of word2 in word1
+ // We do it from back to get more acurated matches
+ w1 = 0, w2 = 0; // position found in array
+ bw1 = (int)m_words1.size() - 1; // start position in m_words1
+ bw2 = (int)m_words2.size() - 1; // start position in m_words2
+ if (m_matchblock && bw1 > 0 && bw2 > 0)
+ {
+ while (bw1 > 0 && bw2 > 0)
+ {
+ if (AreWordsSame(*m_words1[bw1], *m_words2[bw2])
+ || IsSpace(*m_words1[bw1]) || IsSpace(*m_words2[bw2]))
{
- RemoveItem1(length2 + 1);
+ bw1--;
+ bw2--;
+ continue;
}
+ w1 = -2, w2 = -2;
+
+ // Normaly we synchronise with a *word2 to a match in word1
+ // If it is an Insert in word2 so look for a *word1 in word2
+ if (IsInsert(*m_words2[bw2]))
+ w2 = FindPreMatchInWords2(*m_words1[bw1], bw2);
+ else
+ w1 = FindPreMatchInWords1(*m_words2[bw2], bw1);
+ // check all between are inserts
+ // if so, so exchange the position
+ if (w1 >= 0)
+ {
+ // Numbers of inserts in word1
+ const int k = bw1 - w1;
+ int l = 0;
+ for (l = 0; l < k; l++)
+ {
+ if (!IsInsert(*m_words1[bw1 - l]))
+ break;
+ }
+ // all are inserts so k==0
+ if ((k - l) == 0)
+ {
+ word *wd = new word(m_words1[w1]->start, m_words1[w1]->end, m_words1[w1]->bBreak, m_words1[w1]->hash);
+ RemoveItem1(w1);
+ vector<word*>::iterator iter = m_words1.begin() + bw1;
+ m_words1.insert(iter, wd);
+ // Correct the start-end pointer
+ const int istart = m_words1[bw1]->start;
+ const int iend =istart - 1;
+ bw1--;
+ bw2--;
+ for (l = 0; l < k ; l++)
+ {
+ m_words1[bw1 - l]->start = istart;
+ m_words1[bw1 - l]->end = iend;
+ }
+ continue;
+ }
+ }
+ if (w2 >= 0)
+ {
+ // Numbers of inserts in word2
+ const int k = bw2 - w2;
+ int l = 0;
+ for (l = 0; l < k; l++)
+ {
+ if (!IsInsert(*m_words2[bw2 - l]))
+ break;
+ }
+ // all are inserts so k==0
+ if ((k - l) == 0)
+ {
+ word *wd = new word(m_words2[w2]->start, m_words2[w2]->end, m_words2[w2]->bBreak, m_words2[w2]->hash);
+ RemoveItem2(w2);
+ vector<word*>::iterator iter = m_words2.begin() + bw2;
+ m_words2.insert(iter, wd);
+ // Correct the start-end pointer
+ const int istart = m_words2[bw1]->start;
+ const int iend = istart - 1;
+ bw1--;
+ bw2--;
+ for (l = 0; l < k ; l++)
+ {
+ m_words2[bw2 - l]->start = istart;
+ m_words2[bw2 - l]->end = iend;
+ }
+ continue;
+ }
+ }
+ // otherwise go on
+ bw1--;
+ bw2--;
+ continue;
}
}
// Remove empty records on both side
@@ -504,7 +577,7 @@
i++;
}
- // inore all diff in whitespace
+ // ignore all diff in whitespace
// so remove same records
if (m_whitespace != WHITESPACE_COMPARE_ALL)
{
@@ -525,7 +598,7 @@
// are also words at a block
// doit for word1
i = 0;
- while ((int)m_words1.size() > i + 2)
+ while ((int)m_words1.size() > i + 1)
{
if (IsInsert(*m_words1[i]) && IsInsert(*m_words1[i+1]))
{
@@ -541,7 +614,7 @@
}
// Doit for word2
i = 0;
- while ((int)m_words2.size() > i + 2)
+ while ((int)m_words2.size() > i + 1)
{
if (IsInsert(*m_words2[i]) && IsInsert(*m_words2[i+1]))
{
@@ -555,7 +628,28 @@
}
i++;
}
-
+ // Check last insert to be at string.length
+ // protect to put last insert behind string for editor, otherwise
+ // it shows last char double
+ i = (int)m_words1.size() - 1;
+ if (i >= 1)
+ {
+ if (IsInsert(*m_words1[i]) &&
+ ((m_words1[i]->start == m_str1.length() - 1)|| (m_words1[i]->start ==m_words1[i-1]->end)))
+ {
+ m_words1[i]->start = m_str1.length();
+ m_words1[i]->end = m_words1[i]->start - 1;
+ }
+ else
+ {
+ if (IsInsert(*m_words2[i]) &&
+ ((m_words2[i]->start == m_str2.length() - 1)|| (m_words2[i]->start ==m_words2[i-1]->end)))
+ {
+ m_words2[i]->start = m_str2.length();
+ m_words2[i]->end = m_words2[i]->start - 1;
+ }
+ }
+ }
// Final run create diff
#ifdef STRINGDIFF_LOGGING
OutputDebugString(_T("final run create diff \n"));
@@ -619,6 +713,20 @@
}
/**
+ * @brief Find pre word in m_words1 (starting at bw1) that matches needword2 (in m_words2)
+ */
+int
+stringdiffs::FindPreMatchInWords1(const word & needword2, int bw1) const
+{
+ while (bw1 >= 0)
+ {
+ if (AreWordsSame(*m_words1[bw1], needword2))
+ return bw1;
+ --bw1;
+ }
+ return -1;
+}
+/**
* @brief Find next word in m_words1 (starting at bw1) that matches needword2 (in m_words2)
*/
int
@@ -635,6 +743,20 @@
}
/**
+ * @brief Find pre word in m_words2 (starting at bw2) that matches needword1 (in m_words1)
+ */
+int
+stringdiffs::FindPreMatchInWords2(const word & needword1, int bw2) const
+{
+ while (bw2 >= 0)
+ {
+ if (AreWordsSame(needword1, *m_words2[bw2]))
+ return bw2;
+ --bw2;
+ }
+ return -1;
+}
+/**
* @brief Find next word in m_words2 (starting at bw2) that matches needword1 (in m_words1)
*/
int
@@ -649,6 +771,20 @@
}
return -1;
}
+/**
+ * @brief Find pre space in m_words1 (starting at bw1)
+ */
+int
+stringdiffs::FindPreSpaceInWords1(int bw1) const
+{
+ while (bw1 >= 0)
+ {
+ if (IsSpace(*m_words1[bw1]))
+ return bw1;
+ --bw1;
+ }
+ return -1;
+}
/**
* @brief Find next space in m_words1 (starting at bw1)
@@ -887,6 +1023,14 @@
{
return (word1.bBreak == dlspace);
}
+/**
+ * @brief Is this block a break?
+ */
+bool
+stringdiffs::IsBreak(const word & word1) const
+{
+ return (word1.bBreak == dlbreak || word1.bBreak == dlspace);
+}
/**
* @brief Is this block an empty (insert) one?
Modified: trunk/Src/stringdiffsi.h
===================================================================
--- trunk/Src/stringdiffsi.h 2009-12-21 18:28:45 UTC (rev 7046)
+++ trunk/Src/stringdiffsi.h 2009-12-21 19:08:49 UTC (rev 7047)
@@ -64,14 +64,18 @@
private:
void BuildWordsArray(const String & str, std::vector<word*> * words);
+ int FindPreMatchInWords1(const word & needword2, int bw1) const;
int FindNextMatchInWords1(const word & needword2, int bw1) const;
+ int FindPreMatchInWords2(const word & needword1, int bw2) const;
int FindNextMatchInWords2(const word & needword1, int bw2) const;
+ int FindPreSpaceInWords1(int bw1) const;
int FindNextSpaceInWords1(int bw1) const;
int FindNextSpaceInWords2(int bw2) const;
UINT Hash(const String & str, int begin, int end, UINT h ) const;
bool AreWordsSame(const word & word1, const word & word2) const;
bool IsWord(const word & word1) const;
bool IsSpace(const word & word1) const;
+ bool IsBreak(const word & word1) const;
bool IsInsert(const word & word1) const;
bool caseMatch(TCHAR ch1, TCHAR ch2) const;
bool RemoveItem1(int bw1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-21 19:44:25
|
Revision: 7050
http://winmerge.svn.sourceforge.net/winmerge/?rev=7050&view=rev
Author: kimmov
Date: 2009-12-21 19:44:15 +0000 (Mon, 21 Dec 2009)
Log Message:
-----------
Update version numbers to 2.13.10.
Modified Paths:
--------------
trunk/versions.ini
Modified: trunk/versions.ini
===================================================================
--- trunk/versions.ini 2009-12-21 19:34:41 UTC (rev 7049)
+++ trunk/versions.ini 2009-12-21 19:44:15 UTC (rev 7050)
@@ -7,13 +7,13 @@
description = WinMerge InnoSetup installer
path = Installer/InnoSetup/WinMerge.iss
macro = AppVersion
-version = "2.13.9"
+version = "2.13.10"
[Executable]
type = WinRC
description = WinMerge executable
path = Src/Merge.rc
-version = "2.13.9"
+version = "2.13.10"
[Dll]
type = WinRC
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-21 19:34:50
|
Revision: 7049
http://winmerge.svn.sourceforge.net/winmerge/?rev=7049&view=rev
Author: kimmov
Date: 2009-12-21 19:34:41 +0000 (Mon, 21 Dec 2009)
Log Message:
-----------
ShellExtension: Fix library file name in .def file.
Modified Paths:
--------------
trunk/ShellExtension/ShellExtensionX64.def
Modified: trunk/ShellExtension/ShellExtensionX64.def
===================================================================
--- trunk/ShellExtension/ShellExtensionX64.def 2009-12-21 19:33:23 UTC (rev 7048)
+++ trunk/ShellExtension/ShellExtensionX64.def 2009-12-21 19:34:41 UTC (rev 7049)
@@ -1,6 +1,6 @@
-; ShellExtension64.def : Declares the module parameters.
+; ShellExtensionX64.def : Declares the module parameters.
-LIBRARY "ShellExtension64.DLL"
+LIBRARY "ShellExtensionX64.DLL"
EXPORTS
DllCanUnloadNow @1 PRIVATE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-21 19:33:33
|
Revision: 7048
http://winmerge.svn.sourceforge.net/winmerge/?rev=7048&view=rev
Author: kimmov
Date: 2009-12-21 19:33:23 +0000 (Mon, 21 Dec 2009)
Log Message:
-----------
Convert 64-bit ShellExtension project to VS2005 format.
Modified Paths:
--------------
trunk/ShellExtension/ShellExtensionX64.vcproj
Modified: trunk/ShellExtension/ShellExtensionX64.vcproj
===================================================================
--- trunk/ShellExtension/ShellExtensionX64.vcproj 2009-12-21 19:08:49 UTC (rev 7047)
+++ trunk/ShellExtension/ShellExtensionX64.vcproj 2009-12-21 19:33:23 UTC (rev 7048)
@@ -1,167 +1,221 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="ShellExtension"
ProjectGUID="{C388C7AA-862D-455A-8D3B-8F4BF5AE44EA}"
- SccProjectName=""
- SccLocalPath=""
- Keyword="MFCProj">
+ Keyword="MFCProj"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug X64|Win32"
OutputDirectory=".\..\BuildTmp\ShellExtensionX64Debug"
IntermediateDirectory=".\..\BuildTmp\ShellExtensionX64Debug"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
UseOfATL="1"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Performing registration"
+ CommandLine="if "%OS%"=="" goto NOTNT
if not "%OS%"=="Windows_NT" goto NOTNT
regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
goto end
:NOTNT
echo Warning : Cannot register Unicode DLL on Windows 95
:end
"
+ Outputs="$(OutDir)\regsvr32.trg"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".,../src/common"
PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
BasicRuntimeChecks="0"
- SmallerTypeCheck="FALSE"
+ SmallerTypeCheck="false"
RuntimeLibrary="3"
- BufferSecurityCheck="FALSE"
- UsePrecompiledHeader="2"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtension.pch"
AssemblerListingLocation=".\..\BuildTmp\ShellExtensionX64Debug/"
ObjectFile=".\..\BuildTmp\ShellExtensionX64Debug/"
ProgramDataBaseFileName=".\..\BuildTmp\ShellExtensionX64Debug/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="TRUE"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
- CompileAs="0"/>
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="if "%OS%"=="" goto NOTNT
-if not "%OS%"=="Windows_NT" goto NOTNT
-regsvr32 /s /c "$(TargetPath)"
-echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
-goto end
-:NOTNT
-echo Warning : Cannot register Unicode DLL on Windows 95
-:end
-"
- Outputs="$(OutDir)\regsvr32.trg"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalOptions="/machine:AMD64"
AdditionalDependencies="bufferoverflowU.lib"
OutputFile="..\Build\ShellExtensionX64Debug\ShellExtensionX64.dll"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
ModuleDefinitionFile=".\ShellExtensionX64.def"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
ProgramDatabaseFile=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtensionU.pdb"
SubSystem="2"
OptimizeForWindows98="1"
ImportLibrary=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtensionX64.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release X64|Win32"
OutputDirectory=".\..\BuildTmp\ShellExtensionX64/"
IntermediateDirectory=".\..\BuildTmp\ShellExtensionX64/"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
UseOfATL="1"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".,../src/common"
PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="TRUE"
- ExceptionHandling="TRUE"
+ StringPooling="true"
+ ExceptionHandling="1"
RuntimeLibrary="2"
- BufferSecurityCheck="FALSE"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="2"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=".\..\BuildTmp\ShellExtensionX64/ShellExtension.pch"
AssemblerListingLocation=".\..\BuildTmp\ShellExtensionX64/"
ObjectFile=".\..\BuildTmp\ShellExtensionX64/"
ProgramDataBaseFileName=".\..\BuildTmp\ShellExtensionX64/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="TRUE"
- CompileAs="0"/>
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalOptions="/machine:AMD64"
AdditionalDependencies="bufferoverflowU.lib"
OutputFile="..\Build\ShellExtensionX64\ShellExtensionX64.dll"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
ModuleDefinitionFile=".\ShellExtensionX64.def"
ProgramDatabaseFile=".\..\BuildTmp\ShellExtensionX64/ShellExtensionU.pdb"
SubSystem="2"
OptimizeForWindows98="1"
ImportLibrary=".\..\BuildTmp\ShellExtensionX64/ShellExtensionX64.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -169,753 +223,952 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
<File
- RelativePath="..\src\common\coretools.cpp">
+ RelativePath="..\src\common\coretools.cpp"
+ >
<FileConfiguration
- Name="Debug X64|Win32">
+ Name="Debug X64|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"/>
+ BasicRuntimeChecks="3"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release X64|Win32">
+ Name="Release X64|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"/>
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="..\src\common\RegKey.cpp">
+ RelativePath="..\src\common\RegKey.cpp"
+ >
<FileConfiguration
- Name="Debug X64|Win32">
+ Name="Debug X64|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"/>
+ BasicRuntimeChecks="3"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release X64|Win32">
+ Name="Release X64|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"/>
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="ShellExtension.cpp">
+ RelativePath="ShellExtension.cpp"
+ >
<FileConfiguration
- Name="Debug X64|Win32">
+ Name="Debug X64|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"/>
+ BasicRuntimeChecks="3"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release X64|Win32">
+ Name="Release X64|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"/>
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="ShellExtension.def">
+ RelativePath="ShellExtension.def"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="ShellExtension.idl">
+ RelativePath="ShellExtension.idl"
+ >
<FileConfiguration
- Name="Debug X64|Win32">
+ Name="Debug X64|Win32"
+ >
<Tool
Name="VCMIDLTool"
- GenerateStublessProxies="TRUE"
+ GenerateStublessProxies="true"
TypeLibraryName=".\ShellExtension.tlb"
HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"/>
+ InterfaceIdentifierFileName="ShellExtension_i.c"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release X64|Win32">
+ Name="Release X64|Win32"
+ >
<Tool
Name="VCMIDLTool"
- GenerateStublessProxies="TRUE"
+ GenerateStublessProxies="true"
TypeLibraryName=".\ShellExtension.tlb"
HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"/>
+ InterfaceIdentifierFileName="ShellExtension_i.c"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\ShellExtensionU.def">
+ RelativePath=".\ShellExtensionU.def"
+ >
</File>
<File
- RelativePath=".\ShellExtensionX64.def">
+ RelativePath=".\ShellExtensionX64.def"
+ >
</File>
<File
- RelativePath="StdAfx.cpp">
+ RelativePath="StdAfx.cpp"
+ >
<FileConfiguration
- Name="Debug X64|Win32">
+ Name="Debug X64|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF"
BasicRuntimeChecks="3"
- UsePrecompiledHeader="1"/>
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release X64|Win32">
+ Name="Release X64|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF)"
- UsePrecompiledHeader="1"/>
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="..\Src\Common\UnicodeString.cpp">
+ RelativePath="..\Src\Common\UnicodeString.cpp"
+ >
</File>
<File
- RelativePath="WinMergeShell.cpp">
+ RelativePath="WinMergeShell.cpp"
+ >
<FileConfiguration
- Name="Debug X64|Win32">
+ Name="Debug X64|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"/>
+ BasicRuntimeChecks="3"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release X64|Win32">
+ Name="Release X64|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"/>
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"
+ />
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
+ Filter="h;hpp;hxx;hm;inl"
+ >
<File
- RelativePath="..\src\common\coretools.h">
+ RelativePath="..\src\common\coretools.h"
+ >
</File>
<File
- RelativePath="..\src\common\RegKey.h">
+ RelativePath="..\src\common\RegKey.h"
+ >
</File>
<File
- RelativePath="Resource.h">
+ RelativePath="Resource.h"
+ >
</File>
<File
- RelativePath="StdAfx.h">
+ RelativePath="StdAfx.h"
+ >
</File>
<File
- RelativePath="..\Src\Common\UnicodeString.h">
+ RelativePath="..\Src\Common\UnicodeString.h"
+ >
</File>
<File
- RelativePath="WinMergeShell.h">
+ RelativePath="WinMergeShell.h"
+ >
</File>
</Filter>
<Filter
Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
<File
- RelativePath="ShellExtension.rc">
+ RelativePath="ShellExtension.rc"
+ >
<FileConfiguration
- Name="Debug X64|Win32">
+ Name="Debug X64|Win32"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="$(OUTDIR)"/>
+ AdditionalIncludeDirectories="$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release X64|Win32">
+ Name="Release X64|Win32"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="$(OUTDIR)"/>
+ AdditionalIncludeDirectories="$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionBrazilian.rc">
+ RelativePath="Languages\ShellExtensionBrazilian.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionBulgarian.rc">
+ RelativePath="Languages\ShellExtensionBulgarian.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionCatalan.rc">
+ RelativePath="Languages\ShellExtensionCatalan.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionChineseSimplified.rc">
+ RelativePath="Languages\ShellExtensionChineseSimplified.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionChineseTraditional.rc">
+ RelativePath="Languages\ShellExtensionChineseTraditional.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionCroatian.rc">
+ RelativePath="Languages\ShellExtensionCroatian.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionCzech.rc">
+ RelativePath="Languages\ShellExtensionCzech.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionDanish.rc">
+ RelativePath="Languages\ShellExtensionDanish.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionDutch.rc">
+ RelativePath="Languages\ShellExtensionDutch.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionFrench.rc">
+ RelativePath="Languages\ShellExtensionFrench.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionGerman.rc">
+ RelativePath="Languages\ShellExtensionGerman.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\Languages\ShellExtensionGreek.rc">
+ RelativePath=".\Languages\ShellExtensionGreek.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionHungarian.rc">
+ RelativePath="Languages\ShellExtensionHungarian.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionItalian.rc">
+ RelativePath="Languages\ShellExtensionItalian.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionJapanese.rc">
+ RelativePath="Languages\ShellExtensionJapanese.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionKorean.rc">
+ RelativePath="Languages\ShellExtensionKorean.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionNorwegian.rc">
+ RelativePath="Languages\ShellExtensionNorwegian.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionPersian.rc">
+ RelativePath="Languages\ShellExtensionPersian.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionPortuguese.rc">
+ RelativePath="Languages\ShellExtensionPolish.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionPolish.rc">
+ RelativePath="Languages\ShellExtensionPortuguese.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionPortuguese.rc">
+ RelativePath="Languages\ShellExtensionPortuguese.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\Languages\ShellExtensionRomanian.rc">
+ RelativePath=".\Languages\ShellExtensionRomanian.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionRussian.rc">
+ RelativePath="Languages\ShellExtensionRussian.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionSlovak.rc">
+ RelativePath="Languages\ShellExtensionSlovak.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionSlovenian.rc">
+ RelativePath="Languages\ShellExtensionSlovenian.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionSpanish.rc">
+ RelativePath="Languages\ShellExtensionSpanish.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionSwedish.rc">
+ RelativePath="Languages\ShellExtensionSwedish.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionTurkish.rc">
+ RelativePath="Languages\ShellExtensionTurkish.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="Languages\ShellExtensionUkrainian.rc">
+ RelativePath="Languages\ShellExtensionUkrainian.rc"
+ >
<FileConfiguration
Name="Debug X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
<FileConfiguration
Name="Release X64|Win32"
- ExcludedFromBuild="TRUE">
+ ExcludedFromBuild="true"
+ >
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_AFXDLL"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="WinMerge.bmp">
+ RelativePath="WinMerge.bmp"
+ >
</File>
<File
- RelativePath="WinMergeShell.rgs">
+ RelativePath="WinMergeShell.rgs"
+ >
</File>
</Filter>
</Files>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-21 18:28:52
|
Revision: 7046
http://winmerge.svn.sourceforge.net/winmerge/?rev=7046&view=rev
Author: kimmov
Date: 2009-12-21 18:28:45 +0000 (Mon, 21 Dec 2009)
Log Message:
-----------
Docs: Wix installer needs to be compiled in Visual Studio command prompt.
Modified Paths:
--------------
trunk/Docs/Developers/readme-WIX.html
Modified: trunk/Docs/Developers/readme-WIX.html
===================================================================
--- trunk/Docs/Developers/readme-WIX.html 2009-12-21 17:48:18 UTC (rev 7045)
+++ trunk/Docs/Developers/readme-WIX.html 2009-12-21 18:28:45 UTC (rev 7046)
@@ -193,7 +193,7 @@
<h4>Building with MSBuild</h4>
-<p>Open the DOS prompt and CD to <code>Installer/WIX</code> -folder. Run
+<p>Open the Visual Studio command prompt and CD to <code>Installer/WIX</code> -folder. Run
command:
<pre>
msbuild.exe WinMerge.wixproj
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-21 17:48:28
|
Revision: 7045
http://winmerge.svn.sourceforge.net/winmerge/?rev=7045&view=rev
Author: kimmov
Date: 2009-12-21 17:48:18 +0000 (Mon, 21 Dec 2009)
Log Message:
-----------
Visual Studio project files upgraded to VS2005 format.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Externals/expat/examples/elements.vcproj
trunk/Externals/expat/examples/outline.vcproj
trunk/Externals/expat/expat.sln
trunk/Externals/expat/lib/expat.vcproj
trunk/Externals/expat/lib/expat_static.vcproj
trunk/Externals/expat/lib/expatw.vcproj
trunk/Externals/expat/lib/expatw_static.vcproj
trunk/Externals/expat/xmlwf/xmlwf.vcproj
trunk/Externals/pcre/Win32/PCRE.sln
trunk/Externals/pcre/Win32/pcre.vcproj
trunk/Externals/scew/win32/scew.vcproj
trunk/ShellExtension/ShellExtension.vcproj
trunk/Src/Merge.vcproj
trunk/WinMerge.sln
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-12-08 19:54:34 UTC (rev 7044)
+++ trunk/Docs/Users/ChangeLog.txt 2009-12-21 17:48:18 UTC (rev 7045)
@@ -4,6 +4,7 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.13.10
+ Visual Studio project files upgraded to VS2005 format (r7045)
Bugfix: New Persian translation don't work (#2884856)
Bugfix: German shortcut key conflict resolution (#2894257)
Modified: trunk/Externals/expat/examples/elements.vcproj
===================================================================
--- trunk/Externals/expat/examples/elements.vcproj 2009-12-08 19:54:34 UTC (rev 7044)
+++ trunk/Externals/expat/examples/elements.vcproj 2009-12-21 17:48:18 UTC (rev 7045)
@@ -1,24 +1,45 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="elements"
- SccProjectName=""
- SccLocalPath="">
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\../../../Build/expat/elements/Debug"
IntermediateDirectory=".\../../../BuildTmp/expat/elements/Debug"
ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../Build/expat/elements/Debug/elements.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\lib"
@@ -31,105 +52,146 @@
ProgramDataBaseFileName=".\../../../BuildTmp/expat/elements/Debug/"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
DebugInformationFormat="4"
- CompileAs="0"/>
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib libexpatMT.lib odbc32.lib"
OutputFile=".\../../../Build/expat/elements/Debug/elements.exe"
LinkIncremental="2"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../Build/expat/lib/Debug_static"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
SubSystem="1"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\../../../Build/expat/elements/Debug/elements.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\../../../Build/expat/elements/Release"
IntermediateDirectory=".\../../../BuildTmp/expat/elements/Release"
ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../Build/expat/elements/Release/elements.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\lib"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XML_STATIC"
- StringPooling="TRUE"
+ StringPooling="true"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
+ EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\../../../BuildTmp/expat/elements/Release/elements.pch"
AssemblerListingLocation=".\../../../BuildTmp/expat/elements/Release/"
ObjectFile=".\../../../BuildTmp/expat/elements/Release/"
ProgramDataBaseFileName=".\../../../BuildTmp/expat/elements/Release/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib libexpatMT.lib odbc32.lib"
OutputFile=".\../../../Build/expat/elements/Release/elements.exe"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../Build/expat/lib/Release_static"
SubSystem="1"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\../../../Build/expat/elements/Release/elements.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -137,36 +199,44 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
<File
- RelativePath="elements.c">
+ RelativePath="elements.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
+ Filter="h;hpp;hxx;hm;inl"
+ >
</Filter>
<Filter
Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
</Filter>
</Files>
<Globals>
Modified: trunk/Externals/expat/examples/outline.vcproj
===================================================================
--- trunk/Externals/expat/examples/outline.vcproj 2009-12-08 19:54:34 UTC (rev 7044)
+++ trunk/Externals/expat/examples/outline.vcproj 2009-12-21 17:48:18 UTC (rev 7045)
@@ -1,24 +1,45 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="outline"
- SccProjectName=""
- SccLocalPath="">
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\../../../Build/expat/outline/Debug"
IntermediateDirectory=".\../../../BuildTmp/expat/outline/Debug"
ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../Build/expat/outline/Debug/outline.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\lib"
@@ -30,101 +51,142 @@
ObjectFile=".\../../../BuildTmp/expat/outline/Debug/"
ProgramDataBaseFileName=".\../../../BuildTmp/expat/outline/Debug/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
DebugInformationFormat="4"
- CompileAs="0"/>
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
OutputFile=".\../../../Build/expat/outline/Debug/outline.exe"
LinkIncremental="2"
- SuppressStartupBanner="TRUE"
- GenerateDebugInformation="TRUE"
+ SuppressStartupBanner="true"
+ GenerateDebugInformation="true"
SubSystem="1"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\../../../Build/expat/outline/Debug/outline.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\../../../Build/expat/outline/Release"
IntermediateDirectory=".\../../../BuildTmp/expat/outline/Release"
ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../Build/expat/outline/Release/outline.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\lib"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="TRUE"
+ StringPooling="true"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
+ EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\../../../BuildTmp/expat/outline/Release/outline.pch"
AssemblerListingLocation=".\../../../BuildTmp/expat/outline/Release/"
ObjectFile=".\../../../BuildTmp/expat/outline/Release/"
ProgramDataBaseFileName=".\../../../BuildTmp/expat/outline/Release/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
OutputFile=".\../../../Build/expat/outline/Release/outline.exe"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
SubSystem="1"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\../../../Build/expat/outline/Release/outline.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -132,35 +194,43 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
<File
- RelativePath="outline.c">
+ RelativePath="outline.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
- BasicRuntimeChecks="3"/>
+ BasicRuntimeChecks="3"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
+ Filter="h;hpp;hxx;hm;inl"
+ >
</Filter>
<Filter
Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
</Filter>
</Files>
<Globals>
Modified: trunk/Externals/expat/expat.sln
===================================================================
--- trunk/Externals/expat/expat.sln 2009-12-08 19:54:34 UTC (rev 7044)
+++ trunk/Externals/expat/expat.sln 2009-12-21 17:48:18 UTC (rev 7045)
@@ -1,24 +1,17 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elements", "examples\elements.vcproj", "{4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}"
ProjectSection(ProjectDependencies) = postProject
{464DBF5A-69E8-4E1A-8401-171371B86299} = {464DBF5A-69E8-4E1A-8401-171371B86299}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "lib\expat.vcproj", "{ACAE29AF-D15F-402E-AE0A-93141CF439C6}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat_static", "lib\expat_static.vcproj", "{464DBF5A-69E8-4E1A-8401-171371B86299}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expatw", "lib\expatw.vcproj", "{AC9279F5-5C6F-477F-AA3B-A42F8859D236}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expatw_static", "lib\expatw_static.vcproj", "{4815F7F0-BA32-4D79-A041-A146B0130D9E}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "outline", "examples\outline.vcproj", "{FD603999-011A-458C-9677-D596E25A620C}"
ProjectSection(ProjectDependencies) = postProject
@@ -31,44 +24,41 @@
EndProjectSection
EndProject
Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
EndGlobalSection
- GlobalSection(ProjectDependencies) = postSolution
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Debug|Win32.Build.0 = Debug|Win32
+ {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Release|Win32.ActiveCfg = Release|Win32
+ {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Release|Win32.Build.0 = Release|Win32
+ {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Debug|Win32.Build.0 = Debug|Win32
+ {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Release|Win32.ActiveCfg = Release|Win32
+ {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Release|Win32.Build.0 = Release|Win32
+ {464DBF5A-69E8-4E1A-8401-171371B86299}.Debug|Win32.ActiveCfg = Debug|Win32
+ {464DBF5A-69E8-4E1A-8401-171371B86299}.Debug|Win32.Build.0 = Debug|Win32
+ {464DBF5A-69E8-4E1A-8401-171371B86299}.Release|Win32.ActiveCfg = Release|Win32
+ {464DBF5A-69E8-4E1A-8401-171371B86299}.Release|Win32.Build.0 = Release|Win32
+ {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Debug|Win32.Build.0 = Debug|Win32
+ {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Release|Win32.ActiveCfg = Release|Win32
+ {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Release|Win32.Build.0 = Release|Win32
+ {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Debug|Win32.Build.0 = Debug|Win32
+ {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Release|Win32.ActiveCfg = Release|Win32
+ {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Release|Win32.Build.0 = Release|Win32
+ {FD603999-011A-458C-9677-D596E25A620C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FD603999-011A-458C-9677-D596E25A620C}.Debug|Win32.Build.0 = Debug|Win32
+ {FD603999-011A-458C-9677-D596E25A620C}.Release|Win32.ActiveCfg = Release|Win32
+ {FD603999-011A-458C-9677-D596E25A620C}.Release|Win32.Build.0 = Release|Win32
+ {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Debug|Win32.Build.0 = Debug|Win32
+ {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Release|Win32.ActiveCfg = Release|Win32
+ {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Debug.ActiveCfg = Debug|Win32
- {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Debug.Build.0 = Debug|Win32
- {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Release.ActiveCfg = Release|Win32
- {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Release.Build.0 = Release|Win32
- {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Debug.ActiveCfg = Debug|Win32
- {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Debug.Build.0 = Debug|Win32
- {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Release.ActiveCfg = Release|Win32
- {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Release.Build.0 = Release|Win32
- {464DBF5A-69E8-4E1A-8401-171371B86299}.Debug.ActiveCfg = Debug|Win32
- {464DBF5A-69E8-4E1A-8401-171371B86299}.Debug.Build.0 = Debug|Win32
- {464DBF5A-69E8-4E1A-8401-171371B86299}.Release.ActiveCfg = Release|Win32
- {464DBF5A-69E8-4E1A-8401-171371B86299}.Release.Build.0 = Release|Win32
- {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Debug.ActiveCfg = Debug|Win32
- {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Debug.Build.0 = Debug|Win32
- {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Release.ActiveCfg = Release|Win32
- {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Release.Build.0 = Release|Win32
- {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Debug.ActiveCfg = Debug|Win32
- {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Debug.Build.0 = Debug|Win32
- {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Release.ActiveCfg = Release|Win32
- {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Release.Build.0 = Release|Win32
- {FD603999-011A-458C-9677-D596E25A620C}.Debug.ActiveCfg = Debug|Win32
- {FD603999-011A-458C-9677-D596E25A620C}.Debug.Build.0 = Debug|Win32
- {FD603999-011A-458C-9677-D596E25A620C}.Release.ActiveCfg = Release|Win32
- {FD603999-011A-458C-9677-D596E25A620C}.Release.Build.0 = Release|Win32
- {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Debug.ActiveCfg = Debug|Win32
- {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Debug.Build.0 = Debug|Win32
- {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Release.ActiveCfg = Release|Win32
- {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Release.Build.0 = Release|Win32
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
EndGlobal
Modified: trunk/Externals/expat/lib/expat.vcproj
===================================================================
--- trunk/Externals/expat/lib/expat.vcproj 2009-12-08 19:54:34 UTC (rev 7044)
+++ trunk/Externals/expat/lib/expat.vcproj 2009-12-21 17:48:18 UTC (rev 7045)
@@ -1,24 +1,49 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="expat"
- SccProjectName=""
- SccLocalPath="">
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\../../../Build/expat/lib/Debug"
IntermediateDirectory=".\../../../BuildTmp/expat/lib/Debug"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\../../../Build/expat/lib/Debug/expat.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_USRDLL"
@@ -30,108 +55,145 @@
ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Debug/"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"/>
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
OutputFile="../../../Build/expat/lib/Debug/libexpat.dll"
LinkIncremental="2"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
ModuleDefinitionFile=".\libexpat.def"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
ImportLibrary=".\../../../Build/expat/lib/Debug/libexpat.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\../../../Build/expat/lib/Debug/expat.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\../../../Build/expat/lib/Release"
IntermediateDirectory=".\../../../BuildTmp/expat/lib/Release"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\../../../Build/expat/lib/Release/expat.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;COMPILED_FROM_DSP"
- StringPooling="TRUE"
+ StringPooling="true"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
+ EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\../../../BuildTmp/expat/lib/Release/expat.pch"
AssemblerListingLocation=".\../../../BuildTmp/expat/lib/Release/"
ObjectFile=".\../../../BuildTmp/expat/lib/Release/"
ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Release/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
OutputFile="../../../Build/expat/lib/Release/libexpat.dll"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
ModuleDefinitionFile=".\libexpat.def"
ImportLibrary=".\../../../Build/expat/lib/Release/libexpat.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\../../../Build/expat/lib/Release/expat.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -139,150 +201,191 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
<File
- RelativePath="libexpat.def">
+ RelativePath="libexpat.def"
+ >
</File>
<File
- RelativePath="xmlparse.c">
+ RelativePath="xmlparse.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
- ExceptionHandling="FALSE"
+ ExceptionHandling="0"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmlrole.c">
+ RelativePath="xmlrole.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok.c">
+ RelativePath="xmltok.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok_impl.c">
+ RelativePath="xmltok_impl.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok_ns.c">
+ RelativePath="xmltok_ns.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"
+ />
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
+ Filter="h;hpp;hxx;hm;inl"
+ >
<File
- RelativePath="ascii.h">
+ RelativePath="ascii.h"
+ >
</File>
<File
- RelativePath="asciitab.h">
+ RelativePath="asciitab.h"
+ >
</File>
<File
- RelativePath="expat.h">
+ RelativePath="expat.h"
+ >
</File>
<File
- RelativePath="expat_external.h">
+ RelativePath="expat_external.h"
+ >
</File>
<File
- RelativePath="iasciitab.h">
+ RelativePath="iasciitab.h"
+ >
</File>
<File
- RelativePath="internal.h">
+ RelativePath="internal.h"
+ >
</File>
<File
- RelativePath="latin1tab.h">
+ RelativePath="latin1tab.h"
+ >
</File>
<File
- RelativePath="nametab.h">
+ RelativePath="nametab.h"
+ >
</File>
<File
- RelativePath="utf8tab.h">
+ RelativePath="utf8tab.h"
+ >
</File>
<File
- RelativePath="xmlrole.h">
+ RelativePath="xmlrole.h"
+ >
</File>
<File
- RelativePath="xmltok.h">
+ RelativePath="xmltok.h"
+ >
</File>
<File
- RelativePath="xmltok_impl.h">
+ RelativePath="xmltok_impl.h"
+ >
</File>
</Filter>
<Filter
Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
</Filter>
</Files>
<Globals>
Modified: trunk/Externals/expat/lib/expat_static.vcproj
===================================================================
--- trunk/Externals/expat/lib/expat_static.vcproj 2009-12-08 19:54:34 UTC (rev 7044)
+++ trunk/Externals/expat/lib/expat_static.vcproj 2009-12-21 17:48:18 UTC (rev 7045)
@@ -1,24 +1,43 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="expat_static"
- SccProjectName=""
- SccLocalPath="">
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\../../../Build/expat/lib/Debug_static"
IntermediateDirectory=".\../../../BuildTmp/expat/lib/Debug_static"
ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;COMPILED_FROM_DSP;_LIB"
@@ -30,83 +49,112 @@
ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Debug_static/"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"/>
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLibrarianTool"
OutputFile="../../../Build/expat/lib/Debug_static/libexpatMT.lib"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\../../../Build/expat/lib/Release_static"
IntermediateDirectory=".\../../../BuildTmp/expat/lib/Release_static"
ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_LIB;COMPILED_FROM_DSP"
- StringPooling="TRUE"
+ StringPooling="true"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
+ EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\../../../BuildTmp/expat/lib/Release_static/expat_static.pch"
AssemblerListingLocation=".\../../../BuildTmp/expat/lib/Release_static/"
ObjectFile=".\../../../BuildTmp/expat/lib/Release_static/"
ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Release_static/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLibrarianTool"
OutputFile="../../../Build/expat/lib/Release_static/libexpatMT.lib"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -114,141 +162,180 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
<File
- RelativePath="xmlparse.c">
+ RelativePath="xmlparse.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmlrole.c">
+ RelativePath="xmlrole.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok.c">
+ RelativePath="xmltok.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok_impl.c">
+ RelativePath="xmltok_impl.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok_ns.c">
+ RelativePath="xmltok_ns.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
+ Filter="h;hpp;hxx;hm;inl"
+ >
<File
- RelativePath="ascii.h">
+ RelativePath="ascii.h"
+ >
</File>
<File
- RelativePath="asciitab.h">
+ RelativePath="asciitab.h"
+ >
</File>
<File
- RelativePath="expat.h">
+ RelativePath="expat.h"
+ >
</File>
<File
- RelativePath="expat_external.h">
+ RelativePath="expat_external.h"
+ >
</File>
<File
- RelativePath="iasciitab.h">
+ RelativePath="iasciitab.h"
+ >
</File>
<File
- RelativePath="internal.h">
+ RelativePath="internal.h"
+ >
</File>
<File
- RelativePath="latin1tab.h">
+ RelativePath="latin1tab.h"
+ >
</File>
<File
- RelativePath="nametab.h">
+ RelativePath="nametab.h"
+ >
</File>
<File
- RelativePath="utf8tab.h">
+ RelativePath="utf8tab.h"
+ >
</File>
<File
- RelativePath="xmlrole.h">
+ RelativePath="xmlrole.h"
+ >
</File>
<File
- RelativePath="xmltok.h">
+ RelativePath="xmltok.h"
+ >
</File>
<File
- RelativePath="xmltok_impl.h">
+ RelativePath="xmltok_impl.h"
+ >
</File>
</Filter>
</Files>
Modified: trunk/Externals/expat/lib/expatw.vcproj
===================================================================
--- trunk/Externals/expat/lib/expatw.vcproj 2009-12-08 19:54:34 UTC (rev 7044)
+++ trunk/Externals/expat/lib/expatw.vcproj 2009-12-21 17:48:18 UTC (rev 7045)
@@ -1,85 +1,140 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="expatw"
- SccProjectName=""
- SccLocalPath="">
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\../../../Build/expat/lib/Release-w"
IntermediateDirectory=".\../../../BuildTmp/expat/lib/Release-w"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\../../../Build/expat/lib/Release-w/expatw.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_USRDLL;XML_UNICODE_WCHAR_T"
- StringPooling="TRUE"
+ StringPooling="true"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
+ EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\../../../BuildTmp/expat/lib/Release-w/expatw.pch"
AssemblerListingLocation=".\../../../BuildTmp/expat/lib/Release-w/"
ObjectFile=".\../../../BuildTmp/expat/lib/Release-w/"
ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Release-w/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
OutputFile="../../../Build/expat/lib/Release-w/libexpatw.dll"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
ModuleDefinitionFile=".\libexpatw.def"
ImportLibrary=".\../../../Build/expat/lib/Release-w/libexpatw.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\../../../Build/expat/lib/Release-w/expatw.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\../../../Build/expat/lib/Debug-w"
IntermediateDirectory=".\../../../BuildTmp/expat/lib/Debug-w"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\../../../Build/expat/lib/Debug-w/expatw.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_USRDLL;XML_UNICODE_WCHAR_T"
@@ -91,47 +146,54 @@
ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Debug-w/"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"/>
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
OutputFile="../../../Build/expat/lib/Debug-w/libexpatw.dll"
LinkIncremental="2"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
ModuleDefinitionFile=".\libexpatw.def"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
ImportLibrary=".\../../../Build/expat/lib/Debug-w/libexpatw.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\../../../Build/expat/lib/Debug-w/expatw.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -139,150 +201,191 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
<File
- RelativePath="libexpatw.def">
+ RelativePath="libexpatw.def"
+ >
</File>
<File
- RelativePath="xmlparse.c">
+ RelativePath="xmlparse.c"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
- ExceptionHandling="FALSE"
+ ExceptionHandling="0"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmlrole.c">
+ RelativePath="xmlrole.c"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok.c">
+ RelativePath="xmltok.c"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok_impl.c">
+ RelativePath="xmltok_impl.c"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok_ns.c">
+ RelativePath="xmltok_ns.c"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
+ Filter="h;hpp;hxx;hm;inl"
+ >
<File
- RelativePath="ascii.h">
+ RelativePath="ascii.h"
+ >
</File>
<File
- RelativePath="asciitab.h">
+ RelativePath="asciitab.h"
+ >
</File>
<File
- RelativePath="expat.h">
+ RelativePath="expat.h"
+ >
</File>
<File
- RelativePath="expat_external.h">
+ RelativePath="expat_external.h"
+ >
</File>
<File
- RelativePath="iasciitab.h">
+ RelativePath="iasciitab.h"
+ >
</File>
<File
- RelativePath="internal.h">
+ RelativePath="internal.h"
+ >
</File>
<File
- RelativePath="latin1tab.h">
+ RelativePath="latin1tab.h"
+ >
</File>
<File
- RelativePath="nametab.h">
+ RelativePath="nametab.h"
+ >
</File>
<File
- RelativePath="utf8tab.h">
+ RelativePath="utf8tab.h"
+ >
</File>
<File
- RelativePath="xmlrole.h">
+ RelativePath="xmlrole.h"
+ >
</File>
<File
- RelativePath="xmltok.h">
+ RelativePath="xmltok.h"
+ >
</File>
<File
- RelativePath="xmltok_impl.h">
+ RelativePath="xmltok_impl.h"
+ >
</File>
</Filter>
<Filter
Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
</Filter>
</Files>
<Globals>
Modified: trunk/Externals/expat/lib/expatw_static.vcproj
===================================================================
--- trunk/Externals/expat/lib/expatw_static.vcproj 2009-12-08 19:54:34 UTC (rev 7044)
+++ trunk/Externals/expat/lib/expatw_static.vcproj 2009-12-21 17:48:18 UTC (rev 7045)
@@ -1,73 +1,115 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual...
[truncated message content] |
|
From: <ge...@us...> - 2009-12-08 19:54:42
|
Revision: 7044
http://winmerge.svn.sourceforge.net/winmerge/?rev=7044&view=rev
Author: gerundt
Date: 2009-12-08 19:54:34 +0000 (Tue, 08 Dec 2009)
Log Message:
-----------
PATCH: [ 2894257 ] German shortcut key conflict resolution
by Robert Knienider
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/German.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-11-25 18:52:56 UTC (rev 7043)
+++ trunk/Docs/Users/ChangeLog.txt 2009-12-08 19:54:34 UTC (rev 7044)
@@ -5,6 +5,7 @@
WinMerge 2.13.10
Bugfix: New Persian translation don't work (#2884856)
+ Bugfix: German shortcut key conflict resolution (#2894257)
WinMerge 2.13.9 - 2009-10-22 (r7025)
Update PCRE to version 7.9 (r6903)
Modified: trunk/Translations/WinMerge/German.po
===================================================================
--- trunk/Translations/WinMerge/German.po 2009-11-25 18:52:56 UTC (rev 7043)
+++ trunk/Translations/WinMerge/German.po 2009-12-08 19:54:34 UTC (rev 7044)
@@ -812,7 +812,7 @@
#: Merge.rc:408
#, c-format
msgid "&View Whitespace"
-msgstr "Leer&zeichen anzeigen"
+msgstr "&Leerzeichen anzeigen"
#: Merge.rc:409
#, c-format
@@ -1446,7 +1446,7 @@
#: Merge.rc:861
#, c-format
msgid "Wh&ole file"
-msgstr "&ganzer Datei"
+msgstr "ganzer &Datei"
#: Merge.rc:864
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-11-25 18:53:16
|
Revision: 7043
http://winmerge.svn.sourceforge.net/winmerge/?rev=7043&view=rev
Author: gerundt
Date: 2009-11-25 18:52:56 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
Update Dutch website translation by Thomas De Rocker
Modified Paths:
--------------
trunk/Translations/Web/nl.po
Modified: trunk/Translations/Web/nl.po
===================================================================
--- trunk/Translations/Web/nl.po 2009-11-21 17:34:05 UTC (rev 7042)
+++ trunk/Translations/Web/nl.po 2009-11-25 18:52:56 UTC (rev 7043)
@@ -23,188 +23,230 @@
"X-Poedit-Basepath: ../../Web/\n"
#: about\screenshots\index.php:26
+#, c-format
msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different areas between lines."
msgstr "Het is dikwijls handig om exacte verschillen binnen regels te zien. WinMerge kan verschillende gebieden tussen regels markeren."
#: 404.php:13
+#, c-format
msgid "This site has recently undergone a major re-working, so that might explain why you got this page instead."
msgstr "Deze site heeft recent een grote aanpassing ondergaan, zodat dit kan verklaren waarom u deze pagina in de plaats kreeg."
#: translations\index.php:36
+#, c-format
msgid "Status"
msgstr "Status"
#: docs\changelog.php:11
+#, c-format
msgid "The change log is currently not available..."
msgstr "De lijst van aanpassingen is op dit moment niet beschikbaar..."
#: downloads\index.php:55
+#, c-format
msgid "Requirements"
msgstr "Vereisten"
#: downloads\source-code.php:33
+#, c-format
msgid "The source code is hosted on <a href=\"%1$s\">SourceForge.net</a> in a <a href=\"%2$s\">Subversion</a> repository."
msgstr "De broncode wordt gehost op <a href=\"%1$s\">SourceForge.net</a> in een <a href=\"%2$s\">Subversion</a>-repositorium."
#: about\license.php:35
+#, c-format
msgid "Open Source Software"
msgstr "Open source software"
#: support\mailing-lists.php:72
+#, c-format
msgid "High Traffic"
msgstr "Druk verkeer"
#: index.php:13
+#, c-format
msgid "What is WinMerge?"
msgstr "Wat is WinMerge?"
#: support\index.php:15
+#, c-format
msgid "Good information in a bug report makes it more likely that your bug will be fixed quickly."
-msgstr "Goeie informatie in een bugrapport zorgt voor een snellere oplossing van uw bug."
+msgstr "Goede informatie in een bugrapport zorgt voor een snellere oplossing van uw bug."
#: about\index.php:30
+#, c-format
msgid "Flexible editor with syntax highlighting, line numbers and word-wrap"
-msgstr "Flexibele editor met syntax highlighting, lijn-nummers en woord-wrap"
+msgstr "Flexibele editor met syntaxmarkering, regelnummers en automatische terugloop"
#: about\index.php:22
+#, c-format
msgid "Handles Windows, Unix and Mac text file formats"
msgstr "Werkt met tekstformaten van Windows, Unix en Mac"
#: engine\page.inc:324
#: support\tracker-shortcuts.php:7
#: support\tracker-shortcuts.php:9
+#, c-format
msgid "Tracker Shortcuts"
msgstr "Tracker-snelkoppelingen"
#: engine\page.inc:310
+#, c-format
msgid "WinMerge Change Log"
msgstr "Lijst van aanpassingen in Winmerge"
#: about\screenshots\index.php:27
#: about\screenshots\index.php:28
+#, c-format
msgid "Location Pane"
msgstr "Locatievenster"
#: translations\translations.inc:177
+#, c-format
msgid "Template"
msgstr "Sjabloon"
#: links.php:27
#, c-format
msgid "Good site devoted for regular expressions"
-msgstr ""
+msgstr "Goede site gewijd aan reguliere expressies"
#: index.php:45
+#, c-format
msgid "Developers"
msgstr "Ontwikkelaars"
#: about\index.php:39
+#, c-format
msgid "Regular Expression based file filters allow excluding and including items"
msgstr "Bestandsfilters gebaseerd op reguliere expressies staan toe om items te excluderen of includeren"
#: downloads\index.php:59
+#, c-format
msgid "Microsoft Visual C++ 2003 Runtime Components (included in the installer)"
msgstr "Microsoft Visual C++ 2003 Runtime Components (bij de installer bijgevoegd)"
#: translations\status_branch.php:18
#: translations\status_trunk.php:18
+#, c-format
msgid "The translations status is currently not available..."
msgstr "De vertaalstatus is op dit moment niet beschikbaar..."
#: engine\page.inc:306
+#, c-format
msgid "WinMerge Manual"
msgstr "WinMerge handleiding"
#: engine\page.inc:321
+#, c-format
msgid "WinMerge Discussion Forums"
msgstr "WinMerge discussieforums"
#: about\license.php:5
+#, c-format
msgid "WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify it."
msgstr "WinMerge is Open Source software onder de GNU General Public License. Dit betekent dat iedereen de broncode kan downloaden en ze verbeteren en aanpassen."
#: downloads\pad-file.php:90
+#, c-format
msgid "Company"
msgstr "Onderneming"
#: support\mailing-lists.php:13
#: support\mailing-lists.php:30
+#, c-format
msgid "Support List"
msgstr "Ondersteuningslijst"
#: engine\page.inc:317
+#, c-format
msgid "WinMerge PAD File"
msgstr "WinMerge PAD-bestand"
#: engine\engine.inc:21
+#, c-format
msgid "French"
msgstr "Frans"
#: translations\instructions.php:15
+#, c-format
msgid "Source: %s"
msgstr "Bron: %s"
#: downloads\plugins.php:6
+#, c-format
msgid "WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
msgstr "WinMerge, gratis, download, plugins, plugin, plug-in, setup, installer, installatiebestanden, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
#: links.php:31
#, c-format
msgid "Regular expressions tutorial"
-msgstr ""
+msgstr "Handleiding voor reguliere expressies"
#: support\tracker-shortcuts.php:55
+#, c-format
msgid "Subdomains"
msgstr "Subdomeinen"
#: about\history.php:45
+#, c-format
msgid "Withdrawn due to installer bug!"
msgstr "Teruggehaald vanwege een installer-bug!"
#: translations\index.php:40
+#, c-format
msgid "Unstable Version (Trunk)"
-msgstr "Instabiele versie (Trunk)"
+msgstr "Onstabiele versie (Trunk)"
#: about\screenshots\index.php:32
+#, c-format
msgid "WinMerge 2.8 has a new professional looking splash screen."
msgstr "WinMerge 2.8 heeft een nieuw professioneel ogend opstartvenster."
#: about\index.php:42
+#, c-format
msgid "Can show folder compare results in a tree-style view"
msgstr "Kan mapvergelijkingsresultaten weergeven in een boomweergave"
#: about\index.php:16
+#, c-format
msgid "In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible:"
msgstr "Daarenboven heeft WinMerge vele handige ondersteunende functies die vergelijken, synchroniseren en samenvoegen zo gemakkelijk en bruikbaar mogelijk maken:"
#: support\mailing-lists.php:22
#: support\mailing-lists.php:52
+#, c-format
msgid "Low Traffic"
msgstr "Laag verkeer"
#: about\index.php:27
+#, c-format
msgid "File Compare"
msgstr "Bestandsvergelijking"
#: support\mailing-lists.php:27
+#, c-format
msgid "This list is only for announcing new releases of WinMerge."
msgstr "Deze lijst is alleen voor het aankondigen van nieuwe releases van WinMerge."
#: 404.php:19
+#, c-format
msgid "<a href=\"%s\">Documentation</a>?"
msgstr "<a href=\"%s\">Documentatie</a>?"
#: engine\page.inc:329
+#, c-format
msgid "WinMerge Translations Instructions"
msgstr "WinMerge vertaalinstructies"
#: downloads\pad-file.php:78
+#, c-format
msgid "Icon"
msgstr "Icoon"
#: support\mailing-lists.php:32
#: support\mailing-lists.php:42
#: support\mailing-lists.php:62
+#, c-format
msgid "Normal Traffic"
msgstr "Normaal verkeer"
@@ -212,192 +254,235 @@
#: downloads\index.php:34
#: downloads\plugins.php:22
#: downloads\source-code.php:18
+#, c-format
msgid "7z-Format (%s MB)"
msgstr "7z-formaat (%s MB)"
#: about\license.php:34
+#, c-format
msgid "GNU General Public License v2.0"
msgstr "GNU General Public License v2.0"
#: about\index.php:71
+#, c-format
msgid "Installation"
msgstr "Installatie"
#: downloads\source-code.php:15
+#, c-format
msgid "WinMerge %s - Source Code"
msgstr "WinMerge %s - Broncode"
#: about\index.php:58
+#, c-format
msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
msgstr "<a href=\"%s\">Online handleiding</a> en geïnstalleerde html-handleiding"
#: engine\page.inc:324
+#, c-format
msgid "WinMerge Tracker Shortcuts"
msgstr "WinMerge tracker-snelkoppelingen"
#: support\tracker-shortcuts.php:10
+#, c-format
msgid "<em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href=\"%1$s\">Tracker</a> items from our <a href=\"%2$s\">SF.net project page</a>."
msgstr "<em>Tracker-koppelingen</em> zijn kortere en leukere URLs om items te <a href=\"%1$s\">tracken</a> van onze <a href=\"%2$s\">SF.net projectpagina</a>."
#: downloads\pad-file.php:10
+#, c-format
msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href=\"%s\">Portable Application Description</a> file, which you find here:"
msgstr "De gemakkelijkste manier om informatie te krijgen over de laatste stabiele versie van WinMerge voor uw website is het <a href=\"%s\">Portable Application Description</a>-bestand, dat u hier terugvindt:"
#: support\tracker-shortcuts.php:14
+#, c-format
msgid "Patch"
msgstr "Patch"
#: support\mailing-lists.php:5
+#, c-format
msgid "Subscribe or unsubscribe to one of the following mailing lists: Announce, Support, User, Translate, Development and SVN"
msgstr "Inschrijven of uitschrijven op een van de volgende maillijsten: Announce, Support, User, Translate, Development en SVN"
#: about\screenshots\index.php:20
+#, c-format
msgid "Folder compare shows all files and subfolders found from compared folders as list. Folder compare allows synchronising folders by copying and deleting files and subfolders. Folder compare view can be versatile customised."
msgstr "Mapvergelijking toont alle bestanden en submappen gevonden van vergeleken mappen als lijst. Mapvergelijken laat toe om mappen te synchroniseren door submappen en bestanden te kopiëren en verwijderen. De mapvergelijkingsweergave kan veelzijdig aangepast worden."
#: engine\page.inc:276
#: engine\page.inc:320
+#, c-format
msgid "WinMerge Support"
msgstr "WinMerge ondersteuning"
#: support\index.php:17
+#, c-format
msgid "We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more information."
msgstr "We vereisen registratie omdat anonieme inzendingen veel spam veroorzaakten, en ook omdat er geen mogelijkheid was om mensen te contacteren om meer informatie te vragen."
#: engine\page.inc:322
#: support\mailing-lists.php:7
#: support\mailing-lists.php:9
+#, c-format
msgid "Mailing Lists"
msgstr "Maillijsten"
#: about\index.php:41
+#, c-format
msgid "Compares one folder or includes all subfolders"
msgstr "Vergelijkt een map of met eventueel alle submappen"
#: 404.php:12
+#, c-format
msgid "For some reason (mis-typed URL, faulty referral from another site, out-of-date search engine listing or we simply deleted a file) the page you were looking for could not be found."
msgstr "Om een of andere reden (verkeerd getypte URL, foute referentie vanaf een andere site, verouderde zoekmachine-lijst of doordat we gewoon een bestand gewist hebben) kon de pagina waar u naar zocht niet gevonden worden."
#: index.php:19
#: about\index.php:11
+#, c-format
msgid "WinMerge is an <a href=\"%s\">Open Source</a> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
msgstr "WinMerge is een <a href=\"%s\">Open Source</a> vergelijkings- en samenvoegingstool voor Windows. WinMerge kan mappen en bestanden vergelijken, verschillen voorstellend in een visueel tekstformaat dat gemakkelijk te begrijpen en behandelen is."
#: support\index.php:18
+#, c-format
msgid "We rarely sent direct emails but you will get notifications when we ask questions in the bug item."
msgstr "We verzenden sporadisch directe e-mails maar u zal berichten krijgen wanneer we vragen stellen in het bug-item."
#: downloads\index.php:25
#: downloads\plugins.php:20
+#, c-format
msgid "Binaries"
msgstr "Binaries"
#: docs\releasenotes.php:11
+#, c-format
msgid "The release notes are currently not available..."
msgstr "De vrijgave-opmerkingen zijn op dit moment niet beschikbaar..."
#: engine\page.inc:309
+#, c-format
msgid "WinMerge Known Issues"
msgstr "WinMerge gekende problemen"
#: about\index.php:76
+#, c-format
msgid "Using WinMerge"
msgstr "WinMerge gebruiken"
#: downloads\index.php:53
+#, c-format
msgid "You can also download additional <a href=\"%1$s\">plugins</a> and the whole <a href=\"%2$s\">source code</a> from WinMerge."
msgstr "U kan ook bijkomende <a href=\"%1$s\">plugins</a> downloaden en de hele <a href=\"%2$s\">broncode</a> van WinMerge."
#: support\mailing-lists.php:57
+#, c-format
msgid "This list is used for coordinating the translations."
msgstr "Deze lijst wordt gebruikt om de vertalingen te coördineren."
#: links.php:6
#: about\license.php:30
#: engine\page.inc:295
+#, c-format
msgid "Links"
msgstr "Links"
#: index.php:49
+#, c-format
msgid "The WinMerge Development Team"
msgstr "Het WinMerge-ontwikkelingsteam"
#: support\tracker-shortcuts.php:15
+#, c-format
msgid "Support Request"
msgstr "Ondersteuningsaanvraag"
#: links.php:18
#, c-format
msgid "<b>External diff Tool</b> is an <a href=\"%s\">Eclipse</a> Plugin</a> that allows the launch of WinMerge (or an other external diff tool) for file compares rather than the default built-in Eclipse diff tool."
-msgstr ""
+msgstr "<b>Externe vergelijkingstool</b> is een <a href=\"%s\">Eclipse</a>-plugin</a> die toestaat dat WinMerge (of een andere externe vergelijkingstoepassing) gebruikt wordt voor bestandsvergelijking in plaats van de standaard ingebouwde Eclipse vergelijkingstoepassing."
#: links.php:22
#, c-format
msgid "<b>Frhed</b> is an binary file editor for Windows. It is small but has many advanced features like ability to load big files partially."
-msgstr ""
+msgstr "<b>Frhed</b> is een binaire bestandseditor voor Windows. Hij is klein maar heeft veel geavanceerde functies zoals de mogelijkheid om grote bestanden gedeeltelijk te laden."
#: support\tracker-shortcuts.php:16
+#, c-format
msgid "Feature Request"
msgstr "Functie-aanvraag"
#: support\index.php:11
+#, c-format
msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
msgstr "Het <a href=\"%s\">Open Discussion forum</a> is de snelste manier om hulp te krijgen. Wees geduldig, het kan even duren voordat iemand antwoordt."
#: about\index.php:31
+#, c-format
msgid "Highlights differences inside lines"
msgstr "Markeert verschillen binnen regels"
#: 404.php:28
+#, c-format
msgid "<a href=\"%s\">Translations</a>?"
msgstr "<a href=\"%s\">Vertalingen</a>?"
#: translations\translations.inc:38
+#, c-format
msgid "File not valid."
msgstr "Bestand niet geldig."
#: about\screenshots\index.php:6
+#, c-format
msgid "WinMerge, screenshots, file comparison, open-dialog, folder comparison results, highlight line diff, location pane, splash screen"
msgstr "WinMerge, screenshots, bestandsvergelijking, open-dialoog, mapvergelijkingsresultaten, regelverschil markeren, locatievenster, splashvenster"
#: downloads\pad-file.php:72
+#, c-format
msgid "Web Addresses"
msgstr "Web-adressen"
#: engine\page.inc:330
+#, c-format
msgid "WinMerge Translations Status (Stable Branch)"
msgstr "WinMerge vertaalstatus (stabiele branch)"
#: about\index.php:74
+#, c-format
msgid "For more information, please see the <a href=\"%1$s\">Installation section</a> of the <a href=\"%2$s\">Manual</a>."
msgstr "Voor meer informatie, gelieve de <a href=\"%1$s\">installatie-sectie</a> van de <a href=\"%2$s\">handleiding</a> te lezen."
#: about\index.php:32
+#, c-format
msgid "Difference pane shows current difference in two vertical panes"
msgstr "Verschilpaneel toont het huidige verschil in twee verticale panelen"
#: engine\page.inc:329
+#, c-format
msgid "Instructions"
msgstr "Instructies"
#: index.php:27
+#, c-format
msgid "<a href=\"%1$s\">WinMerge %2$s</a> is the latest stable version, and is recommended for most users."
-msgstr "<a·href=\"%1$s\">WinMerge·%2$s</a>·is·de laatste stabiele versie, en wordt aangeraden voor de meeste gebruikers."
+msgstr "<a href=\"%1$s\">WinMerge %2$s</a> is de laatste stabiele versie, en wordt aangeraden voor de meeste gebruikers."
#: index.php:48
+#, c-format
msgid "In addition, WinMerge is translated into a number of different languages. See our <a href=\"%s\">information on translating WinMerge</a> into your own language."
msgstr "Daarnaast is WinMerge vertaald in een aantal verschillende talen. Zie onze <a href=\"%s\">informatie over het vertalen van WinMerge</a> in uw eigen taal."
#: engine\engine.inc:19
#: translations\index.php:24
+#, c-format
msgid "English"
msgstr "Engels"
#: support\index.php:19
+#, c-format
msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
msgstr "Wenslijst-items op de <a href=\"%s\">functie-aanvragenlijst</a> zullen ook in overweging genomen worden, maar we maken absoluut geen beloften."
#: engine\engine.inc:24
+#, c-format
msgid "Swedish"
msgstr "Zweeds"
@@ -406,50 +491,56 @@
#: engine\page.inc:305
#: engine\page.inc:320
#: engine\page.inc:328
+#, c-format
msgid "Index"
msgstr "Index"
#: downloads\plugins.php:10
+#, c-format
msgid "7-Zip Plugin"
msgstr "7-Zip plugin"
#: index.php:20
+#, c-format
msgid "<a href=\"%1$s\">Learn More</a> or <a href=\"%2$s\">Download Now!</a>"
-msgstr "<a·href=\"%1$s\">Meer informatie</a>·of·<a·href=\"%2$s\">nu downloaden!</a>"
+msgstr "<a href=\"%1$s\">Meer informatie</a> of <a href=\"%2$s\">nu downloaden!</a>"
#: translations\index.php:11
+#, c-format
msgid "We currently have WinMerge translated into the languages listed below:"
msgstr "WinMerge wordt op dit moment vertaald in de talen die hieronder weergegeven worden:"
-#: translations\index.php:33
-msgid "You can find a more technical view about the <a href=\"%1$s\">translation system</a> in our <a href=\"%2$s\">Development Wiki</a>."
-msgstr "U kan meer technische informatie vinden over het <a href=\"%1$s\">vertaalsysteem<a> in onze <a href=\"%2$s\">Ontwikkelingswiki</a>."
-
#: translations\translations.inc:131
#: translations\translations.inc:288
#: translations\translations_branch.inc:66
#: translations\translations_branch.inc:182
+#, c-format
msgid "Language"
msgstr "Taal"
#: support\mailing-lists.php:12
#: support\mailing-lists.php:20
+#, c-format
msgid "Announce List"
msgstr "Aankondigingslijst"
#: engine\page.inc:331
+#, c-format
msgid "Status (Unstable Trunk)"
msgstr "Status (onstabiele trunk)"
#: engine\page.inc:275
+#, c-format
msgid "WinMerge Downloads"
msgstr "WinMerge downloads"
#: downloads\index.php:70
+#, c-format
msgid "Japanese WinMerge Version"
msgstr "Japanse WinMerge-versie"
#: engine\page.inc:323
+#, c-format
msgid "Tracker"
msgstr "Tracker"
@@ -458,107 +549,127 @@
#: docs\changelog.php:8
#: docs\index.php:16
#: engine\page.inc:310
+#, c-format
msgid "Change Log"
msgstr "Lijst met aanpassingen"
#: support\tracker-shortcuts.php:13
+#, c-format
msgid "Bug"
msgstr "Bug"
#: links.php:43
#: downloads\index.php:69
+#, c-format
msgid "WinMerge Portable"
msgstr "WinMerge portable"
#: translations\translations.inc:83
#: translations\translations_branch.inc:51
+#, c-format
msgid "Fuzzy: %d%%"
msgstr "Fuzzy: %d%%"
#: docs\changelog.php:5
+#, c-format
msgid "The change log is a more complete list of changes in the last WinMerge releases."
msgstr "De aanpassingslog is een meer complete lijst van aanpassingen in de laatste releases van WinMerge."
#: 404.php:15
+#, c-format
msgid "Were you looking for..."
msgstr "Was u op zoek naar..."
#: about\index.php:19
+#, c-format
msgid "General"
msgstr "Algemeen"
#: downloads\pad-file.php:48
+#, c-format
msgid "Type"
msgstr "Type"
#: links.php:40
#, c-format
msgid "Reviews of popular comparison software. [<a href=\"%s\">WinMerge Review</a>]"
-msgstr ""
+msgstr "Reviews van populaire vergelijkingssoftware. [<a href=\"%s\">WinMerge Review</a>]"
#: engine\page.inc:311
+#, c-format
msgid "WinMerge Development Wiki"
msgstr "WinMerge ontwikkelingswiki"
#: downloads\index.php:15
+#, c-format
msgid "The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>."
msgstr "De huidige WinMerge-versie is <strong>%1$s</strong> en werd vrijgegeven op <strong>%2$s</strong>."
#: about\index.php:21
+#, c-format
msgid "Supports Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
msgstr "Ondersteunt Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
#: 404.php:22
+#, c-format
msgid "<a href=\"%s\">Release Notes</a>?"
msgstr "<a href=\"%s\">Vrijgave-opmerkingen</a>?"
#: engine\page.inc:307
#, c-format
msgid "WinMerge Quick Tour"
-msgstr ""
+msgstr "WinMerge rondleiding"
#: 404.php:11
+#, c-format
msgid "Page Not Found..."
msgstr "Pagina niet gevonden..."
#: links.php:29
#, c-format
msgid "Good HOWTO document for regular expressions"
-msgstr ""
+msgstr "Goed HOWTO-document voor reguliere expressies"
#: index.php:16
+#, c-format
msgid "More Screenshots…"
msgstr "Meer screenshots…"
#: about\index.php:48
+#, c-format
msgid "Resolve conflict files"
msgstr "Conflictbestanden oplossen"
#: engine\page.inc:275
+#, c-format
msgid "Downloads"
msgstr "Downloads"
#: engine\page.inc:277
#: translations\index.php:8
#: translations\index.php:10
+#, c-format
msgid "Translations"
msgstr "Vertalingen"
#: links.php:35
#, c-format
msgid "Miscellaneous"
-msgstr ""
+msgstr "Allerlei"
#: support\index.php:38
+#, c-format
msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
msgstr "Omdat WinMerge een <a href=\"%s\">Open Source</a>-project is, mag u het gratis gebruiken."
#: translations\translations.inc:81
#: translations\translations_branch.inc:49
+#, c-format
msgid "Translated: %d%%"
msgstr "Vertaald: %d%%"
#: engine\page.inc:296
+#, c-format
msgid "Project Page"
msgstr "Projectpagina"
@@ -566,31 +677,38 @@
#: about\index.php:10
#: engine\page.inc:273
#: engine\page.inc:299
+#, c-format
msgid "About WinMerge"
msgstr "Over WinMerge"
#: engine\page.inc:277
#: engine\page.inc:328
+#, c-format
msgid "WinMerge Translations"
msgstr "WinMerge vertalingen"
#: downloads\pad-file.php:6
+#, c-format
msgid "WinMerge, PAD file, Portable Application Description"
msgstr "WinMerge, PAD-bestand, Portable Application Description"
#: downloads\pad-file.php:40
+#, c-format
msgid "Release Status"
msgstr "Vrijgave-status"
#: engine\page.inc:323
+#, c-format
msgid "WinMerge Tracker"
msgstr "WinMerge tracker"
#: support\mailing-lists.php:47
+#, c-format
msgid "This list is for user related questions. Having questions posted to this list may allow others having the same problem to solve it on their own."
msgstr "Deze lijst is voor gebruikersgerelateerde vragen. Vragen die in deze lijst gesteld worden kunnen anderen met hetzelfde probleem toestaan om het zelf op te lossen."
#: downloads\index.php:7
+#, c-format
msgid "Download the current WinMerge version %1$s, which was released at %2$s. For detailed info on what is new, read the change log and the release notes."
msgstr "Download de huidige WinMerge-versie %1$s, die uitgebracht werd op %2$s. Voor gedetailleerde informatie over wat nieuw is, kan u de lijst van aanpassingen en vrijgave-opmerkingen lezen."
@@ -598,208 +716,249 @@
#: engine\page.inc:307
#, c-format
msgid "Quick Tour"
-msgstr ""
+msgstr "Rondleiding"
#: translations\index.php:29
+#, c-format
msgid "To change language, select the desired language from the <span class=\"guimenu\">View</span>→ <span class=\"guimenuitem\">Language</span> menu choice."
-msgstr "Om de taal aan te passen selecteert u de gewenste taal van de <span class=\"guimenu\">Beeld</span>→ <span class=\"guimenuitem\">Taal</span> menukeuze."
+msgstr "Om de taal aan te passen selecteert u de gewenste taal van de <span class=\"guimenu\">Beeld</span> → <span class=\"guimenuitem\">Taal</span> menukeuze."
#: translations\translations.inc:136
#: translations\translations_branch.inc:71
+#, c-format
msgid "Last Update"
msgstr "Laatste update"
#: engine\page.inc:316
+#, c-format
msgid "Source Code"
msgstr "Broncode"
#: about\screenshots\index.php:21
#: about\screenshots\index.php:22
+#, c-format
msgid "Folder Compare Tree View"
msgstr "Boomweergave mapvergelijking"
#: downloads\index.php:27
#: downloads\index.php:33
#: downloads\source-code.php:17
+#, c-format
msgid "Zip-Format (%s MB)"
-msgstr "Zip-Formaat (%s MB)"
+msgstr "Zip-formaat (%s MB)"
#: support\tracker-shortcuts.php:5
+#, c-format
msgid "Tracker Shortcuts are shorter and nicer URLs to Tracker items from our SF.net project page. And you can use this page to create a shortcut."
msgstr "Trackerkoppelingen zijn kortere en leukere URL's naar tracker-items van onze SF.net projectpagina. U kan deze pagina gebruiken om een koppeling aan te maken."
#: support\tracker-shortcuts.php:18
+#, c-format
msgid "Tracker Item"
msgstr "Tracker-item"
#: links.php:24
#, c-format
msgid "Regular expressions"
-msgstr ""
+msgstr "Reguliere expressies"
#: translations\translations_branch.inc:183
+#, c-format
msgid "Translator(s)"
msgstr "Vertaler(s)"
#: 404.php:21
+#, c-format
msgid "<a href=\"%s\">Manual</a>?"
msgstr "<a href=\"%s\">Handleiding</a>?"
#: docs\index.php:7
#: docs\index.php:9
#: engine\page.inc:274
+#, c-format
msgid "Documentation"
msgstr "Documentatie"
#: about\history.php:19
#: docs\index.php:10
#: engine\page.inc:306
+#, c-format
msgid "Manual"
msgstr "Handleiding"
#: index.php:8
#: index.php:30
+#, c-format
msgid "Project News"
msgstr "Projectnieuws"
#: links.php:20
#, c-format
msgid "<b>TortoiseSVN</b> lets you work with files under <em>Subversion</em> version control directly from Windows Explorer."
-msgstr ""
+msgstr "<b>TortoiseSVN</b> laat u werken met bestanden onder <em>Subversion</em> versiebeheer direct vanuit Windows Verkenner."
#: about\license.php:6
+#, c-format
msgid "WinMerge, license, open source, GNU General Public License, GPL, free software"
msgstr "WinMerge, licentie, open source, GNU General Public License, GPL, vrije software"
#: downloads\pad-file.php:94
+#, c-format
msgid "Contact"
msgstr "Contact"
#: downloads\index.php:40
#: downloads\source-code.php:24
+#, c-format
msgid "SHA-1 Checksums"
msgstr "SHA-1-checksums"
#: engine\page.inc:242
+#, c-format
msgid "Version %1$s; %2$s MB"
msgstr "Versie %1$s; %2$s MB"
#: links.php:42
#, c-format
msgid "Inside informations, unreleased products and articles on various soon-to-be-released software titles."
-msgstr ""
+msgstr "Inside-informatie, niet-vrijgegeven producten en artikels over verschillende programma's die binnenkort uitkomen."
#: support\tracker-shortcuts.php:23
+#, c-format
msgid "Type:"
msgstr "Type:"
#: support\tracker-shortcuts.php:6
+#, c-format
msgid "WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item"
msgstr "WinMerge, tracker, koppelingen, sourceforge, projectpagina, bug, patch, ondersteuningsaanvraag, functie-aanvraag, item te doen"
#: links.php:38
#, c-format
msgid "Map the open source world by collecting objective information on open source projects. [<a href=\"%s\">WinMerge Report</a>]"
-msgstr ""
+msgstr "Arrangeer de open source wereld door objectieve informatie over open source projecten te verzamelen. [<a href=\"%s\">WinMerge-rapport</a>]"
#: downloads\plugins.php:32
+#, c-format
msgid "For more details and the download go to the <a href=\"%s\">xdocdiff plugin homepage</a>."
msgstr "Voor meer details en de download, ga naar de <a href=\"%s\">homepage van de xdocdiff-plugin</a>."
#: translations\index.php:39
+#, c-format
msgid "Stable Version (Branch)"
msgstr "Stabiele versie (Branch)"
#: translations\translations_branch.inc:104
+#, c-format
msgid "English (Template)"
msgstr "Engels (Template)"
#: engine\page.inc:295
+#, c-format
msgid "WinMerge Links"
msgstr "WinMerge links"
#: about\screenshots\index.php:29
+#, c-format
msgid "Location pane is a handy side-pane showing a overall (difference) map of files compared."
msgstr "Het locatievenster is een handig zij-venster dat de globale (verschil)-map weergeeft van de vergeleken bestanden."
#: docs\index.php:5
+#, c-format
msgid "Documentation from WinMerge like manual, release notes, change log and Development Wiki."
msgstr "Documentatie van WinMerge zoals handleiding, vrijgave-opmerkingen, lijst van aanpassingen en ontwikkelingswiki."
#: docs\index.php:17
+#, c-format
msgid "The <a href=\"%s\">change log</a> is a more complete list of changes in the last WinMerge releases."
msgstr "De <a href=\"%s\">aanpassingslog</a> is een meer complete lijst van aanpassingen in de laatste releases van WinMerge."
#: engine\page.inc:315
+#, c-format
msgid "Download WinMerge Plugins"
msgstr "WinMerge-plugins downloaden"
#: engine\page.inc:331
+#, c-format
msgid "WinMerge Translations Status (Unstable Trunk)"
-msgstr "WinMerge vertaalstatus (instabiele trunk)"
+msgstr "WinMerge vertaalstatus (onstabiele trunk)"
#: docs\index.php:19
+#, c-format
msgid "The <a href=\"%s\">Development Wiki</a> contains much information about the WinMerge development."
msgstr "De <a href=\"%s\">ontwikkelingswiki</a> bevat veel informatie over de ontwikkeling van WinMerge."
#: downloads\index.php:16
+#, c-format
msgid "For detailed info on what is new, read the <a href=\"%1$s\">change log</a> and the <a href=\"%2$s\">release notes</a>."
msgstr "Voor gedetailleerde informatie over wat nieuw is, lees de <a href=\"%1$s\">lijst van aanpassingen</a> en de <a href=\"%2$s\">vrijgave-opmerkingen</a>."
#: support\mailing-lists.php:77
+#, c-format
msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
msgstr "Abonnees van deze lijst krijgen berichten van elke codeverandering die toegepast wordt op Subversion."
#: links.php:44
#, c-format
msgid "This is WinMerge packaged with a PortableApps.com Launcher as a <a href=\"%s\">portable app</a>, so you can compare files on the go."
-msgstr ""
+msgstr "Dit is WinMerge samengevoegd met een PortableApps.com Launcher als een <a href=\"%s\">portable app</a>, zodat u bestanden kan vergelijken zonder dat het programma geïnstalleerd hoeft te worden."
#: index.php:47
+#, c-format
msgid "If you are interested in contributing work to the project, see our <a href=\"%s\">developer page</a> for further information on how you may contribute."
msgstr "Als u geïnteresseerd bent in het bijdragen van werk aan het project, zie onze <a href=\"%s\">pagina van ontwikkelaars</a> voor verdere informatie over hoe u kan bijdragen."
#: downloads\plugins.php:7
#: downloads\plugins.php:9
+#, c-format
msgid "Download Plugins"
msgstr "Plugins downloaden"
#: downloads\pad-file.php:58
#: downloads\pad-file.php:60
#: downloads\pad-file.php:62
+#, c-format
msgid "English Description (%d chars)"
msgstr "Engelse beschrijving (%d tekens)"
#: about\index.php:29
+#, c-format
msgid "Visual differencing and merging of text files"
msgstr "Visueel zien van verschillen en samenvoegen van tekstbestanden"
#: engine\page.inc:296
+#, c-format
msgid "WinMerge Project Page"
msgstr "WinMerge projectpagina"
#: downloads\index.php:60
+#, c-format
msgid "Admin rights for the installer"
msgstr "Administratorrechten voor het installatiebestand"
#: downloads\plugins.php:28
+#, c-format
msgid "You can also read the <a href=\"%1$s\">Release Notes</a> or search for <a href=\"%2$s\">other versions</a>."
msgstr "U kan ook de <a href=\"%1$s\">vrijgave-opmerkingen</a> lezen of zoeken naar <a href=\"%2$s\">andere versies</a>."
#: engine\page.inc:300
+#, c-format
msgid "WinMerge Screenshots"
msgstr "WinMerge screenshots"
#: downloads\pad-file.php:42
+#, c-format
msgid "Download"
msgstr "Downloaden"
#: downloads\index.php:20
#: downloads\plugins.php:15
+#, c-format
msgid "Installer"
msgstr "Installatiebestand"
#: 404.php:26
+#, c-format
msgid "<a href=\"%s\">Downloads</a>?"
msgstr "<a href=\"%s\">Downloads</a>?"
@@ -807,44 +966,53 @@
#: about\screenshots\index.php:7
#: about\screenshots\index.php:9
#: engine\page.inc:300
+#, c-format
msgid "Screenshots"
msgstr "Screenshots"
#: links.php:30
#, c-format
msgid "Tutorial"
-msgstr ""
+msgstr "Handleiding"
#: about\index.php:78
+#, c-format
msgid "Here is the current <a href=\"%s\">change log</a>."
msgstr "Hier is de huidige <a href=\"%s\">lijst met wijzigingen</a>."
#: support\tracker-shortcuts.php:11
+#, c-format
msgid "You can use this page to create a shortcut:"
msgstr "U kan deze pagina gebruiken om een snelkoppeling aan te maken:"
#: downloads\pad-file.php:5
+#, c-format
msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the Portable Application Description file, which you find here."
msgstr "De gemakkelijkste manier om informatie te krijgen over de laatste stabiele versie van WinMerge voor uw website is het Portable Application Description-bestand, dat u hier terugvindt."
#: translations\translations.inc:41
+#, c-format
msgid "File not found."
msgstr "Bestand niet gevonden."
#: downloads\index.php:9
#: downloads\index.php:73
+#, c-format
msgid "Project File Releases"
msgstr "Projectbestand-releases"
#: 404.php:9
+#, c-format
msgid "Error 404 (Page Not Found)"
msgstr "Fout 404 (pagina niet gevonden)"
#: downloads\index.php:52
+#, c-format
msgid "The easiest way to install WinMerge is to download and run the Installer. Read the <a href=\"%s\">online manual</a> for help using it."
msgstr "De gemakkelijkste manier om WinMerge te installeren is de installer te downloaden en openen. Lees de <a href=\"%s\">online handleiding</a> voor hulp om hem te gebruiken."
#: about\screenshots\index.php:23
+#, c-format
msgid "In the tree view, folders are expandable and collapsible, containing files and subfolders. This is useful for an easier navigation in deeply nested directory structures. <em>The tree view is available only in recursive compares."
msgstr "In de boomweergave zijn mappen in- en uitklapbaar, en bevatten ze bestanden en submappen. Dit is bruikbaar voor een gemakkelijkere navigatie in diep geneste mapstructuren. <em>De boomweergave is alleen beschikbaar in recursieve vergelijkingen."
@@ -853,18 +1021,22 @@
#: engine\page.inc:276
#: support\index.php:8
#: support\index.php:10
+#, c-format
msgid "Support"
msgstr "Ondersteuning"
#: about\index.php:72
+#, c-format
msgid "Just download the <a href=\"%s\">installer</a> and double-click it."
msgstr "Download gewoon de <a href=\"%s\">installer</a> en dubbelklik erop."
#: downloads\source-code.php:34
+#, c-format
msgid "You can <a href=\"%1$s\">browse the source code</a> with a web browser or you can check out the whole code by clicking on one of the following links (if you have <a href=\"%2$s\">TortoiseSVN</a> installed):"
msgstr "U kan <a href=\"%1$s\">door de broncode surfen</a> met een webbrowser of u kan de hele code nachecken door op een van de volgende links te klikken (als u <a href=\"%2$s\">TortoiseSVN</a> geinstalleerd heeft):"
#: downloads\source-code.php:5
+#, c-format
msgid "Download the source code of WinMerge, which is released under the GNU General Public License."
msgstr "Download de broncode van WinMerge, die vrijgegeven is onder de GNU General Public License."
@@ -874,191 +1046,241 @@
#: translations\translations_branch.inc:49
#: translations\translations_branch.inc:68
#: translations\translations_branch.inc:118
+#, c-format
msgid "Translated"
msgstr "Vertaald"
#: index.php:46
+#, c-format
msgid "WinMerge is an open source project, which means that the program is maintained and developed by volunteers."
msgstr "WinMerge is een open source project, wat betekent dat het programma onderhouden en ontwikkeld wordt door vrijwilligers."
#: about\index.php:24
+#, c-format
msgid "Tabbed interface"
msgstr "Interface met tabs"
#: about\index.php:33
+#, c-format
msgid "Location pane shows map of files compared"
msgstr "Het locatievenster toont een kaart van de vergeleken bestanden"
#: about\screenshots\index.php:17
+#, c-format
msgid "WinMerge allows selecting/opening paths in several ways. Using the Open-dialog is just one of them."
msgstr "WinMerge staat toe om paden op verschillende manieren te selecteren/openen. Een ervan is het gebruiken van het Openen-dialoogvenster."
#: about\index.php:77
+#, c-format
msgid "For information on using WinMerge, see our <a href=\"%s\">online Manual</a>, or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use."
msgstr "Voor informatie over het gebruik van WinMerge, zie onze <a href=\"%s\">online handleiding</a>, of u kan het lokale helpbestand gebruiken (druk op <code>F1</code> binnen Winmerge) voor offline gebruik."
#: about\index.php:73
+#, c-format
msgid "Or you may simply unzip the <a href=\"%s\">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>)."
msgstr "Of u kan gewoon het <a href=\"%s\">zipbestand</a> uitpakken in de gewenste locatie en <code>WinMergeU.exe</code> starten (behalve voor gebruikers van Windows 98/ME, die <code>WinMerge.exe</code> moeten gebruiken)."
#: downloads\pad-file.php:56
+#, c-format
msgid "English Descriptions"
-msgstr "Engels beschrijvingen"
+msgstr "Engelse beschrijvingen"
#: engine\page.inc:325
#: support\index.php:37
+#, c-format
msgid "Donate"
-msgstr "Doneer"
+msgstr "Doneren"
#: about\index.php:45
+#, c-format
msgid "Version Control"
msgstr "Versie-controle"
#: support\index.php:6
+#, c-format
msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
msgstr "Het Open Discussion-forum is de snelste manier om hulp te krijgen. Een andere manier is een inschrijving op de ondersteuningsmaillijst."
#: about\screenshots\index.php:30
#: about\screenshots\index.php:31
+#, c-format
msgid "Splash Screen"
msgstr "Welkomstvenster"
#: about\license.php:33
+#, c-format
msgid "The Open Source Definition"
msgstr "De definitie van Open Source"
#: downloads\pad-file.php:46
+#, c-format
msgid "Supported Languages"
msgstr "Ondersteunde talen"
#: index.php:6
+#, c-format
msgid "WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
msgstr "WinMerge is een Open Source vergelijkings- en samenvoegingstool voor Windows. WinMerge kan mappen en bestanden vergelijken, de verschillen voorstellend in een visueel tekstformaat dat gemakkelijk te begrijpen en behandelen is."
#: downloads\index.php:67
+#, c-format
msgid "Beta Versions"
msgstr "Bèta-versies"
+#: translations\index.php:33
+#, c-format
+msgid "You can find a more technical view about the <a href=\"%1$s\">translation system</a> in our <a href=\"%2$s\">Development Wiki</a>."
+msgstr "U kan meer technische informatie vinden over het <a href=\"%1$s\">vertaalsysteem</a> in onze <a href=\"%2$s\">Ontwikkelingswiki</a>."
+
#: downloads\pad-file.php:76
+#, c-format
msgid "Screenshot"
msgstr "Screenshot"
#: about\index.php:6
+#, c-format
msgid "WinMerge, about, features, file compare, folder compare, version control, screenshots, installation"
msgstr "WinMerge, over, functies, bestandsvergelijking, mapvergelijking, versicontrole, screenshots, installatie"
#: support\mailing-lists.php:15
#: support\mailing-lists.php:50
+#, c-format
msgid "Translate List"
msgstr "Vertaallijst"
#: downloads\index.php:58
+#, c-format
msgid "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
msgstr "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
#: downloads\plugins.php:5
+#, c-format
msgid "Download additional plugins for WinMerge, like the 7-Zip plugin or the xdocdiff Plugin."
msgstr "Extra plugins voor WinMerge downloaden, zoals de 7-Zip plugin of de xdocdiff-plugin."
#: translations\index.php:7
#: translations\status_trunk.php:7
#: translations\status_trunk.php:9
+#, c-format
msgid "Translations Status (Unstable Trunk)"
-msgstr "Vertaalinstructies (instabiele trunk)"
+msgstr "Vertaalstatus (onstabiele trunk)"
#: support\index.php:12
+#, c-format
msgid "A other way is a subscription to the <a href=\"%s\">support mailing list</a>."
msgstr "Een andere manier is een abonnement op de <a href=\"%s\">ondersteuning-mailinglijst </a>."
#: about\screenshots\index.php:5
+#, c-format
msgid "Screenshots from WinMerge features like file comparison, folder comparison results and location pane."
msgstr "Screenshots van WinMerge-functies zoals bestandsvergelijking, mapvergelijkingsresultaten en locatievenster."
#: translations\translations.inc:85
#: translations\translations_branch.inc:53
+#, c-format
msgid "Untranslated: %d%%"
msgstr "Onvertaald: %d%%"
#: index.php:43
+#, c-format
msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
msgstr "Als u ondersteuning nodig heeft, kan u kijken op onze <a href=\"%s\">ondersteuningspagina</a> voor meer informatie over hoe u ondersteuning kan krijgen."
#: engine\page.inc:330
+#, c-format
msgid "Status (Stable Branch)"
msgstr "Status (stabiele branch)"
#: about\index.php:47
+#, c-format
msgid "Creates patch files (Normal-, Context- and Unified formats)"
msgstr "Maakt patch-bestanden (Normal-, context- en Unified-formaten)"
#: translations\instructions.php:9
+#, c-format
msgid "The translations instructions are currently not available..."
msgstr "De vertaalinstructies zijn op dit moment niet beschikbaar..."
#: support\mailing-lists.php:17
#: support\mailing-lists.php:70
+#, c-format
msgid "SVN List"
msgstr "SVN-lijst"
#: downloads\plugins.php:31
+#, c-format
msgid "With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files."
msgstr "Met deze plugin kan u Word-, Excel-, PowerPoint-, PDF- en andere bestanden vergelijken."
#: support\index.php:16
+#, c-format
msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
msgstr "U moet <a href=\"%s\">registreren bij SourceForge.net</a> voordat u een bugrapport kan posten (registratie is gratis)."
#: downloads\source-code.php:6
+#, c-format
msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
msgstr "WinMerge, gratis, download, broncode, GPL, subversie, SVN, TortoiseSVN"
#: docs\releasenotes.php:5
+#, c-format
msgid "The release notes are a short summary of important changes, enhancements, bug fixes and known issues in the current WinMerge release."
msgstr "De vrijgave-opmerkingen zijn een korte opsomming van belangrijke aanpassingen, verbeteringen, bugfixes en gekende problemen in de huidige WinMerge-vrijgave."
#: docs\changelog.php:6
+#, c-format
msgid "WinMerge, change log, changes, release, tracker item, revision number"
msgstr "WinMerge, aanpassingslog, aanpassingen, vrijgave, tracker item, revisienummer"
#: docs\releasenotes.php:6
+#, c-format
msgid "WinMerge, release notes, summary, changes, enhancements, bug fixes, known issues, release"
msgstr "WinMerge, vrijgave-opmerkingen, opsomming, aanpassingen, verbeteringen, bugfixes, gekende problemen, vrijgave"
#: downloads\pad-file.php:14
+#, c-format
msgid "If you can not work with the <a href=\"%s\">PAD file</a>, you can use the following informations:"
msgstr "Als u niet kan werken met het <a href=\"%s\">PAD-bestand</a>, kan u de volgende toelichtingen gebruiken:"
#: about\index.php:57
+#, c-format
msgid "Localizable interface"
msgstr "Interface met aanpasbare taal"
#: about\index.php:56
+#, c-format
msgid "Plugin support"
msgstr "Plugin-ondersteuning"
#: about\index.php:54
+#, c-format
msgid "Shell Integration (supports 64-bit Windows versions)"
msgstr "Shell-integratie (ondersteunt 64-bit Windowsversies)"
#: about\index.php:55
+#, c-format
msgid "Archive file support using 7-Zip"
msgstr "Archiefbestand-ondersteuning met behulp van 7-Zip"
#: translations\index.php:6
#: translations\status_branch.php:7
#: translations\status_branch.php:10
+#, c-format
msgid "Translations Status (Stable Branch)"
-msgstr "Vertaalinstructies (stabiele branch)"
+msgstr "Vertaalstatus (stabiele branch)"
#: support\index.php:21
+#, c-format
msgid "Tracker Statistics"
msgstr "Tracker-statistieken"
#: downloads\pad-file.php:64
+#, c-format
msgid "English Keywords"
msgstr "Engelse trefwoorden"
#: engine\page.inc:316
+#, c-format
msgid "Download WinMerge Source Code"
msgstr "Broncode van WinMerge downloaden"
@@ -1066,25 +1288,29 @@
#: downloads\pad-file.php:9
#: downloads\pad-file.php:80
#: engine\page.inc:317
+#, c-format
msgid "PAD File"
msgstr "PAD-bestand"
#: downloads\index.php:13
#: downloads\source-code.php:39
+#, c-format
msgid "WinMerge %s"
msgstr "WinMerge %s"
#: translations\status_branch.php:14
#: translations\translations.inc:285
+#, c-format
msgid "Translators"
msgstr "Vertalers"
#: links.php:28
#, c-format
msgid "regex HOWTO"
-msgstr ""
+msgstr "regex HOWTO"
#: about\license.php:10
+#, c-format
msgid ""
"This means everybody can download the <a href=\"%s\">source code</a> and improve and modify it.\n"
"The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
@@ -1093,28 +1319,34 @@
"Het enige dat we vragen is dat mensen hun verbeteringen en aanpassingen terug naar ons sturen zodat alle WinMerge-gebruikers er voordeel van hebben."
#: about\history.php:5
+#, c-format
msgid "History of WinMerge releases with version numbers, release dates and manuals."
msgstr "Geschiedenis van WinMerge releases met versienummers, vrijgavedatums en handleidingen."
#: downloads\plugins.php:11
+#, c-format
msgid "This is the 7-Zip plugin for WinMerge and the current version <strong>%1$s</strong> was released at <strong>%2$s</strong>."
msgstr "Dit is de 7-Zip-plugin voor WinMerge en de huidige versie <strong>%1$s</strong> werd vrijgegeven op <strong>%2$s</strong>."
#: 404.php:23
+#, c-format
msgid "<a href=\"%s\">Change Log</a>?"
msgstr "<a href=\"%s\">Lijst van aanpassingen</a>?"
#: about\history.php:7
#: about\history.php:9
#: engine\page.inc:301
+#, c-format
msgid "History"
msgstr "Geschiedenis"
#: support\tracker-shortcuts.php:41
+#, c-format
msgid "ID:"
msgstr "ID:"
#: about\index.php:15
+#, c-format
msgid "Features"
msgstr "Functies"
@@ -1124,99 +1356,119 @@
#: support\mailing-lists.php:55
#: support\mailing-lists.php:65
#: support\mailing-lists.php:75
+#, c-format
msgid "Archive"
msgstr "Archief"
#: engine\engine.inc:20
+#, c-format
msgid "German"
msgstr "Duits"
#: support\index.php:14
+#, c-format
msgid "Please attach as much information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can display by clicking <span class=\"guimenu\">Help</span> → <span class=\"guimenuitem\">Configuration</span> in the WinMerge window."
msgstr "Gelieve zoveel mogelijk informatie bij te voegen: minimum het versienummer van de WinMerge-versie die u gebruikt. Voeg indien mogelijk ook een configuratielog bij, die u kan verkrijgen door te klikken op <span class=\"guimenu\">Help</span> → <span class=\"guimenuitem\">Configuratie</span> in het WinMerge-venster."
#: engine\page.inc:272
#: engine\page.inc:294
+#, c-format
msgid "WinMerge Home"
msgstr "WinMerge home"
#: links.php:33
#, c-format
msgid "PDF quick reference"
-msgstr ""
+msgstr "PDF snelgids"
#: docs\index.php:11
+#, c-format
msgid "The <a href=\"%s\">manual</a> explains how to use WinMerge, and documents its capabilities and limitations."
msgstr "De <a href=\"%s\">handleiding</a> legt uit hoe WinMerge gebruikt wordt, en documenteert zijn mogelijkheden en limitaties."
#: engine\page.inc:314
+#, c-format
msgid "WinMerge"
msgstr "WinMerge"
#: downloads\plugins.php:30
+#, c-format
msgid "xdocdiff Plugin"
msgstr "xdocdiff-plugin"
#: support\tracker-shortcuts.php:17
+#, c-format
msgid "Todo Item"
msgstr "Item te doen"
#: support\mailing-lists.php:67
+#, c-format
msgid "This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc."
msgstr "Dit is de lijst waar deelnemende ontwikkelaars van de WinMerge elkaar ontmoeten en problemen, code-aanpassingen en -toevoegingen bespreken, enzovoort."
#: downloads\index.php:22
#: downloads\plugins.php:17
+#, c-format
msgid "Exe-Format (%s MB)"
msgstr "Exe-formaat (%s MB)"
#: engine\page.inc:315
+#, c-format
msgid "Plugins"
msgstr "Plugins"
#: support\mailing-lists.php:6
+#, c-format
msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
msgstr "WinMerge, mailing lists, aankondiging, ondersteuning, gebruiker, vertalen, ontwikkeling, SVN"
#: about\index.php:67
#: about\screenshots\index.php:18
#: about\screenshots\index.php:19
+#, c-format
msgid "Folder Comparison Results"
msgstr "Mapvergelijkingsresultaten"
#: support\tracker-shortcuts.php:37
+#, c-format
msgid "Generate"
msgstr "Genereren"
#: about\index.php:23
+#, c-format
msgid "Unicode support"
msgstr "Unicode-ondersteuning"
#: support\index.php:39
+#, c-format
msgid "But please consider making a <a href=\"%s\">donation</a> to support the continued development of WinMerge."
msgstr "Gelieve te overwegen om een <a href=\"%s\">donatie</a> te maken om de voortgezette ontwikkeling van Winmerge te ondersteunen."
#: downloads\pad-file.php:74
+#, c-format
msgid "Information"
msgstr "Informatie"
#: engine\page.inc:274
#: engine\page.inc:305
+#, c-format
msgid "WinMerge Documentation"
msgstr "WinMerge documentatie"
#: downloads\source-code.php:11
+#, c-format
msgid "WinMerge is released under the <a href=\"%s\">GNU General Public License</a>. That means you can get the whole source code and can build the program yourself."
msgstr "WinMerge is vrijgegeven onder de <a href=\"%s\">GNU General Public License</a>. Dat betekent dat u de hele broncode kan verkrijgen en het programma zelf kan compileren."
#: about\index.php:40
+#, c-format
msgid "Fast compare using file sizes and dates"
msgstr "Snel vergelijken door middel van bestandsgroottes en datums"
#: docs\index.php:6
#, c-format
msgid "WinMerge, documentation, manual, quick tour, release notes, known issues, change log, Development Wiki"
-msgstr ""
+msgstr "WinMerge, documentatie, handleiding, rondleiding, vrijgave-opmerkingen, gekende problemen, aanpassingslog, ontwikkelingswiki"
#: support\mailing-lists.php:24
#: support\mailing-lists.php:34
@@ -1224,14 +1476,17 @@
#: support\mailing-lists.php:54
#: support\mailing-lists.php:64
#: support\mailing-lists.php:74
+#, c-format
msgid "Unsubscribe"
msgstr "Uitschrijven"
#: about\license.php:14
+#, c-format
msgid "GNU General Public License"
msgstr "GNU General Public License"
#: docs\index.php:15
+#, c-format
msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
msgstr "De <a href=\"%1$s\">vrijgave-opmerkingen</a> zijn een korte opsomming van belangrijke aanpassingen, verbeteringen, bugfixes en <a href=\"%2$s\">gekende problemen</a> in de huidige release van WinMerge."
@@ -1241,11 +1496,13 @@
#: translations\translations_branch.inc:53
#: translations\translations_branch.inc:70
#: translations\translations_branch.inc:120
+#, c-format
msgid "Untranslated"
msgstr "Onvertaald"
#: about\screenshots\index.php:24
#: about\screenshots\index.php:25
+#, c-format
msgid "Highlight Line Diff"
msgstr "Regelverschil markeren"
@@ -1253,52 +1510,63 @@
#: about\index.php:66
#: about\screenshots\index.php:12
#: about\screenshots\index.php:13
+#, c-format
msgid "File Comparison"
msgstr "Bestandsvergelijking"
#: engine\page.inc:272
+#, c-format
msgid "Home"
msgstr "Home"
#: support\mailing-lists.php:37
+#, c-format
msgid "You should ask all your support questions on this list."
msgstr "U kan al uw ondersteuningsvragen stellen op deze lijst."
#: about\index.php:52
+#, c-format
msgid "Other"
msgstr "Andere"
#: support\mailing-lists.php:14
#: support\mailing-lists.php:40
+#, c-format
msgid "User List"
msgstr "Lijst van gebruikers"
#: 404.php:27
+#, c-format
msgid "<a href=\"%s\">Support</a>?"
msgstr "<a href=\"%s\">Ondersteuning</a>?"
#: engine\engine.inc:23
+#, c-format
msgid "Dutch"
msgstr "Nederlands"
#: links.php:7
#, c-format
msgid "Here is a collection of links to tools and reference material that we find is generally useful when you work with WinMerge."
-msgstr ""
+msgstr "Hier is een collectie van links naar tools en referentiemateriaal waarvan we vinden dat het algemeen nuttig is wanneer u met WinMerge werkt."
#: support\index.php:7
+#, c-format
msgid "WinMerge, support, discussion forums, mailing lists, tracker, donate, bugs, support requests, patches, feature requests, todo, open source, sourceforge.net"
msgstr "WinMerge, ondersteuning, discussieforums, maillijsten, tracker, doneren, bugs, ondersteuningsaanvragen, patches, functie-aanvragen,te doen, open source, sourceforge.net"
#: downloads\index.php:31
+#, c-format
msgid "Runtimes"
msgstr "Runtimes"
#: translations\index.php:37
+#, c-format
msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
msgstr "De volgende twee pagina's geven informatie over de vertaalstatus van de stabiele versie en ontwikkelingsversie van WinMerge:"
#: about\index.php:49
+#, c-format
msgid "Rudimentary Visual SourceSafe and Rational ClearCase integration"
msgstr "Rudimentaire Visual SourceSafe en Rational ClearCase integratie"
@@ -1308,112 +1576,143 @@
#: translations\translations_branch.inc:51
#: translations\translations_branch.inc:69
#: translations\translations_branch.inc:119
+#, c-format
msgid "Fuzzy"
msgstr "Fuzzy"
#: translations\translations.inc:180
#: translations\translations_branch.inc:106
+#, c-format
msgid "Total: %d"
msgstr "Totaal: %d"
#: downloads\index.php:8
+#, c-format
msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
msgstr "WinMerge, gratis, download, Windows, setup, installer, installatiebestanden, runtimes, stabiel, beta, experimenteel, portable"
#: 404.php:18
+#, c-format
msgid "<a href=\"%s\">Screenshots</a>?"
msgstr "<a href=\"%s\">Screenshots</a>?"
#: docs\index.php:18
#: engine\page.inc:311
+#, c-format
msgid "Development Wiki"
msgstr "Ontwikkelingswiki"
#: translations\translations.inc:182
+#, c-format
msgid "Total: Unknown"
msgstr "Totaal: onbekend"
#: about\index.php:69
+#, c-format
msgid "See the <a href=\"%s\">screenshots page</a> for more screenshots."
msgstr "Zie de <a href=\"%s\">screenshots-pagina</a> voor meer screenshots."
#: index.php:37
#: downloads\index.php:88
+#, c-format
msgid "Y-m-d"
msgstr "d-m-Y"
#: translations\instructions.php:5
#: translations\instructions.php:8
+#, c-format
msgid "Translations instructions"
msgstr "Vertaalinstructies"
#: engine\page.inc:322
+#, c-format
msgid "WinMerge Mailing Lists"
msgstr "WinMerge maillijsten"
#: downloads\index.php:68
+#, c-format
msgid "Experimental Builds"
msgstr "Experimentele builds"
#: engine\page.inc:325
+#, c-format
msgid "Donate money to WinMerge"
msgstr "Geld doneren aan WinMerge"
#: downloads\index.php:66
+#, c-format
msgid "Stable Versions"
msgstr "Stabiele versies"
#: engine\page.inc:273
+#, c-format
msgid "About"
msgstr "Over"
#: downloads\pad-file.php:92
+#, c-format
msgid "Name"
msgstr "Naam"
#: about\license.php:7
#: about\license.php:9
#: engine\page.inc:302
+#, c-format
msgid "License"
msgstr "Licentie"
#: downloads\index.php:63
+#, c-format
msgid "Other Versions"
msgstr "Andere versies"
+#: docs\index.php:13
+#, c-format
+msgid "The <a href=\"%s\">quick tour</a> describes the main WinMerge features in one page."
+msgstr "De <a href=\"%s\">rondleiding</a> beschrijft de belangrijkste functies van WinMerge op een pagina."
+
#: engine\page.inc:321
+#, c-format
msgid "Discussion Forums"
msgstr "Discussieforums"
#: downloads\pad-file.php:38
+#, c-format
msgid "Release Date"
msgstr "Vrijgave-datum"
#: support\index.php:13
+#, c-format
msgid "If you find a bug, please submit it as a <a href=\"%s\">bug report</a>."
msgstr "Als u een bug vindt, gelieve hem in te zenden als een <a href=\"%s\">bugrapport</a>."
#: downloads\source-code.php:37
+#, c-format
msgid "Developer Version"
msgstr "Ontwikkelingsversie"
#: index.php:7
+#, c-format
msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
msgstr "WinMerge, vrij, open source, Windows, windiff, diff, samenvoegen, vergelijken, tool, utility, tekt, bestand, map, bestanden vergelijken, mappen vergelijken, bestanden samenvoegen, mappen samenvoegen, diff tool, samenvoegingstool, vergelijkingstool"
#: engine\page.inc:241
+#, c-format
msgid "Download Now!"
msgstr "Nu downloaden!"
#: index.php:39
+#, c-format
msgid "View all news…"
msgstr "Bekijk alle news…"
#: about\index.php:37
+#, c-format
msgid "Folder Compare"
msgstr "Mapvergelijking"
#: engine\page.inc:309
+#, c-format
msgid "Known Issues"
msgstr "Gekende problemen"
@@ -1421,66 +1720,70 @@
#: docs\releasenotes.php:7
#: docs\releasenotes.php:10
#: engine\page.inc:308
+#, c-format
msgid "Release Notes"
msgstr "Vrijgave-opmerkingen"
#: links.php:16
#, c-format
msgid "<b>GnuWin32</b> provides Win32 ports of tools with a <a href=\"%1$s\">GNU</a> or similar <a href=\"%2$s\">open source license</a>."
-msgstr ""
+msgstr "<b>GnuWin32</b> voorziet Win32 ports van tools met een <a href=\"%1$s\">GNU</a> of gelijkaardige <a href=\"%2$s\">open source licentie</a>."
#: engine\page.inc:308
+#, c-format
msgid "WinMerge Release Notes"
msgstr "WinMerge vrijgave-opmerkingen"
#: index.php:26
+#, c-format
msgid "WinMerge %s - latest stable version"
msgstr "WinMerge %s - laatste stabiele versie"
#: translations\index.php:32
+#, c-format
msgid "If you would like to update any of these translations or add another translation, then please follow <a href=\"%s\">these instructions</a>."
msgstr "Als u een van deze vertalingen wilt updaten of een andere vertaling toevoegen, gelieve dan <a href=\"%s\">deze instructies</a> te volgen."
#: translations\index.php:31
+#, c-format
msgid "Translating"
msgstr "Vertalen"
#: about\screenshots\index.php:15
#: about\screenshots\index.php:16
+#, c-format
msgid "Open-dialog"
msgstr "Open-dialoog"
#: downloads\index.php:90
+#, c-format
msgid "View all file releases…"
msgstr "Bekijk alle bestanden releases…"
#: links.php:14
#, c-format
msgid "<b>WinSCP</b> is an open source <acronym title=\"SSH File Transfer Protocol\">SFTP</acronym>, <acronym title=\"File Transfer Protocol\">FTP</acronym> and <acronym title=\"Secure Copy Protocol\">SCP</acronym> client for Windows."
-msgstr ""
+msgstr "<b>WinSCP</b> is een open source <acronym title...
[truncated message content] |
