Skip to content

Commit

Permalink
- Remove MFC dependency
Browse files Browse the repository at this point in the history 
- Remove windows.h dependency
- Remove unused files
- Add Testing/FolderCompare project
  • Loading branch information
sdottaka committed Nov 4, 2012
1 parent 115d9f5 commit d1617c2
Show file tree
Hide file tree
Showing 269 changed files with 17,392 additions and 16,845 deletions.
1 change: 0 additions & 1 deletion Externals/crystaledit/editlib/SyntaxColors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#ifndef _SYNTAX_COLORS_H_
#define _SYNTAX_COLORS_H_

#include "stdafx.h"
#include <Windows.h>
#include <vector>

Expand Down
6 changes: 3 additions & 3 deletions Externals/crystaledit/editlib/cregexp_poco.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@
#include <string.h>
#include <ctype.h>
#include <memory>
#include <Poco/Exception.h>
#include <Poco/RegularExpression.h>
#include <Poco/UnicodeConverter.h>
#include "cregexp.h"
#include "unicoder.h"

using Poco::Exception;
using Poco::RegularExpression;
using Poco::UnicodeConverter;

Expand Down Expand Up @@ -86,7 +84,9 @@ int RxExec(RxNode *Regexp, LPCTSTR Data, int Len, LPCTSTR Start, RxMatchRes *Mat
int result = 0;
try {
result = Regexp->regexp->match(compString, startoffset, ovector);
} catch (Exception *) {
}
catch (...)
{
}
if (result >= 0)
{
Expand Down
58 changes: 29 additions & 29 deletions Externals/poco/Util/Util_vs71.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
<Configurations>
<Configuration
Name="debug_shared|Win32"
OutputDirectory="obj\$(ConfigurationName)"
IntermediateDirectory="obj\$(ConfigurationName)"
OutputDirectory="obj_vc71\$(ConfigurationName)"
IntermediateDirectory="obj_vc71\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Util_EXPORTS"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;_STATIC_CPPLIB"
StringPooling="TRUE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
Expand All @@ -43,14 +43,14 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies=""
OutputFile="..\bin\PocoUtild.dll"
OutputFile="..\bin_vc71\PocoUtild.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\bin\PocoUtild.pdb"
ProgramDatabaseFile="..\bin_vc71\PocoUtild.pdb"
AdditionalLibraryDirectories="..\lib"
SubSystem="1"
ImportLibrary="..\lib\PocoUtild.lib"
ImportLibrary="..\lib_vc71\PocoUtild.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
Expand All @@ -75,8 +75,8 @@
</Configuration>
<Configuration
Name="release_shared|Win32"
OutputDirectory="obj\$(ConfigurationName)"
IntermediateDirectory="obj\$(ConfigurationName)"
OutputDirectory="obj_vc71\$(ConfigurationName)"
IntermediateDirectory="obj_vc71\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2">
<Tool
Expand All @@ -87,7 +87,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Util_EXPORTS"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;_STATIC_CPPLIB"
StringPooling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="2"
Expand All @@ -108,15 +108,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies=""
OutputFile="..\bin\PocoUtil.dll"
OutputFile="..\bin_vc71\PocoUtil.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="FALSE"
AdditionalLibraryDirectories="..\lib"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="..\lib\PocoUtil.lib"
ImportLibrary="..\lib_vc71\PocoUtil.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
Expand All @@ -141,15 +141,15 @@
</Configuration>
<Configuration
Name="debug_static_mt|Win32"
OutputDirectory="obj\$(ConfigurationName)"
IntermediateDirectory="obj\$(ConfigurationName)"
OutputDirectory="obj_vc71\$(ConfigurationName)"
IntermediateDirectory="obj_vc71\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_STATIC_CPPLIB"
StringPooling="TRUE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
Expand All @@ -160,7 +160,7 @@
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="..\lib\PocoUtilmtd.pdb"
ProgramDataBaseFileName="..\lib_vc71\PocoUtilmtd.pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="4"
Expand All @@ -170,7 +170,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\lib\PocoUtilmtd.lib"/>
OutputFile="..\lib_vc71\PocoUtilmtd.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Expand All @@ -194,8 +194,8 @@
</Configuration>
<Configuration
Name="release_static_mt|Win32"
OutputDirectory="obj\$(ConfigurationName)"
IntermediateDirectory="obj\$(ConfigurationName)"
OutputDirectory="obj_vc71\$(ConfigurationName)"
IntermediateDirectory="obj_vc71\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2">
<Tool
Expand All @@ -206,7 +206,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;_STATIC_CPPLIB"
StringPooling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="0"
Expand All @@ -224,7 +224,7 @@
DisableSpecificWarnings="4800;"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\lib\PocoUtilmt.lib"/>
OutputFile="..\lib_vc71\PocoUtilmt.lib"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Expand All @@ -250,15 +250,15 @@
</Configuration>
<Configuration
Name="debug_static_md|Win32"
OutputDirectory="obj\$(ConfigurationName)"
IntermediateDirectory="obj\$(ConfigurationName)"
OutputDirectory="obj_vc71\$(ConfigurationName)"
IntermediateDirectory="obj_vc71\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_STATIC_CPPLIB"
StringPooling="TRUE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
Expand All @@ -269,7 +269,7 @@
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="..\lib\PocoUtilmdd.pdb"
ProgramDataBaseFileName="..\lib_vc71\PocoUtilmdd.pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="4"
Expand All @@ -279,7 +279,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\lib\PocoUtilmdd.lib"/>
OutputFile="..\lib_vc71\PocoUtilmdd.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Expand All @@ -303,8 +303,8 @@
</Configuration>
<Configuration
Name="release_static_md|Win32"
OutputDirectory="obj\$(ConfigurationName)"
IntermediateDirectory="obj\$(ConfigurationName)"
OutputDirectory="obj_vc71\$(ConfigurationName)"
IntermediateDirectory="obj_vc71\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2">
<Tool
Expand All @@ -315,7 +315,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;_STATIC_CPPLIB"
StringPooling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="2"
Expand All @@ -333,7 +333,7 @@
DisableSpecificWarnings="4800;"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\lib\PocoUtilmd.lib"/>
OutputFile="..\lib_vc71\PocoUtilmd.lib"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Expand Down
4 changes: 2 additions & 2 deletions Externals/poco/build/config/MinGW
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ CXX = g++
LINK = $(CXX)
LIB = ar -cr
RANLIB = ranlib
SHLIB = $(CXX) -shared -mno-cygwin -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a
SHLIB = $(CXX) -shared -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a
SHLIBLN = $(POCO_BASE)/build/script/shlibln
STRIP = strip
DEP = $(POCO_BASE)/build/script/makedepend.gcc
Expand Down Expand Up @@ -66,7 +66,7 @@ RELEASEOPT_LINK = -O2
#
# System Specific Flags
#
SYSFLAGS = -mno-cygwin -D_WIN32 -DMINGW32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED -I/usr/local/include -I/usr/include
SYSFLAGS = -D_WIN32 -DMINGW32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED -I/usr/local/include -I/usr/include

#
# System Specific Libraries
Expand Down
25 changes: 2 additions & 23 deletions ShellExtension/WinMergeShell.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
#include "WinMergeShell.h"
#include "UnicodeString.h"
#include "RegKey.h"
#include "coretools.h"
#include <sys/types.h>
#include <sys/stat.h>

Expand Down Expand Up @@ -340,8 +339,8 @@ HRESULT CWinMergeShell::InvokeCommand(LPCMINVOKECOMMANDINFO pCmdInfo)
if (!GetWinMergeDir(strWinMergePath))
return S_FALSE;

// Check that file we are trying to execute exists and is executable
if (!CheckExecutable(strWinMergePath))
// Check that file we are trying to execute exists
if (!PathFileExists(strWinMergePath.c_str()))
return S_FALSE;

if (LOWORD(pCmdInfo->lpVerb) == 0)
Expand Down Expand Up @@ -445,26 +444,6 @@ BOOL CWinMergeShell::GetWinMergeDir(String &strDir)
return TRUE;
}

/// Checks if given file exists and is executable
BOOL CWinMergeShell::CheckExecutable(String path)
{
String sExt;
SplitFilename(path.c_str(), NULL, NULL, &sExt);

// Check extension
if (_tcsicmp(sExt.c_str(), _T("exe")) == 0 ||
_tcsicmp(sExt.c_str(), _T("cmd")) == 0 ||
_tcsicmp(sExt.c_str(), _T("bat")) == 0)
{
// Check if file exists
struct _stati64 statBuffer;
int nRetVal = _tstati64(path.c_str(), &statBuffer);
if (nRetVal > -1)
return TRUE;
}
return FALSE;
}

/// Create menu for simple mode
int CWinMergeShell::DrawSimpleMenu(HMENU hmenu, UINT uMenuIndex,
UINT uidFirstCmd)
Expand Down
Loading

0 comments on commit d1617c2

Please sign in to comment.