You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ge...@us...> - 2006-11-09 20:08:38
|
Revision: 3799
http://svn.sourceforge.net/winmerge/?rev=3799&view=rev
Author: gerundt
Date: 2006-11-09 12:08:28 -0800 (Thu, 09 Nov 2006)
Log Message:
-----------
PATCH: [ 1593009 ] Updated Organisation.txt
Modified Paths:
--------------
branches/R2_6/Docs/Developers/Changes.txt
branches/R2_6/Docs/Developers/Organisation.txt
Modified: branches/R2_6/Docs/Developers/Changes.txt
===================================================================
--- branches/R2_6/Docs/Developers/Changes.txt 2006-11-09 20:07:04 UTC (rev 3798)
+++ branches/R2_6/Docs/Developers/Changes.txt 2006-11-09 20:08:28 UTC (rev 3799)
@@ -1,3 +1,7 @@
+2006-11-09 Tim
+ PATCH: [ 1593009 ] Updated Organisation.txt
+ Developers: Organisation.txt
+
2006-11-08 Tim
Remove outdated "Docs\Developers\WinMerge files*"
Developers deleted files: WinMerge files.pdf, WinMerge files.ppt
Modified: branches/R2_6/Docs/Developers/Organisation.txt
===================================================================
--- branches/R2_6/Docs/Developers/Organisation.txt 2006-11-09 20:07:04 UTC (rev 3798)
+++ branches/R2_6/Docs/Developers/Organisation.txt 2006-11-09 20:08:28 UTC (rev 3799)
@@ -2,37 +2,60 @@
WinMerge CVS organisation
=========================
-WinMerge/
- - Docs/
- - Developers/
- - WinMerge files (Web format)/
- - Users/
+WinMerge
+ - ArchiveSupport
+ - Merge7z
+ - Merge7zInstaller
+ - Docs
+ - Developers
+ - Logos
+ - Users
+ - Languages
- Manual
- Filters
- - InnoSetup
- - Art
- - Languages
- - Runtimes
- - MakePatchDirs
- - MakeResDll
- - Merge7z
+ - Installer
+ - InnoSetup
+ - Art
+ - Languages
+ - Runtimes
- Plugins
- - Src_Delphi/
- - Src_VB/
- - Src_VCPP/
+ - dlls
+ - Src_Delphi
+ - Src_VB
+ - Src_VCPP
- ShellExtension
+ - Languages
- Src
- Common
- - Languages
- diffutils
- editlib
+ - ExpatLib
+ - ExpatMapLib
+ - Languages
- res
+ - Testing
+ - EditorTest
+ - selftests
+ - Tools
+ - diff2winmerge
+ - MakePatchDirs
+ - MakeResDll
- Web
-
-WinMerge/
+
+WinMerge/
- Module root, no files to here please.
-
+
+WinMerge/ArchiveSupport/
+ - Archive file support system. Currently includes 7-Zip based archive support.
+
+WinMerge/ArchiveSupport/Merge7z/
+ - 7-Zip based archive file support. Integrates to WinMerge executable.
+
+WinMerge/ArchiveSupport/Merge7zInstaller/
+ - Installer for archive file support using 7-Zip. Creates an executable
+ which installs needed files.
+
WinMerge/Docs/
- Directory containing documentation
@@ -42,48 +65,42 @@
it contains a lot of useful information about practices of
WinMerge developers.
-WinMerge/Docs/Developers/WinMerge files (Web format)/
- - ???
+WinMerge/Docs/Logos/
+ - WinMerge logos from Alexander Skinner.
WinMerge/Docs/Users/
- Documentation files mostly for users interests
+WinMerge/Docs/Users/Languages/
+ - Readme.txt translations
+
WinMerge/Docs/Users/Manual/
- New 2.2.x userguide. Using Docbook/XML.
- - readme.txt is changelog file
WinMerge/Filters/
- File filters are here
-WinMerge/InnoSetup/
- -Source files used to create windows installer (with InnoSetup program)
- - readme.txt is changelog file
+WinMerge/Installer/
+ - WinMerge installers. Currently we have only Innosetup-based installer.
-WinMerge/InnoSetup/Art
+WinMerge/Installer/InnoSetup/
+ - Source files used to create windows installer (with InnoSetup program)
+
+WinMerge/Installer/InnoSetup/Art/
- Graphics files installer needs
-WinMerge/InnoSetup/Languages
+WinMerge/Installer/InnoSetup/Languages/
- Installer translations
-WinMerge/InnoSetup/Runtimes
+WinMerge/Installer/InnoSetup/Runtimes/
- Libraries for WinMerge added to install package
-WinMerge/MakePatchDirs/
- - Source files for MakePatchDirs, a program to generate original &
- altered directories
- - Used to create patches to WinMerge source tree, for upload to
- sourceforge patch board
-
-WinMerge/MakeResDll/
- - Source files for MakeResDll, a command line program used to
- compile the WinMerge language dlls
-
-WinMerge/Merge7z/
- - 7Zip integration files. Needed to compile WinMerge executable.
-
WinMerge/Plugins/
- Plugins files. Also plugins documentation at the moment.
+WinMerge/Plugins/dlls/
+ - Compiled plugins files
+
WinMerge/Plugins/Src_Delphi/
- Sources for plugins made with Delphi
@@ -96,25 +113,58 @@
WinMerge/ShellExtension/
- Files for ShellExtension for WinMerge. Needs also /Src/Common.
+WinMerge/ShellExtension/Languages/
+ - ShellExtension translations
+
WinMerge/Src/
- WinMerge executable sources.
- - readme.txt is changelog file
-WinMerge/Src/Common
+WinMerge/Src/Common/
- Some common components shared by tools etc.
-WinMerge/Src/Languages
- - WinMerge translations sources.
-
-WinMerge/Src/diffutils
+WinMerge/Src/diffutils/
- GNU/diffutils sources
-WinMerge/Src/editlib
+WinMerge/Src/editlib/
- CrystalEditor editor component sources.
-WinMerge/Src/res
+WinMerge/Src/ExpatLib/
+ - Partial sources for Expat XML parser
+
+WinMerge/Src/ExpatMapLib/
+ - Plugin to Expat XML parser for handling character encodings
+
+WinMerge/Src/Languages/
+ - WinMerge translations sources.
+
+WinMerge/Src/res/
- Bitmaps, icons etc.
+WinMerge/Testing/
+ - WinMerge testing programs and files
+
+WinMerge/Testing/EditorTest/
+ - Some tests for CrystalEditor
+
+WinMerge/Testing/selftests/
+ - Tests using Perl run WinMerge executable to test compare functionality.
+
+WinMerge/Tools/
+ - Tools needed/used with WinMerge development (e.g. language file compiler).
+
+WinMerge/Tools/diff2winmerge/
+ - Commandline wrapper for WinMerge executable, offers
+ diffutils -style commandline switches (needed by Perl selftests).
+
+WinMerge/Tools/MakePatchDirs/
+ - Source files for MakePatchDirs, a program to generate original &
+ altered directories
+ - Used to create patches to WinMerge source tree, for upload to
+ sourceforge patch board
+
+WinMerge/Tools/MakeResDll/
+ - Source files for MakeResDll, a command line program used to
+ compile the WinMerge language dlls
+
WinMerge/Web/
- Homepages.
- - readme.txt is changelog file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-09 20:07:27
|
Revision: 3798
http://svn.sourceforge.net/winmerge/?rev=3798&view=rev
Author: gerundt
Date: 2006-11-09 12:07:04 -0800 (Thu, 09 Nov 2006)
Log Message:
-----------
PATCH: [ 1593009 ] Updated Organisation.txt
Modified Paths:
--------------
trunk/Docs/Developers/Changes.txt
trunk/Docs/Developers/Organisation.txt
Modified: trunk/Docs/Developers/Changes.txt
===================================================================
--- trunk/Docs/Developers/Changes.txt 2006-11-09 15:45:26 UTC (rev 3797)
+++ trunk/Docs/Developers/Changes.txt 2006-11-09 20:07:04 UTC (rev 3798)
@@ -1,3 +1,7 @@
+2006-11-09 Tim
+ PATCH: [ 1593009 ] Updated Organisation.txt
+ Developers: Organisation.txt
+
2006-11-08 Tim
Remove outdated "Docs\Developers\WinMerge files*"
Developers deleted files: WinMerge files.pdf, WinMerge files.ppt
Modified: trunk/Docs/Developers/Organisation.txt
===================================================================
--- trunk/Docs/Developers/Organisation.txt 2006-11-09 15:45:26 UTC (rev 3797)
+++ trunk/Docs/Developers/Organisation.txt 2006-11-09 20:07:04 UTC (rev 3798)
@@ -2,37 +2,65 @@
WinMerge CVS organisation
=========================
-WinMerge/
- - Docs/
- - Developers/
- - WinMerge files (Web format)/
- - Users/
+WinMerge
+ - ArchiveSupport
+ - Merge7z
+ - Merge7zInstaller
+ - Docs
+ - Developers
+ - Logos
+ - Users
+ - Languages
- Manual
+ - Externals
+ - cppunit
+ - expat
+ - pcre
+ - scew
- Filters
- - InnoSetup
- - Art
- - Languages
- - Runtimes
- - MakePatchDirs
- - MakeResDll
- - Merge7z
+ - Installer
+ - InnoSetup
+ - Art
+ - Languages
+ - Runtimes
- Plugins
- - Src_Delphi/
- - Src_VB/
- - Src_VCPP/
+ - dlls
+ - Src_Delphi
+ - Src_VB
+ - Src_VCPP
- ShellExtension
+ - Languages
- Src
- Common
- - Languages
- diffutils
- editlib
+ - ExpatMapLib
+ - Languages
- res
+ - Testing
+ - CppUnit
+ - EditorTest
+ - selftests
+ - Tools
+ - diff2winmerge
+ - MakePatchDirs
+ - MakeResDll
- Web
-
-WinMerge/
+
+WinMerge/
- Module root, no files to here please.
-
+
+WinMerge/ArchiveSupport/
+ - Archive file support system. Currently includes 7-Zip based archive support.
+
+WinMerge/ArchiveSupport/Merge7z/
+ - 7-Zip based archive file support. Integrates to WinMerge executable.
+
+WinMerge/ArchiveSupport/Merge7zInstaller/
+ - Installer for archive file support using 7-Zip. Creates an executable
+ which installs needed files.
+
WinMerge/Docs/
- Directory containing documentation
@@ -42,48 +70,57 @@
it contains a lot of useful information about practices of
WinMerge developers.
-WinMerge/Docs/Developers/WinMerge files (Web format)/
- - ???
+WinMerge/Docs/Logos/
+ - WinMerge logos from Alexander Skinner.
WinMerge/Docs/Users/
- Documentation files mostly for users interests
+WinMerge/Docs/Users/Languages/
+ - Readme.txt translations
+
WinMerge/Docs/Users/Manual/
- New 2.2.x userguide. Using Docbook/XML.
- - readme.txt is changelog file
+WinMerge/Externals/
+ - External code modules WinMerge uses
+
+WinMerge/Externals/cppunit/
+ - CppUnit unit-testing suite for C++ <http://cppunit.sourceforge.net/>
+
+WinMerge/Externals/expat/
+ - Expat XML parser <http://expat.sourceforge.net/>
+
+WinMerge/Externals/pcre/
+ - PCRE - Perl Compatible Regular Expression <http://www.pcre.org/>
+
+WinMerge/Externals/scew/
+ - SCEW - Simple C Expat Wrapper <http://www.nongnu.org/scew/>
+
WinMerge/Filters/
- File filters are here
-WinMerge/InnoSetup/
- -Source files used to create windows installer (with InnoSetup program)
- - readme.txt is changelog file
+WinMerge/Installer/
+ - WinMerge installers. Currently we have only Innosetup-based installer.
-WinMerge/InnoSetup/Art
+WinMerge/Installer/InnoSetup/
+ - Source files used to create windows installer (with InnoSetup program)
+
+WinMerge/Installer/InnoSetup/Art/
- Graphics files installer needs
-WinMerge/InnoSetup/Languages
+WinMerge/Installer/InnoSetup/Languages/
- Installer translations
-WinMerge/InnoSetup/Runtimes
+WinMerge/Installer/InnoSetup/Runtimes/
- Libraries for WinMerge added to install package
-WinMerge/MakePatchDirs/
- - Source files for MakePatchDirs, a program to generate original &
- altered directories
- - Used to create patches to WinMerge source tree, for upload to
- sourceforge patch board
-
-WinMerge/MakeResDll/
- - Source files for MakeResDll, a command line program used to
- compile the WinMerge language dlls
-
-WinMerge/Merge7z/
- - 7Zip integration files. Needed to compile WinMerge executable.
-
WinMerge/Plugins/
- Plugins files. Also plugins documentation at the moment.
+WinMerge/Plugins/dlls/
+ - Compiled plugins files
+
WinMerge/Plugins/Src_Delphi/
- Sources for plugins made with Delphi
@@ -96,25 +133,55 @@
WinMerge/ShellExtension/
- Files for ShellExtension for WinMerge. Needs also /Src/Common.
+WinMerge/ShellExtension/Languages/
+ - ShellExtension translations
+
WinMerge/Src/
- WinMerge executable sources.
- - readme.txt is changelog file
-WinMerge/Src/Common
+WinMerge/Src/Common/
- Some common components shared by tools etc.
-WinMerge/Src/Languages
- - WinMerge translations sources.
-
-WinMerge/Src/diffutils
+WinMerge/Src/diffutils/
- GNU/diffutils sources
-WinMerge/Src/editlib
+WinMerge/Src/editlib/
- CrystalEditor editor component sources.
-WinMerge/Src/res
+WinMerge/Src/ExpatMapLib/
+ - Plugin to Expat XML parser for handling character encodings
+
+WinMerge/Src/Languages/
+ - WinMerge translations sources.
+
+WinMerge/Src/res/
- Bitmaps, icons etc.
+WinMerge/Testing/
+ - WinMerge testing programs and files
+
+WinMerge/Testing/EditorTest/
+ - Some tests for CrystalEditor
+
+WinMerge/Testing/selftests/
+ - Tests using Perl run WinMerge executable to test compare functionality.
+
+WinMerge/Tools/
+ - Tools needed/used with WinMerge development (e.g. language file compiler).
+
+WinMerge/Tools/diff2winmerge/
+ - Commandline wrapper for WinMerge executable, offers
+ diffutils -style commandline switches (needed by Perl selftests).
+
+WinMerge/Tools/MakePatchDirs/
+ - Source files for MakePatchDirs, a program to generate original &
+ altered directories
+ - Used to create patches to WinMerge source tree, for upload to
+ sourceforge patch board
+
+WinMerge/Tools/MakeResDll/
+ - Source files for MakeResDll, a command line program used to
+ compile the WinMerge language dlls
+
WinMerge/Web/
- Homepages.
- - readme.txt is changelog file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-09 15:30:36
|
Revision: 3796
http://svn.sourceforge.net/winmerge/?rev=3796&view=rev
Author: kimmov
Date: 2006-11-09 07:30:24 -0800 (Thu, 09 Nov 2006)
Log Message:
-----------
PATCH: [ 1591532 ] Remove unused XmlDoc class
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.dsp
Removed Paths:
-------------
trunk/Src/XmlDoc.cpp
trunk/Src/XmlDoc.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-09 15:21:12 UTC (rev 3795)
+++ trunk/Src/Changes.txt 2006-11-09 15:30:24 UTC (rev 3796)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-09 Kimmo
+ PATCH: [ 1591532 ] Remove unused XmlDoc class
+ Src: Merge.dsp
+ Src removed files: XmlDoc.cpp XmlDoc.h
+
2006-11-07 Kimmo
Add PCRE 6.7 (with windows build files from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib/)
New folder: /Externals/pcre
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2006-11-09 15:21:12 UTC (rev 3795)
+++ trunk/Src/Merge.dsp 2006-11-09 15:30:24 UTC (rev 3796)
@@ -935,10 +935,6 @@
SOURCE=.\WMGotoDlg.cpp
# End Source File
-# Begin Source File
-
-SOURCE=.\XmlDoc.cpp
-# End Source File
# End Group
# Begin Group "Header Files"
@@ -1519,10 +1515,6 @@
SOURCE=.\WMGotoDlg.h
# End Source File
-# Begin Source File
-
-SOURCE=.\XmlDoc.h
-# End Source File
# End Group
# Begin Group "Resource Files"
Deleted: trunk/Src/XmlDoc.cpp
===================================================================
--- trunk/Src/XmlDoc.cpp 2006-11-09 15:21:12 UTC (rev 3795)
+++ trunk/Src/XmlDoc.cpp 2006-11-09 15:30:24 UTC (rev 3796)
@@ -1,312 +0,0 @@
-/**
- * @file XmlDoc.cpp
- *
- * @brief Implementation of the XmlDoc and XmlElement classes.
- */
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#include "stdafx.h"
-#include "XmlDoc.h"
-#include "markdown.h"
-
-// Private types
-
-/**
- * @brief Stuff you need to load an XML file
- */
-struct XmlLoadDocData
-{
- CMarkdown::File xmlfile;
- CMarkdown::EntityMap entities;
- UINT codepage;
- XmlLoadDocData(LPCTSTR path) : xmlfile(path), codepage(-1) { }
-};
-
-/**
- * @brief element-specific stuff used in loading an XML file
- */
-struct XmlLoadElementData
-{
- CMarkdown markdown;
-
- // Have to be able to construct either from markdown of parent
- // or from markdown file (if element with no parent, ie, root)
- XmlLoadElementData(CMarkdown &md) : markdown(md) { }
- XmlLoadElementData(CMarkdown::File & file) : markdown(file) { }
-};
-
-// Private functions
-
-/**
- * @brief Convert a string into correct encoding & markdown string object
- */
-static LPCSTR
-MakeMarkdownString(const CString & str, int codepage)
-{
- return CMarkdown::String(CMarkdown::HSTR(str.AllocSysString())->Entities()->Octets(codepage)).A;
-}
-
-// Body of module
-
-XmlDoc::XmlDoc(LPCTSTR path, XML_LOADSAVE loadSave, LPCTSTR encoding)
-: m_path(path)
-, m_loadSave(loadSave)
-, m_live(0)
-// CString m_xml;
-// XmlElementList m_openElements;
-, m_load(NULL)
-, m_codepage(65001)
-{
- if (m_loadSave == XML_SAVE)
- {
- m_xml.Format(_T("<?xml version='1.0' encoding='%s'?>"), encoding);
- }
- // Loading is all done in the Begin method (2 stage construction)
-
-}
-
-/**
- * @brief Destructor, delete dynamically created load-object.
- */
-XmlDoc::~XmlDoc()
-{
- if (m_load)
- delete m_load;
-}
-
-/**
- * @brief 2nd stage construction of XmlDoc object (so can throw exception)
- */
-void
-XmlDoc::Begin()
-{
- // Saving did its (simple) initialization in the constructor
- if (m_loadSave == XML_LOAD)
- {
- ASSERT(!m_load);
- m_load = new XmlLoadDocData(m_path);
- if (m_load->xmlfile.pImage == NULL)
- {
- CFileException::ThrowOsError(GetLastError(), m_path);
- }
- m_load->entities.Load();
- // If encoding is other than UTF-8, assume CP_ACP
- CMarkdown::String encoding = CMarkdown(m_load->xmlfile).Move("?xml").GetAttribute("encoding");
- m_codepage = lstrcmpiA(encoding.A, "UTF-8") == 0 ? CP_UTF8 : CP_ACP;
- }
-}
-
-/**
- * @brief Finish xml document (needed to write out all XML, if saving)
- */
-void
-XmlDoc::End()
-{
- if (m_loadSave == XML_SAVE)
- {
- // Open file in exclusive mode to make sure there are no other readers
- // or writers to same file
- CStdioFile file;
- BOOL bSuccess = file.Open(m_path, CFile::modeCreate | CFile::modeWrite |
- CFile::shareExclusive, NULL);
- if (bSuccess)
- {
- CString xml = GetXml();
- file.SeekToEnd();
- file.WriteString(xml);
- file.Close();
- }
- else
- {
- CFileException::ThrowOsError(GetLastError(), m_path);
- }
- }
-}
-
-/**
- * @brief Add some content text to XML document
- */
-void
-XmlDoc::Append(LPCTSTR str)
-{
- m_xml += MakeMarkdownString(str, m_codepage); // UTF-8 encoding
-}
-
-/**
- * @brief Get all accumulated XML
- */
-CString
-XmlDoc::GetXml() const
-{
- // Return accumulated XML, but ensure it has trailing \n
- CString xml = m_xml;
- if (xml[xml.GetLength()-1] != '\n')
- xml += '\n';
- return xml;
-}
-
-void
-XmlDoc::StartTag(XmlElement * xel)
-{
- LPCSTR tag = MakeMarkdownString(xel->m_tag, GetCodepage()); // UTF-8 encoding
- xel->m_normalizedTag = tag;
-
- if (m_loadSave == XML_SAVE)
- {
- // Add tabs & open tag to XML string
- m_xml += (CString)_T("\n") + GetLeader() + _T("<") + tag + _T(">");
- // Mark any currently open tags as multiline (for pretty printing)
- // (as they are complex b/c they contain this tag)
- for (POSITION pos=m_openElements.GetHeadPosition(); pos; )
- {
- XmlElement * xmem = m_openElements.GetNext(pos);
- xmem->SetMultiline();
- }
- }
- else // XML_LOAD)
- {
- ASSERT(!xel->m_load);
- if (m_openElements.IsEmpty())
- {
- // Create root CMarkdown from CMarkdown::File
- CMarkdown::File & parentFile = (m_load->xmlfile);
- CMarkdown childmd = CMarkdown(parentFile).Move(tag).Pop();
- xel->m_load = new XmlLoadElementData(childmd);
- }
- else
- {
- // Create child CMarkdown from parent CMarkdown
- XmlElement * parel = m_openElements.GetTail();
- CMarkdown & parentMd = (parel->m_load->markdown);
- CMarkdown childMd = CMarkdown(parentMd).Move(tag);
- xel->m_load = new XmlLoadElementData(childMd);
- }
- }
- // Add this tag to list of open tags
- m_openElements.AddTail(xel);
-}
-
-/**
- * @brief Non-content elements call this, for CMarkdown::Pop (whatever it does)
- */
-void
-XmlDoc::PopMe(XmlElement * xel)
-{
- if (m_loadSave == XML_LOAD)
- {
- CMarkdown & myMd = xel->m_load->markdown;
- myMd.Pop();
- }
-}
-
-/**
- * @brief When saving, write out end tag (at XmlElement destructor time)
- */
-void
-XmlDoc::EndTag(XmlElement * xel)
-{
- CString tag = xel->m_normalizedTag;
- XmlElement * tail = m_openElements.RemoveTail();
- ASSERT(tail == xel);
- if (xel->isMultiline())
- {
- m_xml += _T("\n");
- m_xml += GetLeader();
- }
- m_xml += (CString)_T("</") + tag + _T(">");
-}
-
-/**
- * @brief (When saving) Get correct number of tabs to print before element
- */
-CString
-XmlDoc::GetLeader() const
-{
- CString leader;
- for (int i=0; i<m_openElements.GetCount(); ++i)
- leader += _T("\t");
- return leader;
-}
-
-/**
- * @brief Read or write some textual content at current location
- */
-void
-XmlDoc::Content(XmlElement * xel, CString & str)
-{
- if (m_loadSave == XML_SAVE)
- {
- Append(str);
- }
- else
- {
- CMarkdown::EntityMap & entities = m_load->entities;
- CMarkdown & myMd = xel->m_load->markdown;
- str = CMarkdown::String(myMd.GetInnerText()->Unicode(m_codepage)->Resolve(entities)).W;
- }
-}
-
-/**
- * @brief Read or write an int value at current location
- */
-void
-XmlDoc::Content(XmlElement * xel, int & val)
-{
- if (m_loadSave == XML_SAVE)
- {
- AppendN(val);
- }
- else
- {
- CMarkdown & myMd = xel->m_load->markdown;
- sscanf(CMarkdown::String(myMd.GetInnerText()).A, "%d", &val);
- }
-}
-
-/**
- * @brief Create simple container element
- */
-XmlElement::XmlElement(XmlDoc & doc, LPCTSTR tag)
-: m_doc(doc)
-, m_tag(tag)
-, m_multiline(false)
-, m_load(NULL)
-{
- m_doc.StartTag(this);
- m_doc.PopMe(this);
-}
-
-/**
- * @brief Create simple string leaf node element
- */
-XmlElement::XmlElement(XmlDoc & doc, LPCTSTR tag, CString & val)
-: m_doc(doc)
-, m_tag(tag)
-, m_multiline(false)
-, m_load(NULL)
-{
- m_doc.StartTag(this);
- m_doc.Content(this, val);
-}
-
-/**
- * @brief Create integer string leaf node element
- */
-XmlElement::XmlElement(XmlDoc & doc, LPCTSTR tag, int & val)
-: m_doc(doc)
-, m_tag(tag)
-, m_multiline(false)
-, m_load(NULL)
-{
- m_doc.StartTag(this);
- m_doc.Content(this, val);
-}
-/**
- * brief Cleanup or memory
- */
-XmlElement::~XmlElement()
-{
- m_doc.EndTag(this);
- delete m_load;
-}
Deleted: trunk/Src/XmlDoc.h
===================================================================
--- trunk/Src/XmlDoc.h 2006-11-09 15:21:12 UTC (rev 3795)
+++ trunk/Src/XmlDoc.h 2006-11-09 15:30:24 UTC (rev 3796)
@@ -1,118 +0,0 @@
-/**
- * @file XmlDoc.h
- *
- * @brief Declaration file for XmlDoc and XmlElement classes.
- *
- */
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#ifndef XmlDoc_h_included
-#define XmlDoc_h_included
-
-class XmlElement;
-typedef CTypedPtrList<CPtrList, XmlElement*> XmlElementList;
-
-struct XmlLoadDocData;
-struct XmlLoadElementData;
-
-/**
- * @brief Simple XML document class to ease doing XML output
- *
- * Sample use:
- *
- * XmlDoc doc(_T("C:\\somewhere\\goodstuff.xml"), XmlDoc::XML_SAVE, _T("UTF-8"));
- * doc.Begin();
- * {
- * XmlElement(doc, _T("automobile"));
- * {
- * XmlElement(doc, _T("seats"));
- * {
- * XmlElement(doc, _T("front")).Append(_T("bucket"));
- * XmlElement(doc, _T("rear")).Append(_T("bench"));
- * }
- * }
- * }
- * doc.End();
- *
- * Sample output:
- *
- * <?xml version='1.0' encoding='UTF-8'>
- * <automobile>
- * <seats>
- * <front>bucket</bucket>
- * <rear>bench</rear>
- * </seats>
- * </automobile>
- */
-class XmlDoc
-{
-public:
- typedef enum { XML_LOAD, XML_SAVE } XML_LOADSAVE;
-
- XmlDoc(LPCTSTR path, XML_LOADSAVE loadSave, LPCTSTR encoding);
- ~XmlDoc();
- void Begin();
- void End();
-
-// Implementation methods
-private:
- CString GetXml() const;
- int GetCodepage() const { return m_codepage; }
-
- void Append(LPCTSTR str);
- void AppendN(int n) { TCHAR buff[33]; m_xml += _itot(n, buff, 10); }
-
- void Content(XmlElement * xel, CString & str);
- void Content(XmlElement * xel, int & val);
-
- void StartTag(XmlElement * xel);
- void PopMe(XmlElement * xel);
- void EndTag(XmlElement * xel);
- CString GetLeader() const;
-
-// Implementation data
-private:
- CString m_path;
- XML_LOADSAVE m_loadSave;
- int m_live;
- CString m_xml;
- XmlElementList m_openElements;
- XmlLoadDocData * m_load; // hide loading implementation data inside this pointer
- int m_codepage;
-
-friend class XmlElement;
-};
-
-/**
- * @brief Simple XML element class to ease doing XML output
- */
-class XmlElement
-{
-public:
- // container
- XmlElement(XmlDoc & doc, LPCTSTR tag);
-
- // value
- XmlElement(XmlDoc & doc, LPCTSTR tag, CString & val);
- XmlElement(XmlDoc & doc, LPCTSTR tag, int & val);
-
- ~XmlElement();
-
-// Implementation methods
-private:
- bool isMultiline() const { return m_multiline; }
- void SetMultiline(bool isMultiline=true) { m_multiline = isMultiline; }
-
-// Implementation data
-private:
- XmlDoc & m_doc;
- CString m_tag;
- CString m_normalizedTag;
- bool m_multiline;
- XmlLoadElementData * m_load;
-friend XmlDoc;
-};
-
-
-#endif // XmlDoc_h_included
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-09 15:21:22
|
Revision: 3795
http://svn.sourceforge.net/winmerge/?rev=3795&view=rev
Author: kimmov
Date: 2006-11-09 07:21:12 -0800 (Thu, 09 Nov 2006)
Log Message:
-----------
PATCH: [ 1591689 ] WinMerge (ANSI) shortcut installed to 64-bit Windows
Modified Paths:
--------------
branches/R2_6/Installer/InnoSetup/Changes.txt
branches/R2_6/Installer/InnoSetup/WinMerge.iss
Modified: branches/R2_6/Installer/InnoSetup/Changes.txt
===================================================================
--- branches/R2_6/Installer/InnoSetup/Changes.txt 2006-11-09 15:19:20 UTC (rev 3794)
+++ branches/R2_6/Installer/InnoSetup/Changes.txt 2006-11-09 15:21:12 UTC (rev 3795)
@@ -1,3 +1,7 @@
+2006-11-09 Kimmo
+ PATCH: [ 1591689 ] WinMerge (ANSI) shortcut installed to 64-bit Windows
+ InnoSetup: WinMerge.iss
+
2006-11-08 Tim
PATCH: [ 1592609 ] Remove outdated files from installer
InnoSetup deleted files: Setup Helper.au3, Setup Helper.exe
Modified: branches/R2_6/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_6/Installer/InnoSetup/WinMerge.iss 2006-11-09 15:19:20 UTC (rev 3794)
+++ branches/R2_6/Installer/InnoSetup/WinMerge.iss 2006-11-09 15:21:12 UTC (rev 3795)
@@ -384,7 +384,7 @@
;Start Menu Icons
Name: {group}\WinMerge; Filename: {app}\{code:ExeName}
;WinMerge (ANSI) for WinMerge.exe in NT-windows
-Name: {group}\WinMerge (ANSI); Filename: {app}\WinMerge.exe; IconIndex: 0; MinVersion: 0,4; Components: core
+Name: {group}\WinMerge (ANSI); Filename: {app}\WinMerge.exe; IconIndex: 0; MinVersion: 0,4; Components: core; Check: not IsWin64
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe.txt; IconFileName: {win}\NOTEPAD.EXE
Name: {group}\{cm:PluginsText}; Filename: {app}\Docs\Plugins.txt; IconFileName: {win}\NOTEPAD.EXE Check: InstallPluginsText; Components: Plugins
Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm; Components: docs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-09 15:19:38
|
Revision: 3794
http://svn.sourceforge.net/winmerge/?rev=3794&view=rev
Author: kimmov
Date: 2006-11-09 07:19:20 -0800 (Thu, 09 Nov 2006)
Log Message:
-----------
PATCH: [ 1591689 ] WinMerge (ANSI) shortcut installed to 64-bit Windows
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-11-08 22:05:18 UTC (rev 3793)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-11-09 15:19:20 UTC (rev 3794)
@@ -1,3 +1,7 @@
+2006-11-09 Kimmo
+ PATCH: [ 1591689 ] WinMerge (ANSI) shortcut installed to 64-bit Windows
+ InnoSetup: WinMerge.iss
+
2006-11-08 Tim
PATCH: [ 1592609 ] Remove outdated files from installer
InnoSetup deleted files: Setup Helper.au3, Setup Helper.exe
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-11-08 22:05:18 UTC (rev 3793)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-11-09 15:19:20 UTC (rev 3794)
@@ -388,7 +388,7 @@
;Start Menu Icons
Name: {group}\WinMerge; Filename: {app}\{code:ExeName}
;WinMerge (ANSI) for WinMerge.exe in NT-windows
-Name: {group}\WinMerge (ANSI); Filename: {app}\WinMerge.exe; IconIndex: 0; MinVersion: 0,4; Components: core
+Name: {group}\WinMerge (ANSI); Filename: {app}\WinMerge.exe; IconIndex: 0; MinVersion: 0,4; Components: core; Check: not IsWin64
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe.txt; IconFileName: {win}\NOTEPAD.EXE
Name: {group}\{cm:PluginsText}; Filename: {app}\Docs\Plugins.txt; IconFileName: {win}\NOTEPAD.EXE Check: InstallPluginsText; Components: Plugins
Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm; Components: docs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-08 22:05:30
|
Revision: 3793
http://svn.sourceforge.net/winmerge/?rev=3793&view=rev
Author: gerundt
Date: 2006-11-08 14:05:18 -0800 (Wed, 08 Nov 2006)
Log Message:
-----------
Remove outdated "Docs\Developers\WinMerge files*"
Modified Paths:
--------------
branches/R2_6/Docs/Developers/Changes.txt
Removed Paths:
-------------
branches/R2_6/Docs/Developers/WinMerge files (Web format)/
branches/R2_6/Docs/Developers/WinMerge files.pdf
branches/R2_6/Docs/Developers/WinMerge files.ppt
Modified: branches/R2_6/Docs/Developers/Changes.txt
===================================================================
--- branches/R2_6/Docs/Developers/Changes.txt 2006-11-08 22:04:30 UTC (rev 3792)
+++ branches/R2_6/Docs/Developers/Changes.txt 2006-11-08 22:05:18 UTC (rev 3793)
@@ -1,3 +1,8 @@
+2006-11-08 Tim
+ Remove outdated "Docs\Developers\WinMerge files*"
+ Developers deleted files: WinMerge files.pdf, WinMerge files.ppt
+ Developers deleted directory: WinMerge files (Web format)
+
2006-11-03 Tim
PATCH: [ 1589578 ] Add <h4> style to readme-developers.html
Developers: readme-developers.html
Deleted: branches/R2_6/Docs/Developers/WinMerge files.pdf
===================================================================
(Binary files differ)
Deleted: branches/R2_6/Docs/Developers/WinMerge files.ppt
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-08 22:04:40
|
Revision: 3792
http://svn.sourceforge.net/winmerge/?rev=3792&view=rev
Author: gerundt
Date: 2006-11-08 14:04:30 -0800 (Wed, 08 Nov 2006)
Log Message:
-----------
Remove outdated "Docs\Developers\WinMerge files*"
Modified Paths:
--------------
trunk/Docs/Developers/Changes.txt
Removed Paths:
-------------
trunk/Docs/Developers/WinMerge files (Web format)/
trunk/Docs/Developers/WinMerge files.pdf
trunk/Docs/Developers/WinMerge files.ppt
Modified: trunk/Docs/Developers/Changes.txt
===================================================================
--- trunk/Docs/Developers/Changes.txt 2006-11-08 21:59:27 UTC (rev 3791)
+++ trunk/Docs/Developers/Changes.txt 2006-11-08 22:04:30 UTC (rev 3792)
@@ -1,3 +1,8 @@
+2006-11-08 Tim
+ Remove outdated "Docs\Developers\WinMerge files*"
+ Developers deleted files: WinMerge files.pdf, WinMerge files.ppt
+ Developers deleted directory: WinMerge files (Web format)
+
2006-11-07 Kimmo
Add building instructions for PCRE
Developers: readme-developers.html
Deleted: trunk/Docs/Developers/WinMerge files.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Docs/Developers/WinMerge files.ppt
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-08 21:59:34
|
Revision: 3791
http://svn.sourceforge.net/winmerge/?rev=3791&view=rev
Author: gerundt
Date: 2006-11-08 13:59:27 -0800 (Wed, 08 Nov 2006)
Log Message:
-----------
Remove unused file "Docs\Users\Release Notes Template.htm"
Removed Paths:
-------------
branches/R2_6/Docs/Users/Release Notes Template.htm
Deleted: branches/R2_6/Docs/Users/Release Notes Template.htm
===================================================================
--- branches/R2_6/Docs/Users/Release Notes Template.htm 2006-11-08 21:59:05 UTC (rev 3790)
+++ branches/R2_6/Docs/Users/Release Notes Template.htm 2006-11-08 21:59:27 UTC (rev 3791)
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE>WinMerge 2.1.6.0 Release Notes Table</TITLE>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-</HEAD>
-<BODY>
-<TABLE BORDER="1" CELLPADDING="0" CELLSPACING="0">
- <TR BGCOLOR="#0099CC">
- <TH COLSPAN="3">Format</TH>
- <TH>Description</TH>
- </TR>
- <TR BGCOLOR="#CCCC99">
- <TD><A HREF="http://sourceforge.net/project/showfiles.php?group_id=14481" onClick="alert('An open-source 7-zip decompression program can be downloaded by following this link.');" TARGET="_BLANK">7-Zip</A></TD>
- <TD><A HREF="http://sourceforge.net/project/showfiles.php?group_id=14481" onClick="alert('An open-source Zip decompression program can be downloaded by following this link.');" TARGET="_BLANK">Zip</A></TD>
- <TD><A HREF="" onCLick="alert('No viewers are required to run this type of file, just download and run it.');">Standalone</A></TD>
- <TD> </TD>
- </TR>
- <TR>
- <TD> WinMerge-2.1.6.0-exe.7z </TD>
- <TD NOWRAP>WinMerge-2.1.6.0-exe.zip </TD>
- <TD> </TD>
- <TD NOWRAP> Binary package (manual installation) </TD>
- </TR>
- <TR>
- <TD> </TD>
- <TD NOWRAP> </TD>
- <TD NOWRAP>WinMerge-2.1.6.0-setup.exe </TD>
- <TD> Installer version </TD>
- </TR>
- <TR>
- <TD>WinMerge-2.1.6.0-src.7z </TD>
- <TD>WinMerge-2.1.6.0-src.zip </TD>
- <TD> </TD>
- <TD>WinMerge Source (excluding the Installer) </TD>
- </TR>
- <TR>
- <TD NOWRAP>WinMerge-2.1.6.0-src-EnglishOnly.7z </TD>
- <TD NOWRAP>WinMerge-2.1.6.0-src-EnglishOnly.zip</TD>
- <TD> </TD>
- <TD>WinMerge Source (localizations not included)</TD>
- </TR>
- <TR>
- <TD>WinMerge-2.1.6.0-setup-src.7z </TD>
- <TD>WinMerge-2.1.6.0-setup-src.zip </TD>
- <TD> </TD>
- <TD> Installation Source (Inno Setup/AutoIt) </TD>
- </TR>
-</TABLE>
-</BODY>
-</HTML>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-08 21:59:11
|
Revision: 3790
http://svn.sourceforge.net/winmerge/?rev=3790&view=rev
Author: gerundt
Date: 2006-11-08 13:59:05 -0800 (Wed, 08 Nov 2006)
Log Message:
-----------
Remove unused file "Docs\Users\Release Notes Template.htm"
Removed Paths:
-------------
trunk/Docs/Users/Release Notes Template.htm
Deleted: trunk/Docs/Users/Release Notes Template.htm
===================================================================
--- trunk/Docs/Users/Release Notes Template.htm 2006-11-08 21:55:07 UTC (rev 3789)
+++ trunk/Docs/Users/Release Notes Template.htm 2006-11-08 21:59:05 UTC (rev 3790)
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE>WinMerge 2.1.6.0 Release Notes Table</TITLE>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-</HEAD>
-<BODY>
-<TABLE BORDER="1" CELLPADDING="0" CELLSPACING="0">
- <TR BGCOLOR="#0099CC">
- <TH COLSPAN="3">Format</TH>
- <TH>Description</TH>
- </TR>
- <TR BGCOLOR="#CCCC99">
- <TD><A HREF="http://sourceforge.net/project/showfiles.php?group_id=14481" onClick="alert('An open-source 7-zip decompression program can be downloaded by following this link.');" TARGET="_BLANK">7-Zip</A></TD>
- <TD><A HREF="http://sourceforge.net/project/showfiles.php?group_id=14481" onClick="alert('An open-source Zip decompression program can be downloaded by following this link.');" TARGET="_BLANK">Zip</A></TD>
- <TD><A HREF="" onCLick="alert('No viewers are required to run this type of file, just download and run it.');">Standalone</A></TD>
- <TD> </TD>
- </TR>
- <TR>
- <TD> WinMerge-2.1.6.0-exe.7z </TD>
- <TD NOWRAP>WinMerge-2.1.6.0-exe.zip </TD>
- <TD> </TD>
- <TD NOWRAP> Binary package (manual installation) </TD>
- </TR>
- <TR>
- <TD> </TD>
- <TD NOWRAP> </TD>
- <TD NOWRAP>WinMerge-2.1.6.0-setup.exe </TD>
- <TD> Installer version </TD>
- </TR>
- <TR>
- <TD>WinMerge-2.1.6.0-src.7z </TD>
- <TD>WinMerge-2.1.6.0-src.zip </TD>
- <TD> </TD>
- <TD>WinMerge Source (excluding the Installer) </TD>
- </TR>
- <TR>
- <TD NOWRAP>WinMerge-2.1.6.0-src-EnglishOnly.7z </TD>
- <TD NOWRAP>WinMerge-2.1.6.0-src-EnglishOnly.zip</TD>
- <TD> </TD>
- <TD>WinMerge Source (localizations not included)</TD>
- </TR>
- <TR>
- <TD>WinMerge-2.1.6.0-setup-src.7z </TD>
- <TD>WinMerge-2.1.6.0-setup-src.zip </TD>
- <TD> </TD>
- <TD> Installation Source (Inno Setup/AutoIt) </TD>
- </TR>
-</TABLE>
-</BODY>
-</HTML>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-08 21:55:26
|
Revision: 3789
http://svn.sourceforge.net/winmerge/?rev=3789&view=rev
Author: gerundt
Date: 2006-11-08 13:55:07 -0800 (Wed, 08 Nov 2006)
Log Message:
-----------
PATCH: [ 1592609 ] Remove outdated files from installer
Modified Paths:
--------------
branches/R2_6/Installer/InnoSetup/Changes.txt
Removed Paths:
-------------
branches/R2_6/Installer/InnoSetup/Art/Gold Watch.ico
branches/R2_6/Installer/InnoSetup/Runtimes/psapi.dll
branches/R2_6/Installer/InnoSetup/Setup Helper.au3
branches/R2_6/Installer/InnoSetup/Setup Helper.exe
Deleted: branches/R2_6/Installer/InnoSetup/Art/Gold Watch.ico
===================================================================
(Binary files differ)
Modified: branches/R2_6/Installer/InnoSetup/Changes.txt
===================================================================
--- branches/R2_6/Installer/InnoSetup/Changes.txt 2006-11-08 21:53:38 UTC (rev 3788)
+++ branches/R2_6/Installer/InnoSetup/Changes.txt 2006-11-08 21:55:07 UTC (rev 3789)
@@ -1,3 +1,9 @@
+2006-11-08 Tim
+ PATCH: [ 1592609 ] Remove outdated files from installer
+ InnoSetup deleted files: Setup Helper.au3, Setup Helper.exe
+ InnoSetup/Art deleted files: Gold Watch.ico
+ InnoSetup/Runtimes deleted files: psapi.dll
+
2006-11-02 Kimmo
PATCH: [ 1588234 ] Remove manifest files from the installer
InnoSetup: WinMerge.iss
Deleted: branches/R2_6/Installer/InnoSetup/Runtimes/psapi.dll
===================================================================
(Binary files differ)
Deleted: branches/R2_6/Installer/InnoSetup/Setup Helper.au3
===================================================================
--- branches/R2_6/Installer/InnoSetup/Setup Helper.au3 2006-11-08 21:53:38 UTC (rev 3788)
+++ branches/R2_6/Installer/InnoSetup/Setup Helper.au3 2006-11-08 21:55:07 UTC (rev 3789)
@@ -1,86 +0,0 @@
-AutoItSetOption("MustDeclareVars", 1)
-
-Dim $strAction
-Dim $strCommand
-
-;If a user is running this .exe file then...
-If $CMDLine[0] = 0 Then
- ;Let the user know they shouldn't run this:
- msgbox(4144, "Setup - WinMerge", "Users: " & @CR & "This application is part of WinMerge's installation and removal processes. It is not meant to be run externally by users." & @CRLF & @CRLF & "Developers:" & @CRLF & @TAB & "/i - Restarts Explorer to initialize the ShellExtension.dll as Explorer's starts" & @CRLF & @TAB & "/u - Closes Explorer, deletes ShellExtension.dll, and then restarts explorer")
-
- ;Terminates the program
- exit
-Else
- ;Determines what the user's first command-line input parameter was
- $strCommand = StringUpper($CMDLine[1])
-
- msgbox(4144, "Setup Helper", "[$strCommand]=[" & $strCommand & "]")
-
-
- ;Analyzes the command-line input parameter
- Select
- ;If we received /i then...
- Case $strCommand = "/I"
- ;If the ShellExtension.dll file exists on the user's system then...
- If FileExists(@ScriptDir + "\ShellExtension.dll") = 1 Then
- ;The installer is trying to upgrade ShellExtension.dll
- $strAction="update"
- Else
- ;The installer is trying to install ShellExtension.dll
- $strAction="install"
- EndIf
-
- ;If we received /u then...
- Case $strCommand = "/U"
- ;The uninstaller is trying to uninstall ShellExtension.dll
- $strAction="uninstall"
-
- ;If the user specified an invalid bit of syntax then...
- Case Else
- ;Let the user know they shouldn't run this:
- msgbox(4144, "Setup - WinMerge", "Users: " & @CR & "This application is part of WinMerge's installation and removal processes. It is not meant to be run externally by users." & @CRLF & @CRLF & "Developers:" & @CRLF & @TAB & "/i - Restarts Explorer to initialize the ShellExtension.dll as Explorer's starts" & @CRLF & @TAB & "/u - Closes Explorer, deletes ShellExtension.dll, and then restarts explorer")
-
- ;Terminates the program
- exit
- EndSelect
-EndIf
-
-
-
-msgbox(4144, "Setup - WinMerge", "In order to " & $strAction & " the WinMerge Explorer context menu support all instances of Explorer must be restarted. This is a non-destructive process, although some of your current folder viewing windows may be discarded. Please finish any and all work in your Explorer windows before clicking [OK].")
-
-;Kill Explorer until there's no longer any copies running
-Do
- ProcessClose("Explorer.exe")
-Until ProcessExists("Explorer.exe") = 0
-
-
-
-;If the user properly specified the /u switch then...
-If $strCommand = "/U" Then
-
- ;Deletes the shell extension file
- FileDelete(@ScriptDir & "\ShellExtension.dll")
-
- ;If the user's WinMerge directory is empty then...
- If FileExists(@ScriptDir & "\*.*") = 0 Then
-
- ;Deletes the WinMerge directory
- DirRemove(@ScriptDir, 1)
- Endif
-EndIf
-
-
-Run(@WindowsDir & "\Explorer.exe", "", @SW_HIDE)
-WinWait("My Documents")
-WinClose("My Documents")
-
-;If the user properly specified the /u switch then...
-If $strCommand = "/U" Then
-
- ;If the file exists then the Exit Code will be 1 signifying an error
- Exit(FileExists(@ScriptDir & "\ShellExtension.dll"))
-EndIf
-
-
-
Deleted: branches/R2_6/Installer/InnoSetup/Setup Helper.exe
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-08 21:53:55
|
Revision: 3788
http://svn.sourceforge.net/winmerge/?rev=3788&view=rev
Author: gerundt
Date: 2006-11-08 13:53:38 -0800 (Wed, 08 Nov 2006)
Log Message:
-----------
PATCH: [ 1592609 ] Remove outdated files from installer
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
Removed Paths:
-------------
trunk/Installer/InnoSetup/Art/Gold Watch.ico
trunk/Installer/InnoSetup/Runtimes/psapi.dll
trunk/Installer/InnoSetup/Setup Helper.au3
trunk/Installer/InnoSetup/Setup Helper.exe
Deleted: trunk/Installer/InnoSetup/Art/Gold Watch.ico
===================================================================
(Binary files differ)
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-11-07 22:27:33 UTC (rev 3787)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-11-08 21:53:38 UTC (rev 3788)
@@ -1,3 +1,9 @@
+2006-11-08 Tim
+ PATCH: [ 1592609 ] Remove outdated files from installer
+ InnoSetup deleted files: Setup Helper.au3, Setup Helper.exe
+ InnoSetup/Art deleted files: Gold Watch.ico
+ InnoSetup/Runtimes deleted files: psapi.dll
+
2006-11-03 Kimmo
PATCH: [ 1589585 ] Install expat dlls
InnoSetup: WinMerge.iss
Deleted: trunk/Installer/InnoSetup/Runtimes/psapi.dll
===================================================================
(Binary files differ)
Deleted: trunk/Installer/InnoSetup/Setup Helper.au3
===================================================================
--- trunk/Installer/InnoSetup/Setup Helper.au3 2006-11-07 22:27:33 UTC (rev 3787)
+++ trunk/Installer/InnoSetup/Setup Helper.au3 2006-11-08 21:53:38 UTC (rev 3788)
@@ -1,86 +0,0 @@
-AutoItSetOption("MustDeclareVars", 1)
-
-Dim $strAction
-Dim $strCommand
-
-;If a user is running this .exe file then...
-If $CMDLine[0] = 0 Then
- ;Let the user know they shouldn't run this:
- msgbox(4144, "Setup - WinMerge", "Users: " & @CR & "This application is part of WinMerge's installation and removal processes. It is not meant to be run externally by users." & @CRLF & @CRLF & "Developers:" & @CRLF & @TAB & "/i - Restarts Explorer to initialize the ShellExtension.dll as Explorer's starts" & @CRLF & @TAB & "/u - Closes Explorer, deletes ShellExtension.dll, and then restarts explorer")
-
- ;Terminates the program
- exit
-Else
- ;Determines what the user's first command-line input parameter was
- $strCommand = StringUpper($CMDLine[1])
-
- msgbox(4144, "Setup Helper", "[$strCommand]=[" & $strCommand & "]")
-
-
- ;Analyzes the command-line input parameter
- Select
- ;If we received /i then...
- Case $strCommand = "/I"
- ;If the ShellExtension.dll file exists on the user's system then...
- If FileExists(@ScriptDir + "\ShellExtension.dll") = 1 Then
- ;The installer is trying to upgrade ShellExtension.dll
- $strAction="update"
- Else
- ;The installer is trying to install ShellExtension.dll
- $strAction="install"
- EndIf
-
- ;If we received /u then...
- Case $strCommand = "/U"
- ;The uninstaller is trying to uninstall ShellExtension.dll
- $strAction="uninstall"
-
- ;If the user specified an invalid bit of syntax then...
- Case Else
- ;Let the user know they shouldn't run this:
- msgbox(4144, "Setup - WinMerge", "Users: " & @CR & "This application is part of WinMerge's installation and removal processes. It is not meant to be run externally by users." & @CRLF & @CRLF & "Developers:" & @CRLF & @TAB & "/i - Restarts Explorer to initialize the ShellExtension.dll as Explorer's starts" & @CRLF & @TAB & "/u - Closes Explorer, deletes ShellExtension.dll, and then restarts explorer")
-
- ;Terminates the program
- exit
- EndSelect
-EndIf
-
-
-
-msgbox(4144, "Setup - WinMerge", "In order to " & $strAction & " the WinMerge Explorer context menu support all instances of Explorer must be restarted. This is a non-destructive process, although some of your current folder viewing windows may be discarded. Please finish any and all work in your Explorer windows before clicking [OK].")
-
-;Kill Explorer until there's no longer any copies running
-Do
- ProcessClose("Explorer.exe")
-Until ProcessExists("Explorer.exe") = 0
-
-
-
-;If the user properly specified the /u switch then...
-If $strCommand = "/U" Then
-
- ;Deletes the shell extension file
- FileDelete(@ScriptDir & "\ShellExtension.dll")
-
- ;If the user's WinMerge directory is empty then...
- If FileExists(@ScriptDir & "\*.*") = 0 Then
-
- ;Deletes the WinMerge directory
- DirRemove(@ScriptDir, 1)
- Endif
-EndIf
-
-
-Run(@WindowsDir & "\Explorer.exe", "", @SW_HIDE)
-WinWait("My Documents")
-WinClose("My Documents")
-
-;If the user properly specified the /u switch then...
-If $strCommand = "/U" Then
-
- ;If the file exists then the Exit Code will be 1 signifying an error
- Exit(FileExists(@ScriptDir & "\ShellExtension.dll"))
-EndIf
-
-
-
Deleted: trunk/Installer/InnoSetup/Setup Helper.exe
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-07 22:28:04
|
Revision: 3787
http://svn.sourceforge.net/winmerge/?rev=3787&view=rev
Author: gerundt
Date: 2006-11-07 14:27:33 -0800 (Tue, 07 Nov 2006)
Log Message:
-----------
PATCH: [ 1592234 ] Manual: Nicer Shortcut keys tables
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Shortcut_keys.xml
branches/R2_6/Docs/Users/Manual/css/all.css
branches/R2_6/Docs/Users/Manual/css/help.css
branches/R2_6/Docs/Users/Manual/css/print.css
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-07 22:25:09 UTC (rev 3786)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-07 22:27:33 UTC (rev 3787)
@@ -1,3 +1,8 @@
+2006-11-07 Tim
+ PATCH: [ 1592234 ] Manual: Nicer Shortcut keys tables
+ Manual: Shortcut_keys.xml
+ Manual/css: all.css help.css print.css
+
2006-11-06 Tim
PATCH: [ 1586878 ] Manual: Replace "aborted.png" with transpatent GIF version
Manual: Compare_dirs.xml
Modified: branches/R2_6/Docs/Users/Manual/Shortcut_keys.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Shortcut_keys.xml 2006-11-07 22:25:09 UTC (rev 3786)
+++ branches/R2_6/Docs/Users/Manual/Shortcut_keys.xml 2006-11-07 22:27:33 UTC (rev 3787)
@@ -627,6 +627,14 @@
<title>Find and Replace</title>
<tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Key</entry>
+
+ <entry>Function</entry>
+ </row>
+ </thead>
+
<tbody>
<row>
<entry><keycombo>
Modified: branches/R2_6/Docs/Users/Manual/css/all.css
===================================================================
--- branches/R2_6/Docs/Users/Manual/css/all.css 2006-11-07 22:25:09 UTC (rev 3786)
+++ branches/R2_6/Docs/Users/Manual/css/all.css 2006-11-07 22:27:33 UTC (rev 3787)
@@ -41,4 +41,23 @@
.warning {
background-color: #FFDDDD;
border: 1px solid red;
+}
+
+/* tables */
+.table table {
+ border-collapse: collapse;
+ border: 1px solid black;
+}
+
+.table th {
+ padding: 2px;
+ text-align: left;
+ color: white;
+ background: black;
+ border: 1px solid black;
+}
+
+.table td {
+ padding: 2px;
+ border: 1px solid black;
}
\ No newline at end of file
Modified: branches/R2_6/Docs/Users/Manual/css/help.css
===================================================================
--- branches/R2_6/Docs/Users/Manual/css/help.css 2006-11-07 22:25:09 UTC (rev 3786)
+++ branches/R2_6/Docs/Users/Manual/css/help.css 2006-11-07 22:27:33 UTC (rev 3787)
@@ -37,4 +37,23 @@
.warning {
background-color: #FFDDDD;
border: 1px solid red;
+}
+
+/* tables */
+.table table {
+ border-collapse: collapse;
+ border: 1px solid black;
+}
+
+.table th {
+ padding: 2px;
+ text-align: left;
+ color: white;
+ background: black;
+ border: 1px solid black;
+}
+
+.table td {
+ padding: 2px;
+ border: 1px solid black;
}
\ No newline at end of file
Modified: branches/R2_6/Docs/Users/Manual/css/print.css
===================================================================
--- branches/R2_6/Docs/Users/Manual/css/print.css 2006-11-07 22:25:09 UTC (rev 3786)
+++ branches/R2_6/Docs/Users/Manual/css/print.css 2006-11-07 22:27:33 UTC (rev 3787)
@@ -48,4 +48,24 @@
.warning {
background-color: white;
border: 1px solid black;
+}
+
+/* tables */
+.table table {
+ border-collapse: collapse;
+ border: 1px solid black;
+}
+
+.table th {
+ padding: 2px;
+ text-align: left;
+ color: black;
+ background: white;
+ border: 1px solid black;
+ border-bottom: 2px solid black;
+}
+
+.table td {
+ padding: 2px;
+ border: 1px solid black;
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-07 22:25:30
|
Revision: 3786
http://svn.sourceforge.net/winmerge/?rev=3786&view=rev
Author: gerundt
Date: 2006-11-07 14:25:09 -0800 (Tue, 07 Nov 2006)
Log Message:
-----------
PATCH: [ 1592234 ] Manual: Nicer Shortcut keys tables
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Shortcut_keys.xml
trunk/Docs/Users/Manual/css/all.css
trunk/Docs/Users/Manual/css/help.css
trunk/Docs/Users/Manual/css/print.css
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-11-07 17:13:32 UTC (rev 3785)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-11-07 22:25:09 UTC (rev 3786)
@@ -1,3 +1,8 @@
+2006-11-07 Tim
+ PATCH: [ 1592234 ] Manual: Nicer Shortcut keys tables
+ Manual: Shortcut_keys.xml
+ Manual/css: all.css help.css print.css
+
2006-11-06 Tim
PATCH: [ 1586878 ] Manual: Replace "aborted.png" with transpatent GIF version
Manual: Compare_dirs.xml
Modified: trunk/Docs/Users/Manual/Shortcut_keys.xml
===================================================================
--- trunk/Docs/Users/Manual/Shortcut_keys.xml 2006-11-07 17:13:32 UTC (rev 3785)
+++ trunk/Docs/Users/Manual/Shortcut_keys.xml 2006-11-07 22:25:09 UTC (rev 3786)
@@ -627,6 +627,14 @@
<title>Find and Replace</title>
<tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Key</entry>
+
+ <entry>Function</entry>
+ </row>
+ </thead>
+
<tbody>
<row>
<entry><keycombo>
Modified: trunk/Docs/Users/Manual/css/all.css
===================================================================
--- trunk/Docs/Users/Manual/css/all.css 2006-11-07 17:13:32 UTC (rev 3785)
+++ trunk/Docs/Users/Manual/css/all.css 2006-11-07 22:25:09 UTC (rev 3786)
@@ -41,4 +41,23 @@
.warning {
background-color: #FFDDDD;
border: 1px solid red;
+}
+
+/* tables */
+.table table {
+ border-collapse: collapse;
+ border: 1px solid black;
+}
+
+.table th {
+ padding: 2px;
+ text-align: left;
+ color: white;
+ background: black;
+ border: 1px solid black;
+}
+
+.table td {
+ padding: 2px;
+ border: 1px solid black;
}
\ No newline at end of file
Modified: trunk/Docs/Users/Manual/css/help.css
===================================================================
--- trunk/Docs/Users/Manual/css/help.css 2006-11-07 17:13:32 UTC (rev 3785)
+++ trunk/Docs/Users/Manual/css/help.css 2006-11-07 22:25:09 UTC (rev 3786)
@@ -37,4 +37,23 @@
.warning {
background-color: #FFDDDD;
border: 1px solid red;
+}
+
+/* tables */
+.table table {
+ border-collapse: collapse;
+ border: 1px solid black;
+}
+
+.table th {
+ padding: 2px;
+ text-align: left;
+ color: white;
+ background: black;
+ border: 1px solid black;
+}
+
+.table td {
+ padding: 2px;
+ border: 1px solid black;
}
\ No newline at end of file
Modified: trunk/Docs/Users/Manual/css/print.css
===================================================================
--- trunk/Docs/Users/Manual/css/print.css 2006-11-07 17:13:32 UTC (rev 3785)
+++ trunk/Docs/Users/Manual/css/print.css 2006-11-07 22:25:09 UTC (rev 3786)
@@ -48,4 +48,24 @@
.warning {
background-color: white;
border: 1px solid black;
+}
+
+/* tables */
+.table table {
+ border-collapse: collapse;
+ border: 1px solid black;
+}
+
+.table th {
+ padding: 2px;
+ text-align: left;
+ color: black;
+ background: white;
+ border: 1px solid black;
+ border-bottom: 2px solid black;
+}
+
+.table td {
+ padding: 2px;
+ border: 1px solid black;
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-07 17:14:00
|
Revision: 3785
http://svn.sourceforge.net/winmerge/?rev=3785&view=rev
Author: kimmov
Date: 2006-11-07 09:13:32 -0800 (Tue, 07 Nov 2006)
Log Message:
-----------
PATCH: [ 1591605 ] Add PCRE regexps and convert file filtering to PCRE
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileFilterMgr.cpp
trunk/Src/FileFilterMgr.h
trunk/Src/Merge.dsp
trunk/Src/Plugins.cpp
Added Paths:
-----------
trunk/Src/Ucs2Utf8.cpp
trunk/Src/Ucs2Utf8.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-07 17:07:45 UTC (rev 3784)
+++ trunk/Src/Changes.txt 2006-11-07 17:13:32 UTC (rev 3785)
@@ -5,6 +5,9 @@
2006-11-07 Kimmo
Add PCRE 6.7 (with windows build files from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib/)
New folder: /Externals/pcre
+ PATCH: [ 1591605 ] Add PCRE regexps and convert file filtering to PCRE
+ Src: FileFilterMgr.cpp FileFilterMgr.h Merge.dsp Plugins.cpp
+ Src new files: Ucs2Utf8.cpp Ucs2Utf8.h
2006-11-06 Takashi
PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
Modified: trunk/Src/FileFilterMgr.cpp
===================================================================
--- trunk/Src/FileFilterMgr.cpp 2006-11-07 17:07:45 UTC (rev 3784)
+++ trunk/Src/FileFilterMgr.cpp 2006-11-07 17:13:32 UTC (rev 3785)
@@ -3,9 +3,17 @@
// see FileFilterMgr.h for description
/////////////////////////////////////////////////////////////////////////////
// License (GPLv2+):
-// This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2 of the License, or (at your
+// option) any later version.
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
/////////////////////////////////////////////////////////////////////////////
/**
* @file FileFilterMgr.cpp
@@ -16,10 +24,12 @@
// $Id$
#include "stdafx.h"
+#include <string.h>
+#include "pcre.h"
#include "FileFilterMgr.h"
-#include "RegExp.h"
#include "UniFile.h"
#include "coretools.h"
+#include "Ucs2Utf8.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -37,7 +47,8 @@
while (!filterList.IsEmpty())
{
FileFilterElement &elem = filterList.GetHead();
- delete elem.pRegExp;
+ pcre_free(elem.pRegExp);
+ pcre_free(elem.pRegExpExtra);
filterList.RemoveHead();
}
}
@@ -177,18 +188,37 @@
if (str.IsEmpty())
return;
- CRegExp * regexp = new CRegExp;
+ const char * errormsg = NULL;
+ int erroroffset = 0;
+ char regexString[200] = {0};
+ int regexLen = 0;
+ int pcre_opts = 0;
+
+#ifdef UNICODE
+ // For unicode builds, use UTF-8.
+ // Convert pattern to UTF-8 and set option for PCRE to specify UTF-8.
+ regexLen = TransformUcs2ToUtf8((LPCTSTR)str, _tcslen(str),
+ regexString, sizeof(regexString));
+ pcre_opts |= PCRE_UTF8;
+#else
+ strcpy(regexString, (LPCTSTR)str);
+ regexLen = strlen(regexString);
+#endif
+
+ pcre *regexp = pcre_compile(regexString, pcre_opts, &errormsg,
+ &erroroffset, NULL);
if (regexp)
{
- if (regexp->RegComp(str))
- {
- FileFilterElement elem;
- elem.pRegExp = regexp;
+ FileFilterElement elem;
+ errormsg = NULL;
+
+ pcre_extra *pe = pcre_study(regexp, 0, &errormsg);
+ elem.pRegExp = regexp;
- filterList.AddTail(elem);
- }
- else
- delete regexp;
+ if (pe != NULL && errormsg != NULL)
+ elem.pRegExpExtra = pe;
+
+ filterList.AddTail(elem);
}
}
@@ -296,13 +326,31 @@
*/
BOOL TestAgainstRegList(const FileFilterList & filterList, LPCTSTR szTest)
{
- CString str = szTest;
- str.MakeUpper();
for (POSITION pos = filterList.GetHeadPosition(); pos; )
{
const FileFilterElement & elem = filterList.GetNext(pos);
- CRegExp * regexp = elem.pRegExp;
- if (regexp->RegFind(str) != -1)
+ int ovector[30];
+ char compString[200] = {0};
+ int stringLen = 0;
+ TCHAR * tempName = _tcsdup(szTest); // Create temp copy for conversions
+ TCHAR * cmpStr = _tcsupr(tempName);
+
+#ifdef UNICODE
+ stringLen = TransformUcs2ToUtf8(cmpStr, _tcslen(cmpStr),
+ compString, sizeof(compString));
+#else
+ strcpy(compString, cmpStr);
+ stringLen = strlen(compString);
+#endif
+
+ pcre * regexp = elem.pRegExp;
+ pcre_extra * extra = elem.pRegExpExtra;
+ int result = pcre_exec(regexp, extra, compString, stringLen,
+ 0, 0, ovector, 30);
+
+ free(tempName);
+
+ if (result >= 0)
return TRUE;
}
return FALSE;
Modified: trunk/Src/FileFilterMgr.h
===================================================================
--- trunk/Src/FileFilterMgr.h 2006-11-07 17:07:45 UTC (rev 3784)
+++ trunk/Src/FileFilterMgr.h 2006-11-07 17:13:32 UTC (rev 3785)
@@ -1,14 +1,16 @@
/////////////////////////////////////////////////////////////////////////////
-// FileFilterMgr.h : declaration file
-//
-// The FileFilterMgr loads a collection of named file filters from disk,
-// and provides lookup access by name, or array access by index, to these
-// named filters. It also provides test functions for actually using the filters.
-/////////////////////////////////////////////////////////////////////////////
// License (GPLv2+):
-// This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
/////////////////////////////////////////////////////////////////////////////
/**
* @file FileFilterMgr.h
@@ -25,8 +27,8 @@
#ifndef __AFXTEMPL_H__
#include <afxtempl.h>
#endif
+#include "pcre.h"
-class CRegExp;
struct FileFilterElement;
/**
* @brief List of file filtering rules.
@@ -52,12 +54,16 @@
* regular expression there is boolean value for defining if rule
* is inclusive or exclusive. File filters have global inclusive/exclusive
* selection but this per-rule setting overwrites it.
+ *
+ * We are using PCRE for regular expressions and pRegExp points to compiled
+ * regular expression. pRegExpExtra contains additional information about
+ * the expression used to optimize matching.
*/
struct FileFilterElement
{
- CRegExp *pRegExp; /**< Pointer to regexp */
- CString sRule; /**< Uncompiled rule text */
- FileFilterElement() : pRegExp(NULL) { };
+ pcre *pRegExp; /**< Compiled regular expression */
+ pcre_extra *pRegExpExtra; /**< Additional information got from regex study */
+ FileFilterElement() : pRegExp(NULL), pRegExpExtra(NULL) { };
};
struct FileFilter;
@@ -67,7 +73,12 @@
*
* The FileFilterMgr loads a collection of named file filters from disk,
* and provides lookup access by name, or array access by index, to these
- * named filters. It also provides test functions for actually using the filters.
+ * named filters. It also provides test functions for actually using the
+ * filters.
+ *
+ * We are using PCRE for regular expressions. Nice thing in PCRE is it supports
+ * UTF-8 unicode, unlike many other libs. For ANSI builds we use just ansi
+ * strings, and for unicode we must first convert strings to UTF-8.
*/
class FileFilterMgr
{
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2006-11-07 17:07:45 UTC (rev 3784)
+++ trunk/Src/Merge.dsp 2006-11-07 17:13:32 UTC (rev 3785)
@@ -45,7 +45,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /FR /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /I "..\Externals\pcre\pcre-6.7" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /FR /Yu"stdafx.h" /FD /EHa /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
@@ -55,7 +55,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeDebug/WinMerge.exe" /pdbtype:sept /libpath:"..\Build\expat"
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeDebug/WinMerge.exe" /pdbtype:sept /libpath:"..\Build\expat" /libpath:"..\Build\pcre"
!ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
@@ -72,7 +72,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I "..\common" /I ".\editlib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /FR /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FR /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /I "..\Externals\pcre\pcre-6.7" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FR /Yu"stdafx.h" /FD /EHa /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
@@ -82,7 +82,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/WinMerge.exe" /pdbtype:sept
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpatw.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/WinMergeU.exe" /pdbtype:sept /libpath:"..\Build\expat"
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpatw.lib pcre.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/WinMergeU.exe" /pdbtype:sept /libpath:"..\Build\expat" /libpath:"..\Build\pcre"
!ELSEIF "$(CFG)" == "Merge - Win32 Release"
@@ -99,7 +99,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W4 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /I "..\Externals\pcre\pcre-6.7" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /Yu"stdafx.h" /FD /EHa /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
@@ -110,7 +110,7 @@
LINK32=link.exe
# ADD BASE LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /verbose:lib
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /libpath:"..\Build\expat" /verbose:lib
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /libpath:"..\Build\expat" /libpath:"..\Build\pcre" /verbose:lib
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -128,7 +128,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W4 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /I "..\Externals\pcre\pcre-6.7" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /Yu"stdafx.h" /FD /EHa /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
@@ -139,7 +139,7 @@
LINK32=link.exe
# ADD BASE LINK32 version.lib shlwapi.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease\WinMergeU.exe" /verbose:lib
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpatw.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease\WinMergeU.exe" /libpath:"..\Build\expat" /verbose:lib
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpatw.lib pcre.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease\WinMergeU.exe" /libpath:"..\Build\expat" /libpath:"..\Build\pcre" /verbose:lib
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -872,6 +872,10 @@
# End Source File
# Begin Source File
+SOURCE=.\Ucs2Utf8.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Common\unicoder.cpp
# End Source File
# Begin Source File
@@ -1465,6 +1469,10 @@
# End Source File
# Begin Source File
+SOURCE=.\Ucs2Utf8.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Common\unicoder.h
# End Source File
# Begin Source File
Modified: trunk/Src/Plugins.cpp
===================================================================
--- trunk/Src/Plugins.cpp 2006-11-07 17:07:45 UTC (rev 3784)
+++ trunk/Src/Plugins.cpp 2006-11-07 17:13:32 UTC (rev 3785)
@@ -31,12 +31,14 @@
#include <afxmt.h>
#endif
+#include "pcre.h"
+#include "Ucs2Utf8.h"
#include "FileTransform.h"
#include "FileFilterMgr.h"
#include "Plugins.h"
#include "lwdisp.h"
#include "coretools.h"
-#include "RegExp.h"
+//#include "RegExp.h"
#include "resource.h"
#include "Exceptions.h"
#include "RegKey.h"
@@ -280,16 +282,38 @@
sPiece.TrimLeft();
sPiece.MakeUpper();
- CRegExp * regexp = new CRegExp;
+// CRegExp * regexp = new CRegExp;
FileFilterElement element;
- if (regexp->RegComp(sPiece))
+/* if (regexp->RegComp(sPiece))
{
element.pRegExp = regexp;
filters->AddTail(element);
}
else
delete regexp;
+*/
+ const char * errormsg = NULL;
+ //char errormsg[200] = {0};
+ int erroroffset = 0;
+ char regexString[200] = {0};
+ int regexLen = 0;
+#ifdef UNICODE
+ regexLen = TransformUcs2ToUtf8((LPCTSTR)sPiece, _tcslen(sPiece),
+ regexString, sizeof(regexString));
+#else
+ strcpy(regexString, (LPCTSTR)sPiece);
+ regexLen = strlen(regexString);
+#endif
+
+ pcre *regexp = pcre_compile(regexString, 0, &errormsg, &erroroffset, NULL);
+ if (regexp)
+ {
+ FileFilterElement elem;
+ elem.pRegExp = regexp;
+ filters->AddTail(elem);
+ }
+
};
}
Added: trunk/Src/Ucs2Utf8.cpp
===================================================================
--- trunk/Src/Ucs2Utf8.cpp (rev 0)
+++ trunk/Src/Ucs2Utf8.cpp 2006-11-07 17:13:32 UTC (rev 3785)
@@ -0,0 +1,93 @@
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or (at
+// your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file Ucs2Utf8.cpp
+ *
+ * @brief UCS-2 <--> UTF-8 conversion routines implementation.
+ */
+
+#include "stdafx.h"
+#include "unicoder.h"
+#include "Ucs2Utf8.h"
+
+/**
+ * @brief Copy UCS-2LE string to UTF-8 string
+ *
+ * @param nUcs is the size in wide characters of the source string
+ * @param nUtf is the size in bytes of the resulting string
+ *
+ * @return if nUtf = 0, return the size required for the translation buffer
+ */
+UINT TransformUcs2ToUtf8(LPCWSTR psUcs, UINT nUcs, LPSTR pcsUtf, UINT nUtf)
+{
+ if (nUtf == 0)
+ // just tell required length
+ return ucr::Utf8len_of_string(psUcs, nUcs);
+
+ // the buffer is allocated, output in it directly
+ unsigned char * pc = (unsigned char *) pcsUtf;
+ int nremains = nUtf;
+
+ // quick way
+ UINT i=0;
+ for (i = 0 ; i < nUcs && nremains > 10; ++i)
+ nremains -= ucr::to_utf8_advance(psUcs[i], pc);
+
+ // be careful for the end of the buffer, risk of overflow because
+ // of the variable length of the UTF-8 character
+ unsigned char smallTempBuffer[20];
+ int nremainsend = nremains;
+ unsigned char * pcTemp = (unsigned char *) smallTempBuffer;
+ for ( ; i < nUcs && nremainsend > 0; ++i)
+ nremainsend -= ucr::to_utf8_advance(psUcs[i], pcTemp);
+
+ int ncomplement = min(nremains, pcTemp-smallTempBuffer);
+ CopyMemory(pc, smallTempBuffer, ncomplement);
+ nremains -= ncomplement;
+
+ // return number of written bytes
+ return (nUtf - nremains);
+}
+
+/**
+ * @brief Copy UTF-8 string to UCS-2LE string
+ *
+ * @return if nUcs = 0, return the size required for the translation buffer
+ */
+UINT TransformUtf8ToUcs2(LPCSTR pcsUtf, UINT nUtf, LPWSTR psUcs, UINT nUcs)
+{
+ if (nUcs == 0)
+ // just tell required length
+ return ucr::stringlen_of_utf8(pcsUtf, nUtf);
+
+ // the buffer is allocated, output in it directly
+ unsigned char * pUtf = (unsigned char * ) pcsUtf;
+ LPWSTR pwc = psUcs;
+ int nremains = nUcs;
+
+ for (UINT i = 0 ; i < nUtf && nremains > 0; )
+ {
+ *pwc++ = ucr::GetUtf8Char(pUtf+i);
+ nremains --;
+ int chlen = ucr::Utf8len_fromLeadByte(pUtf[i]);
+ if (chlen < 1) chlen = 1;
+ i += chlen;
+ }
+
+ // return number of written wchars
+ return (nUtf - nremains);
+}
Added: trunk/Src/Ucs2Utf8.h
===================================================================
--- trunk/Src/Ucs2Utf8.h (rev 0)
+++ trunk/Src/Ucs2Utf8.h 2006-11-07 17:13:32 UTC (rev 3785)
@@ -0,0 +1,30 @@
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file Ucs2Utf8.h
+ *
+ * @brief Declaration for UCS-2 <--> UTF-8 conversions functions.
+ *
+ */
+
+#ifndef _UCS2UTF8_H_
+#define _UCS2UTF8_H_
+
+UINT TransformUcs2ToUtf8(LPCWSTR psUcs, UINT nUcs, LPSTR pcsUtf, UINT nUtf);
+UINT TransformUtf8ToUcs2(LPCSTR pcsUtf, UINT nUtf, LPWSTR psUcs, UINT nUcs);
+
+#endif // _UCS2UTF8_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-07 17:07:51
|
Revision: 3784
http://svn.sourceforge.net/winmerge/?rev=3784&view=rev
Author: kimmov
Date: 2006-11-07 09:07:45 -0800 (Tue, 07 Nov 2006)
Log Message:
-----------
Add building instructions for PCRE
Modified Paths:
--------------
trunk/Docs/Developers/Changes.txt
trunk/Docs/Developers/readme-developers.html
Modified: trunk/Docs/Developers/Changes.txt
===================================================================
--- trunk/Docs/Developers/Changes.txt 2006-11-07 16:58:51 UTC (rev 3783)
+++ trunk/Docs/Developers/Changes.txt 2006-11-07 17:07:45 UTC (rev 3784)
@@ -1,3 +1,7 @@
+2006-11-07 Kimmo
+ Add building instructions for PCRE
+ Developers: readme-developers.html
+
2006-11-05 Kimmo
Update building instructions for expat and scew (a lot simpler now)
Developers: readme-developers.html
Modified: trunk/Docs/Developers/readme-developers.html
===================================================================
--- trunk/Docs/Developers/readme-developers.html 2006-11-07 16:58:51 UTC (rev 3783)
+++ trunk/Docs/Developers/readme-developers.html 2006-11-07 17:07:45 UTC (rev 3784)
@@ -149,11 +149,22 @@
<li>Select Rebuild All</li>
</ul></p>
-<p>After build finishes, lib and dll files are in <code>/Build/expat</code>. WinMerge
-executable's project file picks them from there. scew is a static library and it
-automatically selects the correct .lib file to use. See <code>/Externals/scew/scew/scew.h</code>
-for more info how it is done.</p>
+<h4>Compiling PCRE</h4>
+<p>PCRE is in <code>/Externals/pcre</code> folder in source tree. To compile PCRE:<br>
+<ul>
+ <li>Open Visual Studio workspace file <code>/Externals/pcre/pcre.dsp</code> If you are
+ using Visual Studio 2003.Net or later you need to convert the file to new format when
+ Visual Studio opens the file.</li>
+ <li>Select from Visual Studio menu Build / Batch Build</li>
+ <li>Select <code>config_pcre</code> and <code>pcre</code> projects and build them</li>
+ <li>Select Rebuild All</li>
+ <li><i>Or</i> you can also compile those two projects individually, first
+ <code>config_pcre</code> and then <code>pcre</code> project.
+</ul></p>
+<p>After build finishes, lib and dll files are in <code>/Build/pcre</code>. WinMerge
+executable's project file picks them from there.</p>
+
<h4>Compiling WinMerge executable targets</h4>
<p>There are several targets available for compiling different projects. Targets used
for compiling releases are:<br>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-07 16:59:02
|
Revision: 3783
http://svn.sourceforge.net/winmerge/?rev=3783&view=rev
Author: kimmov
Date: 2006-11-07 08:58:51 -0800 (Tue, 07 Nov 2006)
Log Message:
-----------
Copy lib and dll files to /Build/pcre
Modified Paths:
--------------
trunk/Externals/pcre/Changes.txt
trunk/Externals/pcre/dll_pcre/pcre.dsp
Modified: trunk/Externals/pcre/Changes.txt
===================================================================
--- trunk/Externals/pcre/Changes.txt 2006-11-07 16:43:54 UTC (rev 3782)
+++ trunk/Externals/pcre/Changes.txt 2006-11-07 16:58:51 UTC (rev 3783)
@@ -2,4 +2,6 @@
Add PCRE to /Externals/pcre
New folder: /Externals/pcre
Fix dll target project file to actually produce a valid dll file
- pcre/dll_pcre: pcre.dsp
\ No newline at end of file
+ pcre/dll_pcre: pcre.dsp
+ Copy lib and dll files to /Build/pcre
+ pcre/dll_pcre: pcre.dsp
Modified: trunk/Externals/pcre/dll_pcre/pcre.dsp
===================================================================
--- trunk/Externals/pcre/dll_pcre/pcre.dsp 2006-11-07 16:43:54 UTC (rev 3782)
+++ trunk/Externals/pcre/dll_pcre/pcre.dsp 2006-11-07 16:58:51 UTC (rev 3783)
@@ -55,6 +55,10 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=mkdir ..\..\..\Build\pcre Copy ..\bin\release\pcre.lib ..\..\..\Build\pcre Copy ..\bin\release\pcre.dll ..\..\..\Build\pcre
+# End Special Build Tool
!ELSEIF "$(CFG)" == "pcre - Win32 Debug"
@@ -82,6 +86,10 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=mkdir ..\..\..\Build\pcre Copy ..\bin\release\pcre.lib ..\..\..\Build\pcre Copy ..\bin\debug\pcre.dll ..\..\..\Build\pcre
+# End Special Build Tool
!ENDIF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-07 16:44:09
|
Revision: 3782
http://svn.sourceforge.net/winmerge/?rev=3782&view=rev
Author: kimmov
Date: 2006-11-07 08:43:54 -0800 (Tue, 07 Nov 2006)
Log Message:
-----------
Fix dll target project file to actually produce a valid dll file
Modified Paths:
--------------
trunk/Externals/pcre/dll_pcre/pcre.dsp
Added Paths:
-----------
trunk/Externals/pcre/Changes.txt
Added: trunk/Externals/pcre/Changes.txt
===================================================================
--- trunk/Externals/pcre/Changes.txt (rev 0)
+++ trunk/Externals/pcre/Changes.txt 2006-11-07 16:43:54 UTC (rev 3782)
@@ -0,0 +1,5 @@
+2006-11-07 Kimmo
+ Add PCRE to /Externals/pcre
+ New folder: /Externals/pcre
+ Fix dll target project file to actually produce a valid dll file
+ pcre/dll_pcre: pcre.dsp
\ No newline at end of file
Modified: trunk/Externals/pcre/dll_pcre/pcre.dsp
===================================================================
--- trunk/Externals/pcre/dll_pcre/pcre.dsp 2006-11-07 16:28:04 UTC (rev 3781)
+++ trunk/Externals/pcre/dll_pcre/pcre.dsp 2006-11-07 16:43:54 UTC (rev 3782)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PCRE_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\bin" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PCRE_EXPORTS" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\bin" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PCRE_EXPORTS" /D "DLL_EXPORT" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-07 16:30:38
|
Revision: 3781
http://svn.sourceforge.net/winmerge/?rev=3781&view=rev
Author: kimmov
Date: 2006-11-07 08:28:04 -0800 (Tue, 07 Nov 2006)
Log Message:
-----------
Add PCRE 6.7 (with windows build files from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib/)
Modified Paths:
--------------
trunk/Src/Changes.txt
Added Paths:
-----------
trunk/Externals/pcre/
trunk/Externals/pcre/config_pcre/
trunk/Externals/pcre/config_pcre/config_pcre.dsp
trunk/Externals/pcre/config_pcre/configure.mak
trunk/Externals/pcre/dll_pcre/
trunk/Externals/pcre/dll_pcre/pcre.dsp
trunk/Externals/pcre/lib_pcre/
trunk/Externals/pcre/lib_pcre/lib_pcre.dsp
trunk/Externals/pcre/lib_pcreposix/
trunk/Externals/pcre/lib_pcreposix/lib_pcreposix.dsp
trunk/Externals/pcre/pcre-6.7/
trunk/Externals/pcre/pcre-6.7/AUTHORS
trunk/Externals/pcre/pcre-6.7/COPYING
trunk/Externals/pcre/pcre-6.7/ChangeLog
trunk/Externals/pcre/pcre-6.7/INSTALL
trunk/Externals/pcre/pcre-6.7/LICENCE
trunk/Externals/pcre/pcre-6.7/Makefile.in
trunk/Externals/pcre/pcre-6.7/NEWS
trunk/Externals/pcre/pcre-6.7/NON-UNIX-USE
trunk/Externals/pcre/pcre-6.7/README
trunk/Externals/pcre/pcre-6.7/RunGrepTest.in
trunk/Externals/pcre/pcre-6.7/RunTest.in
trunk/Externals/pcre/pcre-6.7/config.guess
trunk/Externals/pcre/pcre-6.7/config.h.in
trunk/Externals/pcre/pcre-6.7/config.sub
trunk/Externals/pcre/pcre-6.7/configure
trunk/Externals/pcre/pcre-6.7/configure.ac
trunk/Externals/pcre/pcre-6.7/dftables.c
trunk/Externals/pcre/pcre-6.7/doc/
trunk/Externals/pcre/pcre-6.7/doc/Tech.Notes
trunk/Externals/pcre/pcre-6.7/doc/html/
trunk/Externals/pcre/pcre-6.7/doc/html/index.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_compile.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_compile2.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_config.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_copy_named_substring.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_copy_substring.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_dfa_exec.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_exec.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_free_substring.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_free_substring_list.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_fullinfo.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_get_named_substring.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_get_stringnumber.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_get_stringtable_entries.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_get_substring.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_get_substring_list.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_info.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_maketables.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_refcount.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_study.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcre_version.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcreapi.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcrebuild.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcrecallout.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcrecompat.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcrecpp.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcregrep.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcrematching.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcrepartial.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcrepattern.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcreperform.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcreposix.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcreprecompile.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcresample.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcrestack.html
trunk/Externals/pcre/pcre-6.7/doc/html/pcretest.html
trunk/Externals/pcre/pcre-6.7/doc/pcre.3
trunk/Externals/pcre/pcre-6.7/doc/pcre.txt
trunk/Externals/pcre/pcre-6.7/doc/pcre_compile.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_compile2.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_config.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_copy_named_substring.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_copy_substring.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_dfa_exec.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_exec.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_free_substring.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_free_substring_list.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_fullinfo.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_get_named_substring.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_get_stringnumber.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_get_stringtable_entries.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_get_substring.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_get_substring_list.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_info.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_maketables.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_refcount.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_study.3
trunk/Externals/pcre/pcre-6.7/doc/pcre_version.3
trunk/Externals/pcre/pcre-6.7/doc/pcreapi.3
trunk/Externals/pcre/pcre-6.7/doc/pcrebuild.3
trunk/Externals/pcre/pcre-6.7/doc/pcrecallout.3
trunk/Externals/pcre/pcre-6.7/doc/pcrecompat.3
trunk/Externals/pcre/pcre-6.7/doc/pcrecpp.3
trunk/Externals/pcre/pcre-6.7/doc/pcregrep.1
trunk/Externals/pcre/pcre-6.7/doc/pcregrep.txt
trunk/Externals/pcre/pcre-6.7/doc/pcrematching.3
trunk/Externals/pcre/pcre-6.7/doc/pcrepartial.3
trunk/Externals/pcre/pcre-6.7/doc/pcrepattern.3
trunk/Externals/pcre/pcre-6.7/doc/pcreperform.3
trunk/Externals/pcre/pcre-6.7/doc/pcreposix.3
trunk/Externals/pcre/pcre-6.7/doc/pcreprecompile.3
trunk/Externals/pcre/pcre-6.7/doc/pcresample.3
trunk/Externals/pcre/pcre-6.7/doc/pcrestack.3
trunk/Externals/pcre/pcre-6.7/doc/pcretest.1
trunk/Externals/pcre/pcre-6.7/doc/pcretest.txt
trunk/Externals/pcre/pcre-6.7/doc/perltest.txt
trunk/Externals/pcre/pcre-6.7/install-sh
trunk/Externals/pcre/pcre-6.7/libpcre.def
trunk/Externals/pcre/pcre-6.7/libpcre.pc.in
trunk/Externals/pcre/pcre-6.7/libpcreposix.def
trunk/Externals/pcre/pcre-6.7/ltmain.sh
trunk/Externals/pcre/pcre-6.7/makevp.bat
trunk/Externals/pcre/pcre-6.7/mkinstalldirs
trunk/Externals/pcre/pcre-6.7/pcre-config.in
trunk/Externals/pcre/pcre-6.7/pcre.def
trunk/Externals/pcre/pcre-6.7/pcre.h
trunk/Externals/pcre/pcre-6.7/pcre_compile.c
trunk/Externals/pcre/pcre-6.7/pcre_config.c
trunk/Externals/pcre/pcre-6.7/pcre_dfa_exec.c
trunk/Externals/pcre/pcre-6.7/pcre_exec.c
trunk/Externals/pcre/pcre-6.7/pcre_fullinfo.c
trunk/Externals/pcre/pcre-6.7/pcre_get.c
trunk/Externals/pcre/pcre-6.7/pcre_globals.c
trunk/Externals/pcre/pcre-6.7/pcre_info.c
trunk/Externals/pcre/pcre-6.7/pcre_internal.h
trunk/Externals/pcre/pcre-6.7/pcre_maketables.c
trunk/Externals/pcre/pcre-6.7/pcre_ord2utf8.c
trunk/Externals/pcre/pcre-6.7/pcre_printint.src
trunk/Externals/pcre/pcre-6.7/pcre_refcount.c
trunk/Externals/pcre/pcre-6.7/pcre_scanner.cc
trunk/Externals/pcre/pcre-6.7/pcre_scanner.h
trunk/Externals/pcre/pcre-6.7/pcre_scanner_unittest.cc
trunk/Externals/pcre/pcre-6.7/pcre_stringpiece.cc
trunk/Externals/pcre/pcre-6.7/pcre_stringpiece.h.in
trunk/Externals/pcre/pcre-6.7/pcre_stringpiece_unittest.cc
trunk/Externals/pcre/pcre-6.7/pcre_study.c
trunk/Externals/pcre/pcre-6.7/pcre_tables.c
trunk/Externals/pcre/pcre-6.7/pcre_try_flipped.c
trunk/Externals/pcre/pcre-6.7/pcre_ucp_searchfuncs.c
trunk/Externals/pcre/pcre-6.7/pcre_valid_utf8.c
trunk/Externals/pcre/pcre-6.7/pcre_version.c
trunk/Externals/pcre/pcre-6.7/pcre_xclass.c
trunk/Externals/pcre/pcre-6.7/pcrecpp.cc
trunk/Externals/pcre/pcre-6.7/pcrecpp.h
trunk/Externals/pcre/pcre-6.7/pcrecpp_unittest.cc
trunk/Externals/pcre/pcre-6.7/pcrecpparg.h.in
trunk/Externals/pcre/pcre-6.7/pcredemo.c
trunk/Externals/pcre/pcre-6.7/pcregrep.c
trunk/Externals/pcre/pcre-6.7/pcreposix.c
trunk/Externals/pcre/pcre-6.7/pcreposix.h
trunk/Externals/pcre/pcre-6.7/pcretest.c
trunk/Externals/pcre/pcre-6.7/perltest
trunk/Externals/pcre/pcre-6.7/testdata/
trunk/Externals/pcre/pcre-6.7/testdata/grepinput
trunk/Externals/pcre/pcre-6.7/testdata/grepinputx
trunk/Externals/pcre/pcre-6.7/testdata/greplist
trunk/Externals/pcre/pcre-6.7/testdata/grepoutput
trunk/Externals/pcre/pcre-6.7/testdata/testinput1
trunk/Externals/pcre/pcre-6.7/testdata/testinput2
trunk/Externals/pcre/pcre-6.7/testdata/testinput3
trunk/Externals/pcre/pcre-6.7/testdata/testinput4
trunk/Externals/pcre/pcre-6.7/testdata/testinput5
trunk/Externals/pcre/pcre-6.7/testdata/testinput6
trunk/Externals/pcre/pcre-6.7/testdata/testinput7
trunk/Externals/pcre/pcre-6.7/testdata/testinput8
trunk/Externals/pcre/pcre-6.7/testdata/testinput9
trunk/Externals/pcre/pcre-6.7/testdata/testoutput1
trunk/Externals/pcre/pcre-6.7/testdata/testoutput2
trunk/Externals/pcre/pcre-6.7/testdata/testoutput3
trunk/Externals/pcre/pcre-6.7/testdata/testoutput4
trunk/Externals/pcre/pcre-6.7/testdata/testoutput5
trunk/Externals/pcre/pcre-6.7/testdata/testoutput6
trunk/Externals/pcre/pcre-6.7/testdata/testoutput7
trunk/Externals/pcre/pcre-6.7/testdata/testoutput8
trunk/Externals/pcre/pcre-6.7/testdata/testoutput9
trunk/Externals/pcre/pcre-6.7/ucp.h
trunk/Externals/pcre/pcre-6.7/ucpinternal.h
trunk/Externals/pcre/pcre-6.7/ucptable.c
trunk/Externals/pcre/pcre.dsw
trunk/Externals/pcre/pcretest/
trunk/Externals/pcre/pcretest/pcretest.dsp
Added: trunk/Externals/pcre/config_pcre/config_pcre.dsp
===================================================================
--- trunk/Externals/pcre/config_pcre/config_pcre.dsp (rev 0)
+++ trunk/Externals/pcre/config_pcre/config_pcre.dsp 2006-11-07 16:28:04 UTC (rev 3781)
@@ -0,0 +1,58 @@
+# Microsoft Developer Studio Project File - Name="config_pcre" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=config_pcre - Win32 Configure
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "config_pcre.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "config_pcre.mak" CFG="config_pcre - Win32 Configure"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "config_pcre - Win32 Configure" (based on "Win32 (x86) External Target")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Configure"
+# PROP BASE Intermediate_Dir "Configure"
+# PROP BASE Cmd_Line "nmake /f "configure.mak""
+# PROP BASE Rebuild_Opt "/a rebuild"
+# PROP BASE Target_File "..\bin\pcre_chartables.c"
+# PROP BASE Bsc_Name ""
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\bin"
+# PROP Intermediate_Dir "."
+# PROP Cmd_Line "nmake /f "configure.mak""
+# PROP Rebuild_Opt "/a rebuild"
+# PROP Target_File "..\bin\pcre_chartables.c"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+# Begin Target
+
+# Name "config_pcre - Win32 Configure"
+
+!IF "$(CFG)" == "config_pcre - Win32 Configure"
+
+!ENDIF
+
+# Begin Source File
+
+SOURCE=.\configure.mak
+# End Source File
+# End Target
+# End Project
Added: trunk/Externals/pcre/config_pcre/configure.mak
===================================================================
--- trunk/Externals/pcre/config_pcre/configure.mak (rev 0)
+++ trunk/Externals/pcre/config_pcre/configure.mak 2006-11-07 16:28:04 UTC (rev 3781)
@@ -0,0 +1,55 @@
+#
+# Initial configuration for Win32
+#
+
+BIN = ..\bin
+SOURCES = ..\pcre-6.7
+
+H_config = $(BIN)\config.h
+I_config = $(SOURCES)\config.h.in
+
+C_dftables = $(SOURCES)\dftables.c
+X_dftables = $(BIN)\dftables.exe
+
+C_chartables = $(BIN)\pcre_chartables.c
+
+TARGETS = $(H_config) $(C_chartables)
+
+all : $(TARGETS)
+
+clean : ; -del $(TARGETS)
+
+rebuild : clean all
+
+#
+# Generate config.h for Win32
+#
+
+$(H_config) : $(I_config) configure.mak
+ if not exist $(BIN) mkdir $(BIN)
+ copy $(I_config) + << $@
+
+/* Automatically added for Win32 compilation */
+#define SUPPORT_UCP
+#define SUPPORT_UTF8
+
+<<
+ edlin $@ < <<
+1S#define HAVE_MEMMOVE
+.
+#define HAVE_MEMMOVE 1
+1S#define HAVE_STRERROR
+.
+#define HAVE_STRERROR 1
+E
+<<
+
+#
+# Generate pcre_chartables.c by a compile and run of dftables
+#
+
+$(X_dftables) : $(C_dftables) $(H_config)
+ cl /nologo /I$(BIN) /Fe$@ $(C_dftables)
+
+$(C_chartables) : $(X_dftables)
+ $(X_dftables) $@
Added: trunk/Externals/pcre/dll_pcre/pcre.dsp
===================================================================
--- trunk/Externals/pcre/dll_pcre/pcre.dsp (rev 0)
+++ trunk/Externals/pcre/dll_pcre/pcre.dsp 2006-11-07 16:28:04 UTC (rev 3781)
@@ -0,0 +1,169 @@
+# Microsoft Developer Studio Project File - Name="pcre" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=pcre - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "pcre.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "pcre.mak" CFG="pcre - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "pcre - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "pcre - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "pcre - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\bin\release"
+# PROP Intermediate_Dir "o\release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PCRE_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\bin" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PCRE_EXPORTS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+
+!ELSEIF "$(CFG)" == "pcre - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\bin\debug"
+# PROP Intermediate_Dir "o\debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PCRE_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\bin" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PCRE_EXPORTS" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "pcre - Win32 Release"
+# Name "pcre - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\bin\pcre_chartables.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_compile.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_config.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_dfa_exec.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_exec.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_fullinfo.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_get.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_globals.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_info.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_maketables.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_ord2utf8.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_refcount.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_study.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_tables.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_try_flipped.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_ucp_searchfuncs.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_valid_utf8.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_version.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_xclass.c"
+# End Source File
+# End Target
+# End Project
Added: trunk/Externals/pcre/lib_pcre/lib_pcre.dsp
===================================================================
--- trunk/Externals/pcre/lib_pcre/lib_pcre.dsp (rev 0)
+++ trunk/Externals/pcre/lib_pcre/lib_pcre.dsp 2006-11-07 16:28:04 UTC (rev 3781)
@@ -0,0 +1,162 @@
+# Microsoft Developer Studio Project File - Name="lib_pcre" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=lib_pcre - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "lib_pcre.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "lib_pcre.mak" CFG="lib_pcre - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "lib_pcre - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "lib_pcre - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "lib_pcre - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\bin\release"
+# PROP Intermediate_Dir "o\release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\bin" /D "NDEBUG" /D "_LIB" /D "PCRE_STATIC" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "lib_pcre - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\bin\debug"
+# PROP Intermediate_Dir "o\debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\bin" /D "_DEBUG" /D "_LIB" /D "PCRE_STATIC" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "lib_pcre - Win32 Release"
+# Name "lib_pcre - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\bin\pcre_chartables.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_compile.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_config.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_dfa_exec.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_exec.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_fullinfo.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_get.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_globals.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_info.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_maketables.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_ord2utf8.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_refcount.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_study.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_tables.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_try_flipped.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_ucp_searchfuncs.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_valid_utf8.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_version.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcre_xclass.c"
+# End Source File
+# End Target
+# End Project
Added: trunk/Externals/pcre/lib_pcreposix/lib_pcreposix.dsp
===================================================================
--- trunk/Externals/pcre/lib_pcreposix/lib_pcreposix.dsp (rev 0)
+++ trunk/Externals/pcre/lib_pcreposix/lib_pcreposix.dsp 2006-11-07 16:28:04 UTC (rev 3781)
@@ -0,0 +1,90 @@
+# Microsoft Developer Studio Project File - Name="lib_pcreposix" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=lib_pcreposix - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "lib_pcreposix.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "lib_pcreposix.mak" CFG="lib_pcreposix - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "lib_pcreposix - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "lib_pcreposix - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "lib_pcreposix - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\bin\release"
+# PROP Intermediate_Dir "o\release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\bin" /D "NDEBUG" /D "_LIB" /D "PCRE_STATIC" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "lib_pcreposix - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\bin\debug"
+# PROP Intermediate_Dir "o\debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\bin" /D "_DEBUG" /D "_LIB" /D "PCRE_STATIC" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "lib_pcreposix - Win32 Release"
+# Name "lib_pcreposix - Win32 Debug"
+# Begin Source File
+
+SOURCE="..\pcre-6.7\pcreposix.c"
+# End Source File
+# End Target
+# End Project
Added: trunk/Externals/pcre/pcre-6.7/AUTHORS
===================================================================
--- trunk/Externals/pcre/pcre-6.7/AUTHORS (rev 0)
+++ trunk/Externals/pcre/pcre-6.7/AUTHORS 2006-11-07 16:28:04 UTC (rev 3781)
@@ -0,0 +1,23 @@
+THE MAIN PCRE LIBRARY
+---------------------
+
+Written by: Philip Hazel
+Email local part: ph10
+Email domain: cam.ac.uk
+
+University of Cambridge Computing Service,
+Cambridge, England. Phone: +44 1223 334714.
+
+Copyright (c) 1997-2006 University of Cambridge
+All rights reserved
+
+
+THE C++ WRAPPER LIBRARY
+-----------------------
+
+Written by: Google Inc.
+
+Copyright (c) 2006 Google Inc
+All rights reserved
+
+####
Added: trunk/Externals/pcre/pcre-6.7/COPYING
===================================================================
--- trunk/Externals/pcre/pcre-6.7/COPYING (rev 0)
+++ trunk/Externals/pcre/pcre-6.7/COPYING 2006-11-07 16:28:04 UTC (rev 3781)
@@ -0,0 +1,68 @@
+PCRE LICENCE
+------------
+
+PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+Release 6 of PCRE is distributed under the terms of the "BSD" licence, as
+specified below. The documentation for PCRE, supplied in the "doc"
+directory, is distributed under the same terms as the software itself.
+
+The basic library functions are written in C and are freestanding. Also
+included in the distribution is a set of C++ wrapper functions.
+
+
+THE BASIC LIBRARY FUNCTIONS
+---------------------------
+
+Written by: Philip Hazel
+Email local part: ph10
+Email domain: cam.ac.uk
+
+University of Cambridge Computing Service,
+Cambridge, England. Phone: +44 1223 334714.
+
+Copyright (c) 1997-2006 University of Cambridge
+All rights reserved.
+
+
+THE C++ WRAPPER FUNCTIONS
+-------------------------
+
+Contributed by: Google Inc.
+
+Copyright (c) 2006, Google Inc.
+All rights reserved.
+
+
+THE "BSD" LICENCE
+-----------------
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ * Neither the name of the University of Cambridge nor the name of Google
+ Inc. nor the names of their contributors may be used to endorse or
+ promote products derived from this software without specific prior
+ written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+End
Added: trunk/Externals/pcre/pcre-6.7/ChangeLog
===================================================================
--- trunk/Externals/pcre/pcre-6.7/ChangeLog (rev 0)
+++ trunk/Externals/pcre/pcre-6.7/ChangeLog 2006-11-07 16:28:04 UTC (rev 3781)
@@ -0,0 +1,2279 @@
+ChangeLog for PCRE
+------------------
+
+Version 6.7 04-Jul-06
+---------------------
+
+ 1. In order to handle tests when input lines are enormously long, pcretest has
+ been re-factored so that it automatically extends its buffers when
+ necessary. The code is crude, but this _is_ just a test program. The
+ default size has been increased from 32K to 50K.
+
+ 2. The code in pcre_study() was using the value of the re argument before
+ testing it for NULL. (Of course, in any sensible call of the function, it
+ won't be NULL.)
+
+ 3. The memmove() emulation function in pcre_internal.h, which is used on
+ systems that lack both memmove() and bcopy() - that is, hardly ever -
+ was missing a "static" storage class specifier.
+
+ 4. When UTF-8 mode was not set, PCRE looped when compiling certain patterns
+ containing an extended class (one that cannot be represented by a bitmap
+ because it contains high-valued characters or Unicode property items, e.g.
+ [\pZ]). Almost always one would set UTF-8 mode when processing such a
+ pattern, but PCRE should not loop if you do not (it no longer does).
+ [Detail: two cases were found: (a) a repeated subpattern containing an
+ extended class; (b) a recursive reference to a subpattern that followed a
+ previous extended class. It wasn't skipping over the extended class
+ correctly when UTF-8 mode was not set.]
+
+ 5. A negated single-character class was not being recognized as fixed-length
+ in lookbehind assertions such as (?<=[^f]), leading to an incorrect
+ compile error "lookbehind assertion is not fixed length".
+
+ 6. The RunPerlTest auxiliary script was showing an unexpected difference
+ between PCRE and Perl for UTF-8 tests. It turns out that it is hard to
+ write a Perl script that can interpret lines of an input file either as
+ byte characters or as UTF-8, which is what "perltest" was being required to
+ do for the non-UTF-8 and UTF-8 tests, respectively. Essentially what you
+ can't do is switch easily at run time between having the "use utf8;" pragma
+ or not. In the end, I fudged it by using the RunPerlTest script to insert
+ "use utf8;" explicitly for the UTF-8 tests.
+
+ 7. In multiline (/m) mode, PCRE was matching ^ after a terminating newline at
+ the end of the subject string, contrary to the documentation and to what
+ Perl does. This was true of both matching functions. Now it matches only at
+ the start of the subject and immediately after *internal* newlines.
+
+ 8. A call of pcre_fullinfo() from pcretest to get the option bits was passing
+ a pointer to an int instead of a pointer to an unsigned long int. This
+ caused problems on 64-bit systems.
+
+ 9. Applied a patch from the folks at Google to pcrecpp.cc, to fix "another
+ instance of the 'standard' template library not being so standard".
+
+10. There was no check on the number of named subpatterns nor the maximum
+ length of a subpattern name. The product of these values is used to compute
+ the size of the memory block for a compiled pattern. By supplying a very
+ long subpattern name and a large number of named subpatterns, the size
+ computation could be caused to overflow. This is now prevented by limiting
+ the length of names to 32 characters, and the number of named subpatterns
+ to 10,000.
+
+11. Subpatterns that are repeated with specific counts have to be replicated in
+ the compiled pattern. The size of memory for this was computed from the
+ length of the subpattern and the repeat count. The latter is limited to
+ 65535, but there was no limit on the former, meaning that integer overflow
+ could in principle occur. The compiled length of a repeated subpattern is
+ now limited to 30,000 bytes in order to prevent this.
+
+12. Added the optional facility to have named substrings with the same name.
+
+13. Added the ability to use a named substring as a condition, using the
+ Python syntax: (?(name)yes|no). This overloads (?(R)... and names that
+ are numbers (not recommended). Forward references are permitted.
+
+14. Added forward references in named backreferences (if you see what I mean).
+
+15. In UTF-8 mode, with the PCRE_DOTALL option set, a quantified dot in the
+ pattern could run off the end of the subject. For example, the pattern
+ "(?s)(.{1,5})"8 did this with the subject "ab".
+
+16. If PCRE_DOTALL or PCRE_MULTILINE were set, pcre_dfa_exec() behaved as if
+ PCRE_CASELESS was set when matching characters that were quantified with ?
+ or *.
+
+17. A character class other than a single negated character that had a minimum
+ but no maximum quantifier - for example [ab]{6,} - was not handled
+ correctly by pce_dfa_exec(). It would match only one character.
+
+18. A valid (though odd) pattern that looked like a POSIX character
+ class but used an invalid character after [ (for example [[,abc,]]) caused
+ pcre_compile() to give the error "Failed: internal error: code overflow" or
+ in some cases to crash with a glibc free() error. This could even happen if
+ the pattern terminated after [[ but there just happened to be a sequence of
+ letters, a binary zero, and a closing ] in the memory that followed.
+
+19. Perl's treatment of octal escapes in the range \400 to \777 has changed
+ over the years. Originally (before any Unicode support), just the bottom 8
+ bits were taken. Thus, for example, \500 really meant \100. Nowadays the
+ output from "man perlunicode" includes this:
+
+ The regular expression compiler produces polymorphic opcodes. That
+ is, the pattern adapts to the data and automatically switches to
+ the Unicode character scheme when presented with Unicode data--or
+ instead uses a traditional byte scheme when presented with byte
+ data.
+
+ Sadly, a wide octal escape does not cause a switch, and in a string with
+ no other multibyte characters, these octal escapes are treated as before.
+ Thus, in Perl, the pattern /\500/ actually matches \100 but the pattern
+ /\500|\x{1ff}/ matches \500 or \777 because the whole thing is treated as a
+ Unicode string.
+
+ I have not perpetrated such confusion in PCRE. Up till now, it took just
+ the bottom 8 bits, as in old Perl. I have now made octal escapes with
+ values greater than \377 illegal in non-UTF-8 mode. In UTF-8 mode they
+ translate to the appropriate multibyte character.
+
+29. Applied some refactoring to reduce the number of warnings from Microsoft
+ and Borland compilers. This has included removing the fudge introduced
+ seven years ago for the OS/2 compiler (see 2.02/2 below) because it caused
+ a warning about an unused variable.
+
+21. PCRE has not included VT (character 0x0b) in the set of whitespace
+ characters since release 4.0, because Perl (from release 5.004) does not.
+ [Or at least, is documented not to: some releases seem to be in conflict
+ with the documentation.] However, when a pattern was studied with
+ pcre_study() and all its branches started with \s, PCRE still included VT
+ as a possible starting character. Of course, this did no harm; it just
+ caused an unnecessary match attempt.
+
+22. Removed a now-redundant internal flag bit that recorded the fact that case
+ dependency changed within the pattern. This was once needed for "required
+ byte" processing, but is no longer used. This recovers a now-scarce options
+ bit. Also moved the least significant internal flag bit to the most-
+ significant bit of the word, which was not previously used (hangover from
+ the days when it was an int rather than a uint) to free up another bit for
+ the future.
+
+23. Added support for CRLF line endings as well as CR and LF. As well as the
+ default being selectable at build time, it can now be changed at runtime
+ via the PCRE_NEWLINE_xxx flags. There are now options for pcregrep to
+ specify that it is scanning data with non-default line endings.
+
+24. Changed the definition of CXXLINK to make it agree with the definition of
+ LINK in the Makefile, by replacing LDFLAGS to CXXFLAGS.
+
+25. Applied Ian Taylor's patches to avoid using another stack frame for tail
+ recursions. This makes a big different to stack usage for some patterns.
+
+26. If a subpattern containing a named recursion or subroutine reference such
+ as (?P>B) was quantified, for example (xxx(?P>B)){3}, the calculation of
+ the space required for the compiled pattern went wrong and gave too small a
+ value. Depending on the environment, this could lead to "Failed: internal
+ error: code overflow at offset 49" or "glibc detected double free or
+ corruption" errors.
+
+27. Applied patches from Google (a) to support the new newline modes and (b) to
+ advance over multibyte UTF-8 characters in GlobalReplace.
+
+28. Change free() to pcre_free() in pcredemo.c. Apparently this makes a
+ difference for some implementation of PCRE in some Windows version.
+
+29. Added some extra testing facilities to pcretest:
+
+ \q<number> in a data line sets the "match limit" value
+ \Q<number> in a data line sets the "match recursion limt" value
+ -S <number> sets the stack size, where <number> is in megabytes
+
+ The -S option isn't available for Windows.
+
+
+Version 6.6 06-Feb-06
+---------------------
+
+ 1. Change 16(a) for 6.5 broke things, because PCRE_DATA_SCOPE was not defined
+ in pcreposix.h. I have copied the definition from pcre.h.
+
+ 2. Change 25 for 6.5 broke compilation in a build directory out-of-tree
+ because pcre.h is no longer a built file.
+
+ 3. Added Jeff Friedl's additional debugging patches to pcregrep. These are
+ not normally included in the compiled code.
+
+
+Version 6.5 01-Feb-06
+---------------------
+
+ 1. When using the partial match feature with pcre_dfa_exec(), it was not
+ anchoring the second and subsequent partial matches at the new starting
+ point. This could lead to incorrect results. For example, with the pattern
+ /1234/, partially matching against "123" and then "a4" gave a match.
+
+ 2. Changes to pcregrep:
+
+ (a) All non-match returns from pcre_exec() were being treated as failures
+ to match the line. Now, unless the error is PCRE_ERROR_NOMATCH, an
+ error message is output. Some extra information is given for the
+ PCRE_ERROR_MATCHLIMIT and PCRE_ERROR_RECURSIONLIMIT errors, which are
+ probably the only errors that are likely to be caused by users (by
+ specifying a regex that has nested indefinite repeats, for instance).
+ If there are more than 20 of these errors, pcregrep is abandoned.
+
+ (b) A binary zero was treated as data while matching, but terminated the
+ output line if it was written out. This has been fixed: binary zeroes
+ are now no different to any other data bytes.
+
+ (c) Whichever of the LC_ALL or LC_CTYPE environment variables is set is
+ used to set a locale for matching. The --locale=xxxx long option has
+ been added (no short equivalent) to specify a locale explicitly on the
+ pcregrep command, overriding the environment variables.
+
+ (d) When -B was used with -n, some line numbers in the output were one less
+ than they should have been.
+
+ (e) Added the -o (--only-matching) option.
+
+ (f) If -A or -C was used with -c (count only), some lines of context were
+ accidentally printed for the final match.
+
+ (g) Added the -H (--with-filename) option.
+
+ (h) The combination of options -rh failed to suppress file names for files
+ that were found from directory arguments.
+
+ (i) Added the -D (--devices) and -d (--directories) options.
+
+ (j) Added the -F (--fixed-strings) option.
+
+ (k) Allow "-" to be used as a file name for -f as well as for a data file.
+
+ (l) Added the --colo(u)r option.
+
+ (m) Added Jeffrey Friedl's -S testing option, but within #ifdefs so that it
+ is not present by default.
+
+ 3. A nasty bug was discovered in the handling of recursive patterns, that is,
+ items such as (?R) or (?1), when the recursion could match a number of
+ alternatives. If it matched one of the alternatives, but subsequently,
+ outside the recursion, there was a failure, the code tried to back up into
+ the recursion. However, because of the way PCRE is implemented, this is not
+ possible, and the result was an incorrect result from the match.
+
+ In order to prevent this happening, the specification of recursion has
+ been changed so that all such subpatterns are automatically treated as
+ atomic groups. Thus, for example, (?R) is treated as if it were (?>(?R)).
+
+ 4. I had overlooked the fact that, in some locales, there are characters for
+ which isalpha() is true but neither isupper() nor islower() are true. In
+ the fr_FR locale, for instance, the \xAA and \xBA characters (ordmasculine
+ and ordfeminine) are like this. This affected the treatment of \w and \W
+ when they appeared in character classes, but not when they appeared outside
+ a character class. The bit map for "word" characters is now created
+ separately from the results of isalnum() instead of just taking it from the
+ upper, lower, and digit maps. (Plus the underscore character, of course.)
+
+ 5. The above bug also affected the handling of POSIX character classes such as
+ [[:alpha:]] and [[:alnum:]]. These do not have their own bit maps in PCRE's
+ permanent tables. Instead, the bit maps for such a class were previously
+ created as the appropriate unions of the upper, lower, and digit bitmaps.
+ Now they are created by subtraction from the [[:word:]] class, which has
+ its own bitmap.
+
+ 6. The [[:blank:]] character class matches horizontal, but not vertical space.
+ It is created by subtracting the vertical space characters (\x09, \x0a,
+ \x0b, \x0c) from the [[:space:]] bitmap. Previously, however, the
+ subtraction was done in the overall bitmap for a character class, meaning
+ that a class such as [\x0c[:blank:]] was incorrect because \x0c would not
+ be recognized. This bug has been fixed.
+
+ 7. Patches from the folks at Google:
+
+ (a) pcrecpp.cc: "to handle a corner case that may or may not happen in
+ real life, but is still worth protecting against".
+
+ (b) pcrecpp.cc: "corrects a bug when negative radixes are used with
+ regular expressions".
+
+ (c) pcre_scanner.cc: avoid use of std::count() because not all systems
+ have it.
+
+ (d) Split off pcrecpparg.h from pcrecpp.h and had the former built by
+ "configure" and the latter not, in order to fix a problem somebody had
+ with compiling the Arg class on HP-UX.
+
+ (e) Improve the error-handling of the C++ wrapper a little bit.
+
+ (f) New tests for checking recursion limiting.
+
+ 8. The pcre_memmove() function, which is used only if the environment does not
+ have a standard memmove() function (and is therefore rarely compiled),
+ contained two bugs: (a) use of int instead of size_t, and (b) it was not
+ returning a result (though PCRE never actually uses the result).
+
+ 9. In the POSIX regexec() interface, if nmatch is specified as a ridiculously
+ large number - greater than INT_MAX/(3*sizeof(int)) - REG_ESPACE is
+ returned instead of calling malloc() with an overflowing number that would
+ most likely cause subsequent chaos.
+
+10. The debugging option of pcretest was not showing the NO_AUTO_CAPTURE flag.
+
+11. The POSIX flag REG_NOSUB is now supported. When a pattern that was compiled
+ with this option is matched, the nmatch and pmatch options of regexec() are
+ ignored.
+
+12. Added REG_UTF8 to the POSIX interface. This is not defined by POSIX, but is
+ provided in case anyone wants to the the POSIX interface with UTF-8
+ strings.
+
+13. Added CXXLDFLAGS to the Makefile parameters to provide settings only on the
+ C++ linking (needed for some HP-UX environments).
+
+14. Avoid compiler warnings in get_ucpname() when compiled without UCP support
+ (unused parameter) and in the pcre_printint() function (omitted "default"
+ switch label when the default is to do nothing).
+
+15. Added some code to make it possible, when PCRE is compiled as a C++
+ library, to replace subject pointers for pcre_exec() with a smart pointer
+ class, thus making it possible to process discontinuous strings.
+
+16. The two macros PCRE_EXPORT and PCRE_DATA_SCOPE are confusing, and perform
+ much the same function. They were added by different people who were trying
+ to make PCRE easy to compile on non-Unix systems. It has been suggested
+ that PCRE_EXPORT be abolished now that there is more automatic apparatus
+ for compiling on Windows systems. I have therefore replaced it with
+ PCRE_DATA_SCOPE. This is set automatically for Windows; if not set it
+ defaults to "extern" for C or "extern C" for C++, which works fine on
+ Unix-like systems. It is now possible to override the value of PCRE_DATA_
+ SCOPE with something explicit in config.h. In addition:
+
+ (a) pcreposix.h still had just "extern" instead of either of these macros;
+ I have replaced it with PCRE_DATA_SCOPE.
+
+ (b) Functions such as _pcre_xclass(), which are internal to the library,
+ but external in the C sense, all had PCRE_EXPORT in their definitions.
+ This is apparently wrong for the Windows case, so I have removed it.
+ (It makes no difference on Unix-like systems.)
+
+17. Added a new limit, MATCH_LIMIT_RECURSION, which limits the depth of nesting
+ of recursive calls to match(). This is different to MATCH_LIMIT because
+ that limits the total number of calls to match(), not all of which increase
+ the depth of recursion. Limiting the recursion depth limits the amount of
+ stack (or heap if NO_RECURSE is set) that is used. The default can be set
+ when PCRE is compiled, and changed at run time. A patch from Google adds
+ this functionality to the C++ interface.
+
+18. Changes to the handling of Unicode character properties:
+
+ (a) Updated the table to Unicode 4.1.0.
+
+ (b) Recognize characters that are not in the table as "Cn" (undefined).
+
+ (c) I revised the way the table is implemented to a much improved format
+ which includes recognition of ranges. It now supports the ranges that
+ are defined in UnicodeData.txt, and it also amalgamates other
+ characters into ranges. This has reduced the number of entries in the
+ table from around 16,000 to around 3,000, thus reducing its size
+ considerably. I realized I did not need to use a tree structure after
+ all - a binary chop search is just as efficient. Having reduced the
+ number of entries, I extended their size from 6 bytes to 8 bytes to
+ allow for more data.
+
+ (d) Added support for Unicode script names via properties such as \p{Han}.
+
+19. In UTF-8 mode, a backslash followed by a non-Ascii character was not
+ matching that character.
+
+20. When matching a repeated Unicode property with a minimum greater than zero,
+ (for example \pL{2,}), PCRE could look past the end of the subject if it
+ reached it while seeking the minimum number of characters. This could
+ happen only if some of the characters were more than one byte long, because
+ there is a check for at least the minimum number of bytes.
+
+21. Refactored the implementation of \p and \P so as to be more general, to
+ allow for more different types of property in future. This has changed the
+ compiled form incompatibly. Anybody with saved compiled patterns that use
+ \p or \P will have to recompile them.
+
+22. Added "Any" and "L&" to the supported property types.
+
+23. Recognize \x{...} as a code point specifier, even when not in UTF-8 mode,
+ but give a compile time error if the value is greater than 0xff.
+
+24. The man pages for pcrepartial, pcreprecompile, and pcre_compile2 were
+ accidentally not being installed or uninstalled.
+
+25. The pcre.h file was built from pcre.h.in, but the only changes that were
+ made were to insert the current release number. This seemed silly, because
+ it made things harder for people building PCRE on systems that don't run
+ "configure". I have turned pcre.h into a distributed file, no longer built
+ by "configure", with the version identification directly included. There is
+ no longer a pcre.h.in file.
+
+ However, this change necessitated a change to the pcre-config script as
+ well. It is built from pcre-config.in, and one of the substitutions was the
+ release number. I have updated configure.ac so that ./configure now finds
+ the release number by grepping pcre.h.
+
+26. Added the ability to run the tests under valgrind.
+
+
+Version 6.4 05-Sep-05
+---------------------
+
+ 1. Change 6.0/10/(l) to pcregrep introduced a bug that caused separator lines
+ "--" to be printed when multiple files were scanned, even when none of the
+ -A, -B, or -C options were used. This is not compatible with Gnu grep, so I
+ consider it to be a bug, and have restored the previous behaviour.
+
+ 2. A couple of code tidies to get rid of compiler warnings.
+
+ 3. The pcretest program used to cheat by referring to symbols in the library
+ whose names begin with _pcre_. These are internal symbols that are not
+ really supposed to be visible externally, and in some environments it is
+ possible to suppress them. The cheating is now confined to including
+ certain files from the library's source, which is a bit cleaner.
+
+ 4. Renamed pcre.in as pcre.h.in to go with pcrecpp.h.in; it also makes the
+ file's purpose clearer.
+
+ 5. Reorganized pcre_ucp_findchar().
+
+
+Version 6.3 15-Aug-05
+---------------------
+
+ 1. The file libpcre.pc.in did not have general read permission in the tarball.
+
+ 2. There were some problems when building without C++ support:
+
+ (a) If C++ support was not built, "make install" and "make test" still
+ tried to test it.
+
+ (b) There were problems when the value of CXX was explicitly set. Some
+ changes have been made to try to fix these, and ...
+
+ (c) --disable-cpp can now be used to explicitly disable C++ support.
+
+ (d) The use of @CPP_OBJ@ directly caused a blank line preceded by a
+ backslash in a target when C++ was disabled. This confuses some
+ versions of "make", apparently. Using an intermediate variable solves
+ this. (Same for CPP_LOBJ.)
+
+ 3. $(LINK_FOR_BUILD) now includes $(CFLAGS_FOR_BUILD) and $(LINK)
+ (non-Windows) now includes $(CFLAGS) because these flags are sometimes
+ necessary on certain architectures.
+
+ 4. Added a setting of -export-symbols-regex to the link command to remove
+ those symbols that are exported in the C sense, but actually are local
+ within the library, and not documented. Their names all begin with
+ "_pcre_". This is not a perfect job, because (a) we have to except some
+ symbols that pcretest ("illegally") uses, and (b) the facility isn't always
+ available (and never for static libraries). I have made a note to try to
+ find a way round (a) in the future.
+
+
+Version 6.2 01-Aug-05
+---------------------
+
+ 1. There was no test for integer overflow of quantifier values. A construction
+ such as {1111111111111111} would give undefined results. What is worse, if
+ a minimum quantifier for a parenthesized subpattern overflowed and became
+ negative, the calculation of the memory size went wrong. This could have
+ led to memory overwriting.
+
+ 2. Building PCRE using VPATH was broken. Hopefully it is now fixed.
+
+ 3. Added "b" to the 2nd argument of fopen() in dftables.c, for non-Unix-like
+ operating environments where this matters.
+
+ 4. Applied Giuseppe Maxia's patch to add additional features for controlling
+ PCRE options from within the C++ wrapper.
+
+ 5. Named capturing subpatterns were not being correctly counted when a pattern
+ was compiled. This caused two problems: (a) If there were more than 100
+ such subpatterns, the calculation of the memory needed for the whole
+ compiled pattern went wrong, leading to an overflow error. (b) Numerical
+ back references of the form \12, where the number was greater than 9, were
+ not recognized as back references, even though there were sufficient
+ previous subpatterns.
+
+ 6. Two minor patches to pcrecpp.cc in order to allow it to compile on older
+ versions of gcc, e.g. 2.95.4.
+
+
+Version 6.1 21-Jun-05
+---------------------
+
+ 1. There was one reference to the variable "posix" in pcretest.c that was not
+ surrounded by "#if !defined NOPOSIX".
+
+ 2. Make it possible to compile pcretest without DFA support, UTF8 support, or
+ the cross-check on the old pcre_info() function, for the benefit of the
+ cut-down version of PCRE that is currently imported into Exim.
+
+ 3. A (silly) pattern starting with (?i)(?-i) caused an internal space
+ allocation error. I've done the easy fix, which wastes 2 bytes for sensible
+ patterns that start (?i) but I don't think that matters. The use of (?i) is
+ just an example; this all applies to the other options as well.
+
+ 4. Since libtool seems to echo the compile commands it is issuing, the output
+ from "make" can be reduced a bit by putting "@" in front of each libtool
+ compile command.
+
+ 5. Patch from the folks at Google for configure.in to be a bit more thorough
+ in checking for a suitable C++ installation before trying to compile the
+ C++ stuff. This should fix a reported problem when a compiler was present,
+ but no suitable headers.
+
+ 6. The man pages all had just "PCRE" as their title. I have changed them to
+ be the relevant file name. I have also arranged that these names are
+ retained in the file doc/pcre.txt, which is a concatenation in text format
+ of all the man pages except the little individual ones for each function.
+
+ 7. The NON-UNIX-USE file had not been updated for the different set of source
+ files that come with release 6. I also added a few comments about the C++
+ wrapper.
+
+
+Version 6.0 07-Jun-05
+---------------------
+
+ 1. Some minor internal re-organization to help with my DFA experiments.
+
+ 2. Some missing #ifdef SUPPORT_UCP conditionals in pcretest and printint that
+ didn't matter for the library itself when fully configured, but did matter
+ when compiling without UCP support, or within Exim, where the ucp files are
+ not imported.
+
+ 3. Refactoring of the library code to split up the various functions into
+ different source modules. The addition of the new DFA matching code (see
+ below) to a single monolithic source would have made it really too
+ unwieldy, quite apart from causing all the code to be include in a
+ statically linked application, when only some functions are used. This is
+ relevant even without the DFA addition now that patterns can be compiled in
+ one application and matched in another.
+
+ The downside of splitting up is that there have to be some external
+ functions and data tables that are used internally in different modules of
+ the library but which are not part of the API. These have all had their
+ names changed to start with "_pcre_" so that they are unlikely to clash
+ with other external names.
+
+ 4. Added an alternate matching function, pcre_dfa_exec(), which matches using
+ a different (DFA) algorithm. Although it is slower than the original
+ function, it does have some advantages for certain types of matching
+ problem.
+
+ 5. Upgrades to pcretest in order to test the features of pcre_dfa_exec(),
+ including restarting after a partial match.
+
+ 6. A patch for pcregrep that defines INVALID_FILE_ATTRIBUTES if it is not
+ defined when compiling for Windows was sent to me. I have put it into the
+ code, though I have no means of testing or verifying it.
+
+ 7. Added the pcre_refcount() auxiliary function.
+
+ 8. Added the PCRE_FIRSTLINE option. This constrains an unanchored pattern to
+ match before or at the first newline in the subject string. In pcretest,
+ the /f option on a pattern can be used to set this.
+
+ 9. A repeated \w when used in UTF-8 mode with characters greater than 256
+ would behave wrongly. This has been present in PCRE since release 4.0.
+
+10. A number of changes to the pcregrep command:
+
+ (a) Refactored how -x works; insert ^(...)$ instead of setting
+ PCRE_ANCHORED and checking the length, in preparation for adding
+ something similar for -w.
+
+ (b) Added the -w (match as a word) option.
+
+ (c) Refactored the way lines are read and buffered so as to have more
+ than one at a time available.
+
+ (d) Implemented a pcregrep test script.
+
+ (e) Added the -M (multiline match) option. This allows patterns to match
+ over several lines of the subject. The buffering ensures that at least
+ 8K, or the rest of the document (whichever is the shorter) is available
+ for matching (and similarly the previous 8K for lookbehind assertions).
+
+ (f) Changed the --help output so that it now says
+
+ -w, --word-regex(p)
+
+ instead of two lines, one with "regex" and the other with "regexp"
+ because that confused at least one person since the short forms are the
+ same. (This required a bit of code, as the output is generated
+ automatically from a table. It wasn't just a text change.)
+
+ (g) -- can be used to terminate pcregrep options if the next thing isn't an
+ option but starts with a hyphen. Could be a pattern or a path name
+ starting with a hyphen, for instance.
+
+ (h) "-" can be given as a file name to represent stdin.
+
+ (i) When file names are being printed, "(standard input)" is used for
+ the standard input, for compatibility with GNU grep. Previously
+ "<stdin>" was used.
+
+ (j) The option --label=xxx can be used to supply a name to be used for
+ stdin when file names are being printed. There is no ...
[truncated message content] |
|
From: <ge...@us...> - 2006-11-06 20:25:59
|
Revision: 3780
http://svn.sourceforge.net/winmerge/?rev=3780&view=rev
Author: gerundt
Date: 2006-11-06 12:25:47 -0800 (Mon, 06 Nov 2006)
Log Message:
-----------
Add note about PNG and GIF image format.
Modified Paths:
--------------
branches/R2_6/Docs/Developers/readme-manual.html
Modified: branches/R2_6/Docs/Developers/readme-manual.html
===================================================================
--- branches/R2_6/Docs/Developers/readme-manual.html 2006-11-06 20:25:18 UTC (rev 3779)
+++ branches/R2_6/Docs/Developers/readme-manual.html 2006-11-06 20:25:47 UTC (rev 3780)
@@ -50,6 +50,9 @@
<li><a href="http://docbook.sourceforge.net/release/dsssl/current/doc/print/">Customising print formats with DSSL</a></li>
</ul>
+<p><b>Note:</b> For screenshots we prefer the PNG format. Only for images (for example <em>icons</em>),
+where we want transparency, we use the GIF format, since older browsers have problems with transparent PNG images.</p>
+
<h3>Installing conversion tools needed:</h3>
<ul>
<li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-06 20:25:29
|
Revision: 3779
http://svn.sourceforge.net/winmerge/?rev=3779&view=rev
Author: gerundt
Date: 2006-11-06 12:25:18 -0800 (Mon, 06 Nov 2006)
Log Message:
-----------
Add note about PNG and GIF image format.
Modified Paths:
--------------
trunk/Docs/Developers/readme-manual.html
Modified: trunk/Docs/Developers/readme-manual.html
===================================================================
--- trunk/Docs/Developers/readme-manual.html 2006-11-06 20:11:43 UTC (rev 3778)
+++ trunk/Docs/Developers/readme-manual.html 2006-11-06 20:25:18 UTC (rev 3779)
@@ -50,6 +50,9 @@
<li><a href="http://docbook.sourceforge.net/release/dsssl/current/doc/print/">Customising print formats with DSSL</a></li>
</ul>
+<p><b>Note:</b> For screenshots we prefer the PNG format. Only for images (for example <em>icons</em>),
+where we want transparency, we use the GIF format, since older browsers have problems with transparent PNG images.</p>
+
<h3>Installing conversion tools needed:</h3>
<ul>
<li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-06 20:12:07
|
Revision: 3778
http://svn.sourceforge.net/winmerge/?rev=3778&view=rev
Author: gerundt
Date: 2006-11-06 12:11:43 -0800 (Mon, 06 Nov 2006)
Log Message:
-----------
PATCH: [ 1586878 ] Manual: Replace "aborted.png" with transpatent GIF version
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Compare_dirs.xml
branches/R2_6/Docs/Users/Manual/screenshots/binary.gif
branches/R2_6/Docs/Users/Manual/screenshots/folderup.gif
branches/R2_6/Docs/Users/Manual/screenshots/folderup_disable.gif
Added Paths:
-----------
branches/R2_6/Docs/Users/Manual/screenshots/aborted.gif
Removed Paths:
-------------
branches/R2_6/Docs/Users/Manual/screenshots/aborted.png
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-06 20:07:52 UTC (rev 3777)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-06 20:11:43 UTC (rev 3778)
@@ -1,3 +1,10 @@
+2006-11-06 Tim
+ PATCH: [ 1586878 ] Manual: Replace "aborted.png" with transpatent GIF version
+ Manual: Compare_dirs.xml
+ Manual/screenshots: binary.gif folderup.gif folderup_disable.gif
+ Manual/screenshots new file: aborted.gif
+ Manual/screenshots deleted file: aborted.png
+
2006-11-06 Takashi
PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
Manual/screenshots: equal.gif fileskip.gif foldercomp1.png
Modified: branches/R2_6/Docs/Users/Manual/Compare_dirs.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Compare_dirs.xml 2006-11-06 20:07:52 UTC (rev 3777)
+++ branches/R2_6/Docs/Users/Manual/Compare_dirs.xml 2006-11-06 20:11:43 UTC (rev 3778)
@@ -134,7 +134,7 @@
<member><inlinemediaobject>
<imageobject>
- <imagedata fileref="screenshots/aborted.png" />
+ <imagedata fileref="screenshots/aborted.gif" format="GIF" />
</imageobject>
</inlinemediaobject> Aborted item. WinMerge did not finish comparing
this item when compare was stopped. Result is unknown.</member>
Added: branches/R2_6/Docs/Users/Manual/screenshots/aborted.gif
===================================================================
(Binary files differ)
Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/aborted.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/R2_6/Docs/Users/Manual/screenshots/aborted.png
===================================================================
(Binary files differ)
Modified: branches/R2_6/Docs/Users/Manual/screenshots/binary.gif
===================================================================
(Binary files differ)
Modified: branches/R2_6/Docs/Users/Manual/screenshots/folderup.gif
===================================================================
(Binary files differ)
Modified: branches/R2_6/Docs/Users/Manual/screenshots/folderup_disable.gif
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-06 20:08:12
|
Revision: 3777
http://svn.sourceforge.net/winmerge/?rev=3777&view=rev
Author: gerundt
Date: 2006-11-06 12:07:52 -0800 (Mon, 06 Nov 2006)
Log Message:
-----------
Upps, forgot to commit aborted.gif! ;)
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
Added Paths:
-----------
trunk/Docs/Users/Manual/screenshots/aborted.gif
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-11-06 19:53:57 UTC (rev 3776)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-11-06 20:07:52 UTC (rev 3777)
@@ -2,6 +2,8 @@
PATCH: [ 1586878 ] Manual: Replace "aborted.png" with transpatent GIF version
Manual: Compare_dirs.xml
Manual/screenshots: binary.gif folderup.gif folderup_disable.gif
+ Manual/screenshots new file: aborted.gif
+ Manual/screenshots deleted file: aborted.png
2006-11-06 Takashi
PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
Added: trunk/Docs/Users/Manual/screenshots/aborted.gif
===================================================================
(Binary files differ)
Property changes on: trunk/Docs/Users/Manual/screenshots/aborted.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-06 19:54:14
|
Revision: 3776
http://svn.sourceforge.net/winmerge/?rev=3776&view=rev
Author: gerundt
Date: 2006-11-06 11:53:57 -0800 (Mon, 06 Nov 2006)
Log Message:
-----------
PATCH: [ 1586878 ] Manual: Replace "aborted.png" with transpatent GIF version
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Compare_dirs.xml
trunk/Docs/Users/Manual/screenshots/binary.gif
trunk/Docs/Users/Manual/screenshots/folderup.gif
trunk/Docs/Users/Manual/screenshots/folderup_disable.gif
Removed Paths:
-------------
trunk/Docs/Users/Manual/screenshots/aborted.png
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-11-06 17:25:47 UTC (rev 3775)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-11-06 19:53:57 UTC (rev 3776)
@@ -1,3 +1,8 @@
+2006-11-06 Tim
+ PATCH: [ 1586878 ] Manual: Replace "aborted.png" with transpatent GIF version
+ Manual: Compare_dirs.xml
+ Manual/screenshots: binary.gif folderup.gif folderup_disable.gif
+
2006-11-06 Takashi
PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
Manual/screenshots: equal.gif fileskip.gif foldercomp1.png
Modified: trunk/Docs/Users/Manual/Compare_dirs.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_dirs.xml 2006-11-06 17:25:47 UTC (rev 3775)
+++ trunk/Docs/Users/Manual/Compare_dirs.xml 2006-11-06 19:53:57 UTC (rev 3776)
@@ -134,7 +134,7 @@
<member><inlinemediaobject>
<imageobject>
- <imagedata fileref="screenshots/aborted.png" />
+ <imagedata fileref="screenshots/aborted.gif" format="GIF" />
</imageobject>
</inlinemediaobject> Aborted item. WinMerge did not finish comparing
this item when compare was stopped. Result is unknown.</member>
Deleted: trunk/Docs/Users/Manual/screenshots/aborted.png
===================================================================
(Binary files differ)
Modified: trunk/Docs/Users/Manual/screenshots/binary.gif
===================================================================
(Binary files differ)
Modified: trunk/Docs/Users/Manual/screenshots/folderup.gif
===================================================================
(Binary files differ)
Modified: trunk/Docs/Users/Manual/screenshots/folderup_disable.gif
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-11-06 17:26:15
|
Revision: 3775
http://svn.sourceforge.net/winmerge/?rev=3775&view=rev
Author: sdottaka
Date: 2006-11-06 09:25:47 -0800 (Mon, 06 Nov 2006)
Log Message:
-----------
PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/screenshots/equal.gif
branches/R2_6/Docs/Users/Manual/screenshots/fileskip.gif
branches/R2_6/Docs/Users/Manual/screenshots/foldercomp1.png
branches/R2_6/Docs/Users/Manual/screenshots/lfile.gif
branches/R2_6/Docs/Users/Manual/screenshots/notequal.gif
branches/R2_6/Docs/Users/Manual/screenshots/rfile.gif
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/res/equalfile.ico
branches/R2_6/Src/res/fileskip.ico
branches/R2_6/Src/res/lfile.ico
branches/R2_6/Src/res/notequalfile.ico
branches/R2_6/Src/res/rfile.ico
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-06 17:24:58 UTC (rev 3774)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-06 17:25:47 UTC (rev 3775)
@@ -1,3 +1,8 @@
+2006-11-06 Takashi
+ PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
+ Manual/screenshots: equal.gif fileskip.gif foldercomp1.png
+ lfile.gif notequal.gif rfile.gif
+
2006-10-30 Tim
PATCH: [ 1586867 ] Manual: Replace "example1.gif" with new PNG version
Manual/screenshots new file: missing_lines.png
Modified: branches/R2_6/Docs/Users/Manual/screenshots/equal.gif
===================================================================
(Binary files differ)
Modified: branches/R2_6/Docs/Users/Manual/screenshots/fileskip.gif
===================================================================
(Binary files differ)
Modified: branches/R2_6/Docs/Users/Manual/screenshots/foldercomp1.png
===================================================================
(Binary files differ)
Modified: branches/R2_6/Docs/Users/Manual/screenshots/lfile.gif
===================================================================
(Binary files differ)
Modified: branches/R2_6/Docs/Users/Manual/screenshots/notequal.gif
===================================================================
(Binary files differ)
Modified: branches/R2_6/Docs/Users/Manual/screenshots/rfile.gif
===================================================================
(Binary files differ)
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-11-06 17:24:58 UTC (rev 3774)
+++ branches/R2_6/Src/Changes.txt 2006-11-06 17:25:47 UTC (rev 3775)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-06 Takashi
+ PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
+ Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
+
2006-11-03 Kimmo
PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
Src: MainFrm.cpp
Modified: branches/R2_6/Src/res/equalfile.ico
===================================================================
(Binary files differ)
Modified: branches/R2_6/Src/res/fileskip.ico
===================================================================
(Binary files differ)
Modified: branches/R2_6/Src/res/lfile.ico
===================================================================
(Binary files differ)
Modified: branches/R2_6/Src/res/notequalfile.ico
===================================================================
(Binary files differ)
Modified: branches/R2_6/Src/res/rfile.ico
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-11-06 17:25:34
|
Revision: 3774
http://svn.sourceforge.net/winmerge/?rev=3774&view=rev
Author: sdottaka
Date: 2006-11-06 09:24:58 -0800 (Mon, 06 Nov 2006)
Log Message:
-----------
PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/screenshots/equal.gif
trunk/Docs/Users/Manual/screenshots/fileskip.gif
trunk/Docs/Users/Manual/screenshots/foldercomp1.png
trunk/Docs/Users/Manual/screenshots/lfile.gif
trunk/Docs/Users/Manual/screenshots/notequal.gif
trunk/Docs/Users/Manual/screenshots/rfile.gif
trunk/Src/Changes.txt
trunk/Src/res/equalfile.ico
trunk/Src/res/fileskip.ico
trunk/Src/res/lfile.ico
trunk/Src/res/notequalfile.ico
trunk/Src/res/rfile.ico
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-11-06 17:07:27 UTC (rev 3773)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-11-06 17:24:58 UTC (rev 3774)
@@ -1,3 +1,8 @@
+2006-11-06 Takashi
+ PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
+ Manual/screenshots: equal.gif fileskip.gif foldercomp1.png
+ lfile.gif notequal.gif rfile.gif
+
2006-10-30 Tim
PATCH: [ 1586867 ] Manual: Replace "example1.gif" with new PNG version
Manual/screenshots new file: missing_lines.png
Modified: trunk/Docs/Users/Manual/screenshots/equal.gif
===================================================================
(Binary files differ)
Modified: trunk/Docs/Users/Manual/screenshots/fileskip.gif
===================================================================
(Binary files differ)
Modified: trunk/Docs/Users/Manual/screenshots/foldercomp1.png
===================================================================
(Binary files differ)
Modified: trunk/Docs/Users/Manual/screenshots/lfile.gif
===================================================================
(Binary files differ)
Modified: trunk/Docs/Users/Manual/screenshots/notequal.gif
===================================================================
(Binary files differ)
Modified: trunk/Docs/Users/Manual/screenshots/rfile.gif
===================================================================
(Binary files differ)
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-06 17:07:27 UTC (rev 3773)
+++ trunk/Src/Changes.txt 2006-11-06 17:24:58 UTC (rev 3774)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-06 Takashi
+ PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
+ Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
+
2006-11-06 Kimmo
PATCH: [ 1590892 ] Handle unicode paths for project files
Src: ProjectFile.cpp
Modified: trunk/Src/res/equalfile.ico
===================================================================
(Binary files differ)
Modified: trunk/Src/res/fileskip.ico
===================================================================
(Binary files differ)
Modified: trunk/Src/res/lfile.ico
===================================================================
(Binary files differ)
Modified: trunk/Src/res/notequalfile.ico
===================================================================
(Binary files differ)
Modified: trunk/Src/res/rfile.ico
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
