From fe9c13102dee0c426b878a885127364e1593dae7 Mon Sep 17 00:00:00 2001 From: Lara Dzivdzanovic <138066575+vrabac6@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:53:05 +0100 Subject: [PATCH] feat(PocoDoc): search support (#4494) * feat(PocoDoc): search support * feat(PocoDoc): enable FTS5 for search support * feat(PocoDoc): enable FTS5 * chore(pocodoc): edit comment * fix(StreamCopier): add argument to seekg * enable searchIndex through the command line * Add minor updates for search support * Update of vs90 and regeneration of vs160 and vs170 projects * Enhance configure script:FTS5 support for SQLite in --sqlite-fts flag * Add tests for FTS3 and FTS5 * regeneration of vs160 and vs170 projects * added missing lib data in CMake * Update vs90 project and regenerate vs160 and vs170 projects with added Data include paths * Revrting ProGen_vs170.vcxproj * Revert ProGen in vs170 and regenerate PocoDoc vs160/vs170 projects to include updated Data path * added missing includes --------- Co-authored-by: Lara <lara@debian-gnu-linux-12.localdomain> --- CMakeLists.txt | 2 + Data/SQLite/SQLite.progen | 2 +- Data/SQLite/SQLite_vs160.vcxproj | 148 ++++++------ Data/SQLite/SQLite_vs160.vcxproj.filters | 12 +- Data/SQLite/SQLite_vs170.vcxproj | 166 ++++++------- Data/SQLite/SQLite_vs170.vcxproj.filters | 12 +- Data/SQLite/testsuite/src/SQLiteTest.cpp | 66 +++--- Data/SQLite/testsuite/src/SQLiteTest.h | 2 +- PocoDoc/CMakeLists.txt | 7 +- PocoDoc/Makefile | 6 +- PocoDoc/PocoDoc_vs160.vcxproj | 128 +++++----- PocoDoc/PocoDoc_vs160.vcxproj.filters | 12 +- PocoDoc/PocoDoc_vs170.vcxproj | 148 ++++++------ PocoDoc/PocoDoc_vs170.vcxproj.filters | 12 +- PocoDoc/PocoDoc_vs90.vcproj | 12 +- PocoDoc/src/DocWriter.cpp | 288 +++++++++++++++-------- PocoDoc/src/DocWriter.h | 56 +++-- PocoDoc/src/PocoDoc.cpp | 38 ++- ProGen/ProGen_vs170.vcxproj | 2 +- configure | 4 +- 20 files changed, 635 insertions(+), 488 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 718e16cd8..861c27c56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -329,6 +329,8 @@ if(ENABLE_POCODOC) set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE) set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) set(ENABLE_CPPPARSER ON CACHE BOOL "Enable C++ parser" FORCE) + set(ENABLE_DATA ON CACHE BOOL "Enable Data" FORCE) + set(ENABLE_DATA_SQLITE ON CACHE BOOL "Enable Data SQLite" FORCE) endif() if(ENABLE_UTIL AND ENABLE_TESTS) diff --git a/Data/SQLite/SQLite.progen b/Data/SQLite/SQLite.progen index eed02321f..219006c18 100644 --- a/Data/SQLite/SQLite.progen +++ b/Data/SQLite/SQLite.progen @@ -8,7 +8,7 @@ vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Data\\include -vc.project.compiler.defines = SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED +vc.project.compiler.defines = SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} diff --git a/Data/SQLite/SQLite_vs160.vcxproj b/Data/SQLite/SQLite_vs160.vcxproj index 003ebb665..621eb2f92 100644 --- a/Data/SQLite/SQLite_vs160.vcxproj +++ b/Data/SQLite/SQLite_vs160.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="debug_shared|Win32"> @@ -57,108 +57,108 @@ <RootNamespace>SQLite</RootNamespace> <Keyword>Win32Proj</Keyword> </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> - <ImportGroup Label="ExtensionSettings"/> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings" /> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> - <PropertyGroup Label="UserMacros"/> + <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <_ProjectFileVersion>17.0.34714.143</_ProjectFileVersion> + <_ProjectFileVersion>17.0.35327.3</_ProjectFileVersion> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDataSQLited</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDataSQLitemdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDataSQLitemtd</TargetName> @@ -228,7 +228,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -236,7 +236,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -266,16 +266,16 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> @@ -288,7 +288,7 @@ <OutputFile>..\..\bin\PocoDataSQLite.dll</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> <GenerateDebugInformation>false</GenerateDebugInformation> - <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>..\..\cmakebuild\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -300,7 +300,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> @@ -308,7 +308,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -331,16 +331,16 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> @@ -357,7 +357,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -365,7 +365,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -388,17 +388,17 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -414,7 +414,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -422,7 +422,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -452,16 +452,16 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> @@ -486,7 +486,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> @@ -494,7 +494,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -517,16 +517,16 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> @@ -543,7 +543,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -551,7 +551,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -574,16 +574,16 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> @@ -597,16 +597,16 @@ </Lib> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="include\Poco\Data\SQLite\Binder.h"/> - <ClInclude Include="include\Poco\Data\SQLite\Connector.h"/> - <ClInclude Include="include\Poco\Data\SQLite\Extractor.h"/> - <ClInclude Include="include\Poco\Data\SQLite\Notifier.h"/> - <ClInclude Include="include\Poco\Data\SQLite\SessionImpl.h"/> - <ClInclude Include="include\Poco\Data\SQLite\SQLite.h"/> - <ClInclude Include="include\Poco\Data\SQLite\SQLiteException.h"/> - <ClInclude Include="include\Poco\Data\SQLite\SQLiteStatementImpl.h"/> - <ClInclude Include="include\Poco\Data\SQLite\Utility.h"/> - <ClInclude Include="src\sqlite3.h"/> + <ClInclude Include="include\Poco\Data\SQLite\Binder.h" /> + <ClInclude Include="include\Poco\Data\SQLite\Connector.h" /> + <ClInclude Include="include\Poco\Data\SQLite\Extractor.h" /> + <ClInclude Include="include\Poco\Data\SQLite\Notifier.h" /> + <ClInclude Include="include\Poco\Data\SQLite\SessionImpl.h" /> + <ClInclude Include="include\Poco\Data\SQLite\SQLite.h" /> + <ClInclude Include="include\Poco\Data\SQLite\SQLiteException.h" /> + <ClInclude Include="include\Poco\Data\SQLite\SQLiteStatementImpl.h" /> + <ClInclude Include="include\Poco\Data\SQLite\Utility.h" /> + <ClInclude Include="src\sqlite3.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="src\Binder.cpp"> @@ -667,6 +667,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> </ResourceCompile> </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> - <ImportGroup Label="ExtensionTargets"/> -</Project> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets" /> +</Project> \ No newline at end of file diff --git a/Data/SQLite/SQLite_vs160.vcxproj.filters b/Data/SQLite/SQLite_vs160.vcxproj.filters index 9d68ba51f..90c46fed6 100644 --- a/Data/SQLite/SQLite_vs160.vcxproj.filters +++ b/Data/SQLite/SQLite_vs160.vcxproj.filters @@ -2,22 +2,22 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="SQLite"> - <UniqueIdentifier>{08f657c8-6a2c-4a05-9cb8-0a24df22511f}</UniqueIdentifier> + <UniqueIdentifier>{100e33ce-9d1d-4aa8-a695-8a142faf8823}</UniqueIdentifier> </Filter> <Filter Include="SQLite\Header Files"> - <UniqueIdentifier>{137e5445-13e9-4d0e-88ca-b51c2a78b87f}</UniqueIdentifier> + <UniqueIdentifier>{77206dbd-501e-4814-8778-66aec54307c6}</UniqueIdentifier> </Filter> <Filter Include="SQLite\Source Files"> - <UniqueIdentifier>{5ca955a1-b2cf-4690-aab9-5e8d1ab6b763}</UniqueIdentifier> + <UniqueIdentifier>{5fcf0bdd-b676-4729-900c-bc7f1383a543}</UniqueIdentifier> </Filter> <Filter Include="3rdparty"> - <UniqueIdentifier>{5c4ae9d1-7bd9-4987-8827-56c88c89d82d}</UniqueIdentifier> + <UniqueIdentifier>{85efd7ee-ee09-40d2-acd1-3a29ed7439f6}</UniqueIdentifier> </Filter> <Filter Include="3rdparty\Header Files"> - <UniqueIdentifier>{62d12f40-dd7c-4f3d-b128-b1a896b55544}</UniqueIdentifier> + <UniqueIdentifier>{b862c44f-e276-42f3-b078-837cf482a0c1}</UniqueIdentifier> </Filter> <Filter Include="3rdparty\Source Files"> - <UniqueIdentifier>{34619493-0c10-4820-a64c-1a7b24284750}</UniqueIdentifier> + <UniqueIdentifier>{9d999f10-40c8-408d-bc98-354804d153eb}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/Data/SQLite/SQLite_vs170.vcxproj b/Data/SQLite/SQLite_vs170.vcxproj index 5c07da8ef..d1c1fe344 100644 --- a/Data/SQLite/SQLite_vs170.vcxproj +++ b/Data/SQLite/SQLite_vs170.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="debug_shared|ARM64"> @@ -81,7 +81,7 @@ <RootNamespace>SQLite</RootNamespace> <Keyword>Win32Proj</Keyword> </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> @@ -172,65 +172,65 @@ <CharacterSet>MultiByte</CharacterSet> <PlatformToolset>v143</PlatformToolset> </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> - <ImportGroup Label="ExtensionSettings"/> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings" /> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> - <PropertyGroup Label="UserMacros"/> + <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <_ProjectFileVersion>17.0.34714.143</_ProjectFileVersion> + <_ProjectFileVersion>17.0.35327.3</_ProjectFileVersion> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataSQLiteA64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataSQLitemdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataSQLitemtd</TargetName> @@ -332,7 +332,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -340,7 +340,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -370,16 +370,16 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> @@ -392,7 +392,7 @@ <OutputFile>..\..\binA64\PocoDataSQLiteA64.dll</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> <GenerateDebugInformation>false</GenerateDebugInformation> - <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>..\..\cmakebuild\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -404,7 +404,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> @@ -412,7 +412,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -435,16 +435,16 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> @@ -461,7 +461,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -469,7 +469,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -492,16 +492,16 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> @@ -518,7 +518,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -526,7 +526,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -556,16 +556,16 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> @@ -590,7 +590,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> @@ -598,7 +598,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -621,16 +621,16 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> @@ -647,7 +647,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -655,7 +655,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -678,17 +678,17 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -704,7 +704,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -712,7 +712,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -742,16 +742,16 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> @@ -776,7 +776,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> @@ -784,7 +784,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -807,16 +807,16 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> @@ -833,7 +833,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -841,7 +841,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -864,16 +864,16 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS5;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> @@ -887,16 +887,16 @@ </Lib> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="include\Poco\Data\SQLite\Binder.h"/> - <ClInclude Include="include\Poco\Data\SQLite\Connector.h"/> - <ClInclude Include="include\Poco\Data\SQLite\Extractor.h"/> - <ClInclude Include="include\Poco\Data\SQLite\Notifier.h"/> - <ClInclude Include="include\Poco\Data\SQLite\SessionImpl.h"/> - <ClInclude Include="include\Poco\Data\SQLite\SQLite.h"/> - <ClInclude Include="include\Poco\Data\SQLite\SQLiteException.h"/> - <ClInclude Include="include\Poco\Data\SQLite\SQLiteStatementImpl.h"/> - <ClInclude Include="include\Poco\Data\SQLite\Utility.h"/> - <ClInclude Include="src\sqlite3.h"/> + <ClInclude Include="include\Poco\Data\SQLite\Binder.h" /> + <ClInclude Include="include\Poco\Data\SQLite\Connector.h" /> + <ClInclude Include="include\Poco\Data\SQLite\Extractor.h" /> + <ClInclude Include="include\Poco\Data\SQLite\Notifier.h" /> + <ClInclude Include="include\Poco\Data\SQLite\SessionImpl.h" /> + <ClInclude Include="include\Poco\Data\SQLite\SQLite.h" /> + <ClInclude Include="include\Poco\Data\SQLite\SQLiteException.h" /> + <ClInclude Include="include\Poco\Data\SQLite\SQLiteStatementImpl.h" /> + <ClInclude Include="include\Poco\Data\SQLite\Utility.h" /> + <ClInclude Include="src\sqlite3.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="src\Binder.cpp"> @@ -961,6 +961,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> </ResourceCompile> </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> - <ImportGroup Label="ExtensionTargets"/> -</Project> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets" /> +</Project> \ No newline at end of file diff --git a/Data/SQLite/SQLite_vs170.vcxproj.filters b/Data/SQLite/SQLite_vs170.vcxproj.filters index 4764bc27e..2f5e07103 100644 --- a/Data/SQLite/SQLite_vs170.vcxproj.filters +++ b/Data/SQLite/SQLite_vs170.vcxproj.filters @@ -2,22 +2,22 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="SQLite"> - <UniqueIdentifier>{c43e4fe6-e999-4710-abf9-c3ac71054bdf}</UniqueIdentifier> + <UniqueIdentifier>{ae0dae38-b1e2-4c25-8986-ffb7a71d63d2}</UniqueIdentifier> </Filter> <Filter Include="SQLite\Header Files"> - <UniqueIdentifier>{256a7282-f781-469b-82ef-898c04defe77}</UniqueIdentifier> + <UniqueIdentifier>{967a7f18-16d5-4138-963c-14f5581c1d06}</UniqueIdentifier> </Filter> <Filter Include="SQLite\Source Files"> - <UniqueIdentifier>{1dec9834-f18c-4dfe-8e14-d35b73b83636}</UniqueIdentifier> + <UniqueIdentifier>{750e3590-154f-43ef-922f-fb208184f6cb}</UniqueIdentifier> </Filter> <Filter Include="3rdparty"> - <UniqueIdentifier>{3a52346c-b114-4989-9c9d-55627fabbe24}</UniqueIdentifier> + <UniqueIdentifier>{b491a2c6-9895-4ba1-b059-50b156e55b0e}</UniqueIdentifier> </Filter> <Filter Include="3rdparty\Header Files"> - <UniqueIdentifier>{faae9992-6c0f-4ac6-9af2-2e3a2bb39def}</UniqueIdentifier> + <UniqueIdentifier>{518b3aba-5a41-47bc-b125-23bc694773a9}</UniqueIdentifier> </Filter> <Filter Include="3rdparty\Source Files"> - <UniqueIdentifier>{e9f5da58-ed7a-4e9d-8731-751b30b0f2a8}</UniqueIdentifier> + <UniqueIdentifier>{930ce918-f656-4d48-ab21-addd59889448}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/Data/SQLite/testsuite/src/SQLiteTest.cpp b/Data/SQLite/testsuite/src/SQLiteTest.cpp index 824212732..71e54f4a9 100755 --- a/Data/SQLite/testsuite/src/SQLiteTest.cpp +++ b/Data/SQLite/testsuite/src/SQLiteTest.cpp @@ -3588,48 +3588,56 @@ void SQLiteTest::testTransactor() } -void SQLiteTest::testFTS3() +void SQLiteTest::testFTS() { -#ifdef SQLITE_ENABLE_FTS3 +#if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS5) Session session(Poco::Data::SQLite::Connector::KEY, "dummy.db"); - assertTrue (session.isConnected()); + assertTrue(session.isConnected()); session << "DROP TABLE IF EXISTS docs", now; + +#if defined(SQLITE_ENABLE_FTS5) + session << "CREATE VIRTUAL TABLE docs USING fts5(content)", now; + const std::string idColumn = "rowid"; +#elif defined(SQLITE_ENABLE_FTS3) session << "CREATE VIRTUAL TABLE docs USING fts3()", now; + const std::string idColumn = "docid"; +#endif - session << "INSERT INTO docs(docid, content) VALUES(1, 'a database is a software system')", now; - session << "INSERT INTO docs(docid, content) VALUES(2, 'sqlite is a software system')", now; - session << "INSERT INTO docs(docid, content) VALUES(3, 'sqlite is a database')", now; + session << "INSERT INTO docs(" << idColumn << ", content) VALUES(1, 'a database is a software system')", now; + session << "INSERT INTO docs(" << idColumn << ", content) VALUES(2, 'sqlite is a software system')", now; + session << "INSERT INTO docs(" << idColumn << ", content) VALUES(3, 'sqlite is a database')", now; - int docid = 0; - session << "SELECT docid FROM docs WHERE docs MATCH 'sqlite AND database'", into(docid), now; - assertTrue (docid == 3); + int id = 0; + session << "SELECT " << idColumn << " FROM docs WHERE docs MATCH 'sqlite AND database'", into(id), now; + assertTrue(id == 3); - docid = 0; - session << "SELECT docid FROM docs WHERE docs MATCH 'database sqlite'", into(docid), now; - assertTrue (docid == 3); + id = 0; + session << "SELECT " << idColumn << " FROM docs WHERE docs MATCH 'database sqlite'", into(id), now; + assertTrue(id == 3); - std::vector<int> docids; - session << "SELECT docid FROM docs WHERE docs MATCH 'sqlite OR database' ORDER BY docid", - into(docids), now; - assertTrue (docids.size() == 3); - assertTrue (docids[0] == 1); - assertTrue (docids[1] == 2); - assertTrue (docids[2] == 3); + std::vector<int> ids; + session << "SELECT " << idColumn << " FROM docs WHERE docs MATCH 'sqlite OR database' ORDER BY " << idColumn, + into(ids), now; + assertTrue(ids.size() == 3); + assertTrue(ids[0] == 1); + assertTrue(ids[1] == 2); + assertTrue(ids[2] == 3); std::string content; - docid = 0; - session << "SELECT docid, content FROM docs WHERE docs MATCH 'database NOT sqlite'", - into(docid), into(content), now; - assertTrue (docid == 1); - assertTrue (content == "a database is a software system"); + id = 0; + session << "SELECT " << idColumn << ", content FROM docs WHERE docs MATCH 'database NOT sqlite'", + into(id), into(content), now; + assertTrue(id == 1); + assertTrue(content == "a database is a software system"); + + id = 0; + session << "SELECT count(*) FROM docs WHERE docs MATCH 'database and sqlite'", into(id), now; + assertTrue(id == 0); - docid = 0; - session << "SELECT count(*) FROM docs WHERE docs MATCH 'database and sqlite'", into(docid), now; - assertTrue (docid == 0); #else std::cout << "SQLite FTS not enabled, test not executed." << std::endl; -#endif // SQLITE_ENABLE_FTS3 +#endif } @@ -3856,7 +3864,7 @@ CppUnit::Test* SQLiteTest::suite() CppUnit_addTest(pSuite, SQLiteTest, testSessionTransactionRepeatableRead); CppUnit_addTest(pSuite, SQLiteTest, testTransaction); CppUnit_addTest(pSuite, SQLiteTest, testTransactor); - CppUnit_addTest(pSuite, SQLiteTest, testFTS3); + CppUnit_addTest(pSuite, SQLiteTest, testFTS); CppUnit_addTest(pSuite, SQLiteTest, testIllegalFilePath); CppUnit_addTest(pSuite, SQLiteTest, testTransactionTypeProperty); CppUnit_addTest(pSuite, SQLiteTest, testRecordsetCopyMove); diff --git a/Data/SQLite/testsuite/src/SQLiteTest.h b/Data/SQLite/testsuite/src/SQLiteTest.h index e860b365d..400b0358d 100755 --- a/Data/SQLite/testsuite/src/SQLiteTest.h +++ b/Data/SQLite/testsuite/src/SQLiteTest.h @@ -139,7 +139,7 @@ public: void testTransaction(); void testTransactor(); - void testFTS3(); + void testFTS(); void testIllegalFilePath(); void testTransactionTypeProperty(); diff --git a/PocoDoc/CMakeLists.txt b/PocoDoc/CMakeLists.txt index 6aea654d5..875564bc5 100644 --- a/PocoDoc/CMakeLists.txt +++ b/PocoDoc/CMakeLists.txt @@ -4,7 +4,12 @@ POCO_SOURCES_AUTO(SRCS ${SRCS_G}) add_executable(PocoDoc ${SRCS}) -target_link_libraries(PocoDoc PUBLIC Poco::Util Poco::XML Poco::CppParser) +target_link_libraries(PocoDoc PUBLIC Poco::Util Poco::XML Poco::CppParser Poco::DataSQLite Poco::Data) + +if(ENABLE_DATA_SQLITE_FTS5) + target_compile_definitions(PocoDoc PRIVATE POCO_ENABLE_SQLITE_FTS5) +endif() + install( TARGETS PocoDoc EXPORT PocoDocTargets diff --git a/PocoDoc/Makefile b/PocoDoc/Makefile index e0afbddcc..71a0ce906 100644 --- a/PocoDoc/Makefile +++ b/PocoDoc/Makefile @@ -10,6 +10,10 @@ objects = DocWriter PocoDoc target = PocoDoc target_version = 1 -target_libs = PocoCppParser PocoFoundation PocoXML PocoUtil +target_libs = PocoCppParser PocoDataSQLite PocoData PocoFoundation PocoXML PocoUtil + +ifdef POCO_ENABLE_SQLITE_FTS5 +CXXFLAGS += -DPOCO_ENABLE_SQLITE_FTS5 +endif include $(POCO_BASE)/build/rules/exec diff --git a/PocoDoc/PocoDoc_vs160.vcxproj b/PocoDoc/PocoDoc_vs160.vcxproj index edebfcdf1..c6eb74dd7 100644 --- a/PocoDoc/PocoDoc_vs160.vcxproj +++ b/PocoDoc/PocoDoc_vs160.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="debug_shared|Win32"> @@ -57,108 +57,108 @@ <RootNamespace>PocoDoc</RootNamespace> <Keyword>Win32Proj</Keyword> </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> - <ImportGroup Label="ExtensionSettings"/> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings" /> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> - <PropertyGroup Label="UserMacros"/> + <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <_ProjectFileVersion>17.0.34714.143</_ProjectFileVersion> + <_ProjectFileVersion>17.0.35327.3</_ProjectFileVersion> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDocd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDocd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDocd</TargetName> @@ -235,7 +235,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -244,7 +244,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -272,7 +272,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -280,9 +280,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -304,7 +304,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -313,7 +313,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -341,7 +341,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> @@ -349,9 +349,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -373,7 +373,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -382,7 +382,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -410,7 +410,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -418,9 +418,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -442,7 +442,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -451,7 +451,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -479,7 +479,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -487,9 +487,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -511,7 +511,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -520,7 +520,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -548,7 +548,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> @@ -556,9 +556,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -580,7 +580,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -589,7 +589,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -617,7 +617,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -625,9 +625,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -659,8 +659,8 @@ </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="src\DocWriter.h"/> + <ClInclude Include="src\DocWriter.h" /> </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> - <ImportGroup Label="ExtensionTargets"/> -</Project> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets" /> +</Project> \ No newline at end of file diff --git a/PocoDoc/PocoDoc_vs160.vcxproj.filters b/PocoDoc/PocoDoc_vs160.vcxproj.filters index 86dd0760f..5bf82b63f 100644 --- a/PocoDoc/PocoDoc_vs160.vcxproj.filters +++ b/PocoDoc/PocoDoc_vs160.vcxproj.filters @@ -2,22 +2,22 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="App"> - <UniqueIdentifier>{60784c21-9594-42df-b825-d0f44b70df1c}</UniqueIdentifier> + <UniqueIdentifier>{0b291a8e-c71d-46bc-8348-147e056b8a09}</UniqueIdentifier> </Filter> <Filter Include="App\Header Files"> - <UniqueIdentifier>{2a417507-cb80-467d-b536-9153294bfc14}</UniqueIdentifier> + <UniqueIdentifier>{29bd7595-9fdb-4c4c-b3dd-0f693a4c2524}</UniqueIdentifier> </Filter> <Filter Include="App\Source Files"> - <UniqueIdentifier>{b343204e-6b48-4460-bada-38c9cfe379c0}</UniqueIdentifier> + <UniqueIdentifier>{ba8b5543-a1b8-42e2-ac04-e652c5cdbced}</UniqueIdentifier> </Filter> <Filter Include="DocWriter"> - <UniqueIdentifier>{572c4d2f-4b19-47ab-9865-e808cb6873e7}</UniqueIdentifier> + <UniqueIdentifier>{155b2f8e-3aa5-4355-9820-93c49058304c}</UniqueIdentifier> </Filter> <Filter Include="DocWriter\Header Files"> - <UniqueIdentifier>{07846630-d09f-4420-a819-1485dc758039}</UniqueIdentifier> + <UniqueIdentifier>{0111ff6f-7026-43c7-8721-0a781c4e2011}</UniqueIdentifier> </Filter> <Filter Include="DocWriter\Source Files"> - <UniqueIdentifier>{0979336d-8413-4b57-876f-3093be25d25e}</UniqueIdentifier> + <UniqueIdentifier>{add29ffa-71d0-4b29-8772-3b8ede2c0578}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/PocoDoc/PocoDoc_vs170.vcxproj b/PocoDoc/PocoDoc_vs170.vcxproj index 87cd2a4d0..9f6dc495c 100644 --- a/PocoDoc/PocoDoc_vs170.vcxproj +++ b/PocoDoc/PocoDoc_vs170.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="debug_shared|ARM64"> @@ -81,7 +81,7 @@ <RootNamespace>PocoDoc</RootNamespace> <Keyword>Win32Proj</Keyword> </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> @@ -172,65 +172,65 @@ <CharacterSet>MultiByte</CharacterSet> <PlatformToolset>v143</PlatformToolset> </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> - <ImportGroup Label="ExtensionSettings"/> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings" /> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets"> - <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> + <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" /> </ImportGroup> - <PropertyGroup Label="UserMacros"/> + <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <_ProjectFileVersion>17.0.34714.143</_ProjectFileVersion> + <_ProjectFileVersion>17.0.35327.3</_ProjectFileVersion> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDocd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDocd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDocd</TargetName> @@ -343,7 +343,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -352,7 +352,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -380,7 +380,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -388,9 +388,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -401,7 +401,7 @@ <Link> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>binA64\PocoDoc.exe</OutputFile> - <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>..\cmakebuild\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>false</GenerateDebugInformation> <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> @@ -412,7 +412,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -421,7 +421,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -449,7 +449,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> @@ -457,9 +457,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -481,7 +481,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -490,7 +490,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -518,7 +518,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -526,9 +526,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -550,7 +550,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -559,7 +559,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -587,7 +587,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -595,9 +595,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -619,7 +619,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -628,7 +628,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -656,7 +656,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> @@ -664,9 +664,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -688,7 +688,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -697,7 +697,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -725,7 +725,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -733,9 +733,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -757,7 +757,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -766,7 +766,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -794,7 +794,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -802,9 +802,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -826,7 +826,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -835,7 +835,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -863,7 +863,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> @@ -871,9 +871,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -895,7 +895,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -904,7 +904,7 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> @@ -932,7 +932,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include;..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -940,9 +940,9 @@ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <PrecompiledHeader/> + <PrecompiledHeader /> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat/> + <DebugInformationFormat /> <CompileAs>Default</CompileAs> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> @@ -974,8 +974,8 @@ </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="src\DocWriter.h"/> + <ClInclude Include="src\DocWriter.h" /> </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> - <ImportGroup Label="ExtensionTargets"/> -</Project> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets" /> +</Project> \ No newline at end of file diff --git a/PocoDoc/PocoDoc_vs170.vcxproj.filters b/PocoDoc/PocoDoc_vs170.vcxproj.filters index 1f42e3ada..dd5ddf3fa 100644 --- a/PocoDoc/PocoDoc_vs170.vcxproj.filters +++ b/PocoDoc/PocoDoc_vs170.vcxproj.filters @@ -2,22 +2,22 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="App"> - <UniqueIdentifier>{abb515b0-37cf-43bc-8081-2417ba256a35}</UniqueIdentifier> + <UniqueIdentifier>{e127d34c-f78b-4902-b934-a6974369873e}</UniqueIdentifier> </Filter> <Filter Include="App\Header Files"> - <UniqueIdentifier>{034e916f-4a84-41c9-91f7-d2a09774ada0}</UniqueIdentifier> + <UniqueIdentifier>{3c4639a2-bdfa-454e-a0bb-156efcdc4d1b}</UniqueIdentifier> </Filter> <Filter Include="App\Source Files"> - <UniqueIdentifier>{e1d183cb-db45-4d44-8191-46a8ff6fbbbd}</UniqueIdentifier> + <UniqueIdentifier>{1fac1a57-a6be-4556-ab65-6242b798235b}</UniqueIdentifier> </Filter> <Filter Include="DocWriter"> - <UniqueIdentifier>{5da1f85a-7191-4d50-8747-370fd4464c83}</UniqueIdentifier> + <UniqueIdentifier>{87558a66-7531-4268-9dfd-6b29ab199b39}</UniqueIdentifier> </Filter> <Filter Include="DocWriter\Header Files"> - <UniqueIdentifier>{13f498d3-46dc-4820-abf1-9149f60b7357}</UniqueIdentifier> + <UniqueIdentifier>{e9f8c28c-cd2e-452d-a888-629342edaa16}</UniqueIdentifier> </Filter> <Filter Include="DocWriter\Source Files"> - <UniqueIdentifier>{bd80a19d-554f-4399-b193-eb5379ca1d4c}</UniqueIdentifier> + <UniqueIdentifier>{a5c1686d-ccb8-4494-83c9-87491c65cd97}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/PocoDoc/PocoDoc_vs90.vcproj b/PocoDoc/PocoDoc_vs90.vcproj index 6c7d56679..b2096c74c 100644 --- a/PocoDoc/PocoDoc_vs90.vcproj +++ b/PocoDoc/PocoDoc_vs90.vcproj @@ -31,7 +31,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include" + AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;" StringPooling="true" MinimalRebuild="true" @@ -104,7 +104,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include" + AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;" StringPooling="true" RuntimeLibrary="2" @@ -171,7 +171,7 @@ <Tool Name="VCCLCompilerTool" Optimization="4" - AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include" + AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;" StringPooling="true" MinimalRebuild="true" @@ -244,7 +244,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include" + AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -311,7 +311,7 @@ <Tool Name="VCCLCompilerTool" Optimization="4" - AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include" + AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;" StringPooling="true" MinimalRebuild="true" @@ -384,7 +384,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include" + AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" diff --git a/PocoDoc/src/DocWriter.cpp b/PocoDoc/src/DocWriter.cpp index bc8a04fc7..d9fbf13e7 100644 --- a/PocoDoc/src/DocWriter.cpp +++ b/PocoDoc/src/DocWriter.cpp @@ -26,12 +26,19 @@ #include "Poco/CppParser/Parameter.h" #include "Poco/CppParser/TypeDef.h" #include "Poco/CppParser/Variable.h" +#include "Poco/Data/Session.h" +#include "Poco/Data/SQLite/Connector.h" #include <map> #include <fstream> #include <sstream> #include <cctype> +#include <vector> +#include <iostream> +using namespace Poco::Data::Keywords; +using Poco::Data::Session; +using Poco::Data::Statement; using Poco::NumberFormatter; using Poco::Path; using Poco::DateTime; @@ -48,9 +55,11 @@ DocWriter::StringMap DocWriter::_strings; Poco::Logger* DocWriter::_pLogger(0); const std::string DocWriter::RFC_URI("https://www.ietf.org/rfc/rfc"); const std::string DocWriter::GITHUB_POCO_URI("https://github.com/pocoproject/poco"); +const std::string DocWriter::DATABASE_DIR("/dist/"); +const std::string DocWriter::DATABASE_NAME("docs.db"); -DocWriter::DocWriter(const NameSpace::SymbolTable& symbols, const std::string& path, bool prettifyCode, bool noFrames): +DocWriter::DocWriter(const NameSpace::SymbolTable& symbols, const std::string& path, bool prettifyCode, bool noFrames, bool searchIndex): _prettifyCode(prettifyCode), _noFrames(noFrames), _htmlMode(false), @@ -60,7 +69,8 @@ DocWriter::DocWriter(const NameSpace::SymbolTable& symbols, const std::string& p _pNameSpace(0), _pendingLine(false), _indent(0), - _titleId(0) + _titleId(0), + _searchIndex(searchIndex) { _pLogger = &Poco::Logger::get("DocWriter"); @@ -70,6 +80,7 @@ DocWriter::DocWriter(const NameSpace::SymbolTable& symbols, const std::string& p logger().information(std::string("Loading translation strings [") + _language + "]"); loadStrings(_language); + if (_searchIndex) initDatabase(); } @@ -78,6 +89,35 @@ DocWriter::~DocWriter() } +void DocWriter::initDatabase() +{ + Poco::Data::SQLite::Connector::registerConnector(); + std::string dbPath = _path + DATABASE_DIR + DATABASE_NAME; + Session session("SQLite", dbPath); + session << "DROP TABLE IF EXISTS docs", now; + session << "CREATE VIRTUAL TABLE docs USING fts5( link, content )", now; +} + + +void DocWriter::writeSearchIndex(std::string link, std::string content) +{ + try + { + if (!content.empty()) + { + Poco::Data::SQLite::Connector::registerConnector(); + std::string dbPath = _path + DATABASE_DIR + DATABASE_NAME; + Session session("SQLite", dbPath); + session << "INSERT INTO docs(link, content) VALUES (?, ?)", use(link), use(content), now; + } + } + catch (Poco::Exception& e) + { + _pLogger->error(e.displayText()); + } +} + + void DocWriter::addPage(const std::string& path) { Page page; @@ -208,7 +248,7 @@ void DocWriter::writeNavigation() ostr << "<div> </div>\n"; // workaround to avoid cutting off a few pixels from last line endBody(ostr); ostr << "<script>CollapsibleLists.apply(true)</script>" << std::endl; - writeFooter(ostr, NO_TRACKING | NO_CUSTOM_HTML); + writeFooter(ostr, NO_TRACKING); } @@ -386,6 +426,7 @@ void DocWriter::writeClass(const Struct* pStruct) _pNameSpace = pStruct; std::string path(pathFor(fileNameFor(pStruct))); std::ofstream ostr(path.c_str()); + std::ostringstream sstr; if (!ostr.good()) throw Poco::CreateFileException(path); std::string header; if (pStruct->isClass()) @@ -410,7 +451,7 @@ void DocWriter::writeClass(const Struct* pStruct) logger().notice(std::string("TODO in class documentation for ") + pStruct->fullName()); writeSubTitle(ostr, tr("Description")); - writeDescription(ostr, pStruct->getDocumentation()); + writeDescription(ostr, pStruct->getDocumentation(), &sstr); } else if (pStruct->isPublic() && !pStruct->isDerived()) { @@ -419,23 +460,25 @@ void DocWriter::writeClass(const Struct* pStruct) writeInheritance(ostr, pStruct); writeMethodSummary(ostr, pStruct); writeNestedClasses(ostr, pStruct); - writeTypes(ostr, pStruct); - writeAliases(ostr, pStruct); - writeEnums(ostr, pStruct); + writeTypes(ostr, pStruct, &sstr); + writeAliases(ostr, pStruct, &sstr); + writeEnums(ostr, pStruct, &sstr); writeConstructors(ostr, pStruct); writeDestructor(ostr, pStruct); writeMethods(ostr, pStruct); - writeVariables(ostr, pStruct); + writeVariables(ostr, pStruct, &sstr); writeCopyright(ostr); endContent(ostr); endBody(ostr); writeFooter(ostr); + if (_searchIndex) writeSearchIndex(fileNameFor(pStruct), sstr.str()); } void DocWriter::writeNameSpace(const NameSpace* pNameSpace) { _pNameSpace = pNameSpace; + std::ostringstream sstr; std::string path(pathFor(fileNameFor(pNameSpace))); std::ofstream ostr(path.c_str()); if (!ostr.good()) throw Poco::CreateFileException(path); @@ -445,22 +488,23 @@ void DocWriter::writeNameSpace(const NameSpace* pNameSpace) writeNavigationFrame(ostr, "", ""); beginContent(ostr); writeSubTitle(ostr, tr("Overview")); - writeNameSpacesSummary(ostr, pNameSpace); - writeClassesSummary(ostr, pNameSpace); - writeTypesSummary(ostr, pNameSpace); - writeAliasesSummary(ostr, pNameSpace); - writeFunctionsSummary(ostr, pNameSpace); - writeNameSpaces(ostr, pNameSpace); - writeClasses(ostr, pNameSpace); - writeTypes(ostr, pNameSpace); - writeAliases(ostr, pNameSpace); - writeEnums(ostr, pNameSpace); - writeFunctions(ostr, pNameSpace); - writeVariables(ostr, pNameSpace); + writeNameSpacesSummary(ostr, pNameSpace, &sstr); + writeClassesSummary(ostr, pNameSpace, &sstr); + writeTypesSummary(ostr, pNameSpace, &sstr); + writeAliasesSummary(ostr, pNameSpace, &sstr); + writeFunctionsSummary(ostr, pNameSpace, &sstr); + writeNameSpaces(ostr, pNameSpace, &sstr); + writeClasses(ostr, pNameSpace, &sstr); + writeTypes(ostr, pNameSpace, &sstr); + writeAliases(ostr, pNameSpace, &sstr); + writeEnums(ostr, pNameSpace, &sstr); + writeFunctions(ostr, pNameSpace, &sstr); + writeVariables(ostr, pNameSpace, &sstr); writeCopyright(ostr); endContent(ostr); endBody(ostr); writeFooter(ostr); + if (_searchIndex) writeSearchIndex(fileNameFor(pNameSpace), sstr.str()); } @@ -468,6 +512,7 @@ void DocWriter::writePackage(const std::string& file, const std::string& library { std::string path(pathFor(file)); std::ofstream ostr(path.c_str()); + std::ostringstream sstr; if (!ostr.good()) throw Poco::CreateFileException(path); writeHeader(ostr, tr("Package_Index"), "js/iframeResizer.min.js"); writeTitle(ostr, tr("Library") + " " + library, tr("Package") + " " + package); @@ -561,6 +606,7 @@ void DocWriter::writePackage(const std::string& file, const std::string& library endContent(ostr); endBody(ostr); writeFooter(ostr); + if (_searchIndex) writeSearchIndex(file, sstr.str()); } @@ -641,6 +687,7 @@ void DocWriter::writeHeader(std::ostream& ostr, const std::string& title, const ostr << "<meta name=\"author\" content=\"" << htmlize(company) << "\"/>" << std::endl; ostr << "<meta name=\"generator\" content=\"" << app.config().getString("PocoDoc.generator", "PocoDoc") << "\"/>" << std::endl; ostr << "<link rel=\"stylesheet\" href=\"css/styles.css\" type=\"text/css\"/>" << std::endl; + ostr << "<link rel=\"stylesheet\" href=\"css/header.css\" type=\"text/css\"/>\n"; if (_prettifyCode) { ostr << "<link href=\"css/prettify.css\" type=\"text/css\" rel=\"stylesheet\"/>" << std::endl; @@ -705,7 +752,73 @@ void DocWriter::writeCopyright(std::ostream& ostr) } ostr << "</p>\n"; } +void DocWriter::writeSearchBox(std::ostream& ostr) +{ + ostr << "<div class=\"search-box\" style=\"text-align: center;\">\n"; + ostr << "<input type=\"text\" id=\"search\" name=\"search\" placeholder=\"Search...\">\n"; + ostr << "<div id=\"suggestions\"></div>\n"; + ostr << "</div>\n"; + ostr << "<script type=\"module\">\n"; + ostr << "import { load } from \"./dist/sql-httpvfs.js\";\n\n"; + ostr << "let db = null;\n\n"; + ostr << "async function initDb() {\n"; + ostr << " db = await load(\"./docs.db\");\n"; + ostr << "}\n\n"; + ostr << "async function searchPages(searchTerm) {\n"; + ostr << " if (!db || !searchTerm) return [];\n\n"; + ostr << " try {\n"; + ostr << " const query = `SELECT link, content, snippet(docs, 1, '<b>', '</b>', '...',10) as snippet FROM docs WHERE docs MATCH \"${searchTerm}\" ORDER BY RANK`;\n"; + ostr << " const results = await db.query(query);\n"; + ostr << " return results;\n"; + ostr << " } catch (error) {\n"; + ostr << " console.error(\"Error searching pages:\", error);\n"; + ostr << " return [];\n"; + ostr << " }\n"; + ostr << "}\n\n"; + ostr << "function escapeHTML(text) {\n"; + ostr << " const div = document.createElement('div');\n"; + ostr << " div.textContent = text;\n"; + ostr << " return div.innerHTML.replace(/<(\\/)?b>/g, '<$1b>');\n"; + ostr << "}\n\n"; + ostr << "document.addEventListener(\"DOMContentLoaded\", () => {\n"; + ostr << " document\n"; + ostr << " .getElementById(\"search\")\n"; + ostr << " .addEventListener(\"keyup\", async (event) => {\n"; + ostr << " const searchTerm = event.target.value.toLowerCase();\n"; + ostr << " const suggestionsEl = document.getElementById(\"suggestions\");\n\n"; + ostr << " if (searchTerm.length < 3) {\n"; + ostr << " suggestionsEl.style.display = \"none\";\n"; + ostr << " return;\n"; + ostr << " }\n\n"; + ostr << " const searchResults = await searchPages(searchTerm);\n"; + ostr << " let suggestions = \"\";\n\n"; + ostr << " if (searchResults.length === 0) {\n"; + ostr << " suggestions = \"<div>No search results found.</div>\";\n"; + ostr << " } else {\n"; + ostr << " for (const page of searchResults) {\n"; + ostr << " suggestions += `<a href=\"${page.link}\">${escapeHTML(page.snippet)}</a>`;\n"; + ostr << " }\n"; + ostr << " }\n\n"; + ostr << " suggestionsEl.innerHTML = suggestions;\n"; + ostr << " suggestionsEl.style.display = \"block\";\n"; + ostr << " });\n\n"; + ostr << " document.getElementById(\"search\").addEventListener(\"blur\", () => {\n"; + ostr << " setTimeout(() => {\n"; + ostr << " document.getElementById(\"suggestions\").style.display = \"none\";\n"; + ostr << " }, 100);\n"; + ostr << " });\n\n"; + ostr << " document.getElementById(\"search\").addEventListener(\"focus\", () => {\n"; + ostr << " if (document.getElementById(\"suggestions\").children.length > 0) {\n"; + ostr << " document.getElementById(\"suggestions\").style.display = \"block\";\n"; + ostr << " }\n"; + ostr << " });\n"; + ostr << " });\n\n"; + ostr << "initDb();\n"; + ostr << "</script>\n"; + + ostr << "\n</div>\n"; +} void DocWriter::writeTitle(std::ostream& ostr, const std::string& category, const std::string& title) { @@ -716,14 +829,14 @@ void DocWriter::writeTitle(std::ostream& ostr, const std::string& category, cons { ostr << "<img src=\"" << headerImage << "\" alt=\"\">\n"; } - ostr << "<h1 class=\"category\">"; + if (category.empty()) ostr << " "; else - ostr << htmlize(category); - ostr << "</h1>\n"; - ostr << "<h1 class=\"title\">" << htmlize(title) << "</h1>"; - ostr << "\n</div>\n"; + ostr << "<h1 class=\"category\">" << htmlize(category) << "</h1>"; + + ostr << "<h1 class=\"title\">" << htmlize(title) << "</h1>"; + writeSearchBox(ostr); } @@ -786,6 +899,7 @@ void DocWriter::writeTitle(std::ostream& ostr, const NameSpace* pNameSpace, cons << "</h1>"; } ostr << "\n</div>\n"; + writeSearchBox(ostr); } @@ -808,7 +922,7 @@ void DocWriter::writeNavigationFrame(std::ostream& ostr, const std::string& grou query += item; } ostr << "<div id=\"navigation\">\n"; - ostr << "<iframe sandbox=\"allow-scripts allow-top-navigation-by-user-activation allow-same-origin\" src=\"navigation.html" << query << "\" onload=\"iFrameResize(this);\" scrolling=\"no\"></iframe>\n"; + ostr << "<iframe src=\"navigation.html" << query << "\" onload=\"iFrameResize(this);\" scrolling=\"no\"></iframe>\n"; ostr << "</div>\n"; } @@ -837,10 +951,10 @@ void DocWriter::endContent(std::ostream& ostr) } -void DocWriter::writeDescription(std::ostream& ostr, const std::string& text) +void DocWriter::writeDescription(std::ostream& ostr, const std::string& text, std::ostream* pSstr) { ostr << "<div class=\"description\">\n" - << "<p>"; + << "<p>"; _titleId = 0; _htmlMode = false; @@ -851,7 +965,7 @@ void DocWriter::writeDescription(std::ostream& ostr, const std::string& text) { std::string line; while (it != end && *it != '\n') line += *it++; - writeDescriptionLine(ostr, line, state); + writeDescriptionLine(ostr, line, state, pSstr); if (it != end) ++it; } switch (state) @@ -875,7 +989,7 @@ void DocWriter::writeDescription(std::ostream& ostr, const std::string& text) } -void DocWriter::writeDescriptionLine(std::ostream& ostr, const std::string& text, TextState& state) +void DocWriter::writeDescriptionLine(std::ostream& ostr, const std::string& text, TextState& state, std::ostream* pSstr) { if (_htmlMode) { @@ -895,7 +1009,7 @@ void DocWriter::writeDescriptionLine(std::ostream& ostr, const std::string& text switch (state) { case TEXT_PARAGRAPH: - writeText(ostr, text); + writeText(ostr, text, pSstr); break; case TEXT_LIST: ostr << "</li>\n</ul>\n<p>"; @@ -1061,7 +1175,7 @@ std::string DocWriter::htmlizeName(const std::string& name) } -void DocWriter::writeText(std::ostream& ostr, const std::string& text) +void DocWriter::writeText(std::ostream& ostr, const std::string& text, std::ostream* pSstr) { std::string::const_iterator it(text.begin()); std::string::const_iterator end(text.end()); @@ -1085,21 +1199,23 @@ void DocWriter::writeText(std::ostream& ostr, const std::string& text) } while (it != end && std::isspace(*it)) ++it; ostr << "</p><" << heading << ">" << format("<a id=\"%d\">", _titleId++) << htmlize(std::string(it, end)) << "</a></" << heading << "><p>" << std::endl; + if (pSstr) *pSstr << std::string(it, end) << '\n'; return; } } - writeText(ostr, it, end); + writeText(ostr, it, end, pSstr); + if (pSstr) *pSstr << ' '; ostr << ' '; } -void DocWriter::writeText(std::ostream& ostr, std::string::const_iterator begin, const std::string::const_iterator& end) +void DocWriter::writeText(std::ostream& ostr, std::string::const_iterator begin, const std::string::const_iterator& end, std::ostream* pSstr) { std::string token; nextToken(begin, end, token); while (!token.empty()) { - if (!writeSymbol(ostr, token, begin, end) && !writeSpecial(ostr, token, begin, end)) + if (!writeSymbol(ostr, token, begin, end, pSstr) && !writeSpecial(ostr, token, begin, end)) { if (token == "[[") { @@ -1121,7 +1237,7 @@ void DocWriter::writeText(std::ostream& ostr, std::string::const_iterator begin, std::string target; if (uri.compare(0, 7, "http://") == 0 || uri.compare(0, 8, "https://") == 0) target = "_blank"; - writeTargetLink(ostr, uri, text, target); + writeTargetLink(ostr, uri, text, target, pSstr); } begin = it; nextToken(begin, end, token); @@ -1148,9 +1264,8 @@ void DocWriter::writeText(std::ostream& ostr, std::string::const_iterator begin, } begin = it; } - if (token == "GH" || token == "PR") + if (token == "GH") { - bool isPR = token == "PR"; std::string uri(GITHUB_POCO_URI); std::string::const_iterator it(begin); std::string spc; @@ -1172,7 +1287,7 @@ void DocWriter::writeText(std::ostream& ostr, std::string::const_iterator begin, nextToken(begin, end, n); if (!n.empty() && std::isdigit(n[0])) { - uri += isPR ? "/pull/" : "/issues/"; + uri += "/issues/"; uri += n; writeTargetLink(ostr, uri, token + " #" + n, "_blank"); nextToken(begin, end, token); @@ -1209,6 +1324,7 @@ void DocWriter::writeText(std::ostream& ostr, std::string::const_iterator begin, else { ostr << htmlize(token); + if (pSstr) *pSstr << token; } nextToken(begin, end, token); } @@ -1237,7 +1353,7 @@ void DocWriter::writeDecl(std::ostream& ostr, std::string::const_iterator begin, } -bool DocWriter::writeSymbol(std::ostream& ostr, std::string& token, std::string::const_iterator& begin, const std::string::const_iterator& end) +bool DocWriter::writeSymbol(std::ostream& ostr, std::string& token, std::string::const_iterator& begin, const std::string::const_iterator& end, std::ostream* pSstr) { if (std::isalnum(token[0]) && _pNameSpace) { @@ -1262,7 +1378,7 @@ bool DocWriter::writeSymbol(std::ostream& ostr, std::string& token, std::string: Symbol* pSym = _pNameSpace->lookup(id); if (pSym) { - writeLink(ostr, pSym, id); + writeLink(ostr, pSym, id, pSstr); nextToken(begin, end, token); return true; } @@ -1300,7 +1416,7 @@ bool DocWriter::writeSpecial(std::ostream& ostr, std::string& token, std::string { _htmlMode = false; } - else if (token == "<?" || token == "<?=") + else if (token == "<?") { std::string prop; nextToken(begin, end, token); @@ -1313,19 +1429,6 @@ bool DocWriter::writeSpecial(std::ostream& ostr, std::string& token, std::string Application& app = Application::instance(); ostr << htmlize(app.config().getString(prop, std::string("NOT FOUND: ") + prop)); } - else if (token == "<?-") - { - std::string prop; - nextToken(begin, end, token); - while (!token.empty() && token != "?>") - { - prop.append(token); - nextToken(begin, end, token); - } - Poco::trimInPlace(prop); - Application& app = Application::instance(); - ostr << app.config().getString(prop, ""); - } else if (_htmlMode) { ostr << token; @@ -1401,10 +1504,7 @@ void DocWriter::nextToken(std::string::const_iterator& it, const std::string::co { token += *it++; if (it != end && std::ispunct(*it)) token += *it++; - if (token != "<[" && token != "<*" && token != "<!") - { - if (it != end && std::ispunct(*it)) token += *it++; - } + if (it != end && std::ispunct(*it)) token += *it++; } else if (it != end && *it == '[') { @@ -1656,7 +1756,7 @@ void DocWriter::writeNestedClasses(std::ostream& ostr, const Struct* pStruct) } -void DocWriter::writeNameSpacesSummary(std::ostream& ostr, const NameSpace* pNameSpace) +void DocWriter::writeNameSpacesSummary(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr) { NameSpace::SymbolTable nameSpaces; pNameSpace->nameSpaces(nameSpaces); @@ -1673,7 +1773,7 @@ void DocWriter::writeNameSpacesSummary(std::ostream& ostr, const NameSpace* pNam } -void DocWriter::writeNameSpaces(std::ostream& ostr, const NameSpace* pNameSpace) +void DocWriter::writeNameSpaces(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr) { NameSpace::SymbolTable nameSpaces; pNameSpace->nameSpaces(nameSpaces); @@ -1692,7 +1792,7 @@ void DocWriter::writeNameSpaces(std::ostream& ostr, const NameSpace* pNameSpace) } -void DocWriter::writeClassesSummary(std::ostream& ostr, const NameSpace* pNameSpace) +void DocWriter::writeClassesSummary(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr) { NameSpace::SymbolTable classes; pNameSpace->classes(classes); @@ -1709,7 +1809,7 @@ void DocWriter::writeClassesSummary(std::ostream& ostr, const NameSpace* pNameSp } -void DocWriter::writeClasses(std::ostream& ostr, const NameSpace* pNameSpace) +void DocWriter::writeClasses(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr) { NameSpace::SymbolTable classes; pNameSpace->classes(classes); @@ -1741,7 +1841,7 @@ void DocWriter::writeClassSummary(std::ostream& ostr, const Struct* pStruct) } -void DocWriter::writeTypesSummary(std::ostream& ostr, const NameSpace* pNameSpace) +void DocWriter::writeTypesSummary(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr) { NameSpace::SymbolTable types; pNameSpace->typeDefs(types); @@ -1758,7 +1858,7 @@ void DocWriter::writeTypesSummary(std::ostream& ostr, const NameSpace* pNameSpac } -void DocWriter::writeAliasesSummary(std::ostream& ostr, const NameSpace* pNameSpace) +void DocWriter::writeAliasesSummary(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr) { NameSpace::SymbolTable types; pNameSpace->typeAliases(types); @@ -1775,7 +1875,7 @@ void DocWriter::writeAliasesSummary(std::ostream& ostr, const NameSpace* pNameSp } -void DocWriter::writeTypes(std::ostream& ostr, const NameSpace* pNameSpace) +void DocWriter::writeTypes(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr) { NameSpace::SymbolTable types; pNameSpace->typeDefs(types); @@ -1791,13 +1891,13 @@ void DocWriter::writeTypes(std::ostream& ostr, const NameSpace* pNameSpace) for (NameSpace::Iterator it = types.begin(); it != types.end(); ++it) { if (it->second->getAccess() != Symbol::ACC_PRIVATE) - writeType(ostr, static_cast<const TypeDef*>(it->second)); + writeType(ostr, static_cast<const TypeDef*>(it->second), pSstr); } } } -void DocWriter::writeAliases(std::ostream& ostr, const NameSpace* pNameSpace) +void DocWriter::writeAliases(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr) { NameSpace::SymbolTable types; pNameSpace->typeAliases(types); @@ -1813,13 +1913,13 @@ void DocWriter::writeAliases(std::ostream& ostr, const NameSpace* pNameSpace) for (NameSpace::Iterator it = types.begin(); it != types.end(); ++it) { if (it->second->getAccess() != Symbol::ACC_PRIVATE) - writeType(ostr, static_cast<const TypeDef*>(it->second)); + writeType(ostr, static_cast<const TypeDef*>(it->second), pSstr); } } } -void DocWriter::writeType(std::ostream& ostr, const TypeDef* pType) +void DocWriter::writeType(std::ostream& ostr, const TypeDef* pType, std::ostream* pSstr) { ostr << "<h3>"; writeAnchor(ostr, pType->name(), pType); @@ -1829,11 +1929,11 @@ void DocWriter::writeType(std::ostream& ostr, const TypeDef* pType) ostr << "<p class=\"decl\">"; writeDecl(ostr, pType->declaration()); ostr << ";</p>\n"; - writeDescription(ostr, pType->getDocumentation()); + writeDescription(ostr, pType->getDocumentation(), pSstr); } -void DocWriter::writeEnums(std::ostream& ostr, const NameSpace* pNameSpace) +void DocWriter::writeEnums(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr) { NameSpace::SymbolTable enums; pNameSpace->enums(enums); @@ -1849,13 +1949,13 @@ void DocWriter::writeEnums(std::ostream& ostr, const NameSpace* pNameSpace) for (NameSpace::Iterator it = enums.begin(); it != enums.end(); ++it) { if (it->second->getAccess() != Symbol::ACC_PRIVATE) - writeEnum(ostr, static_cast<const Enum*>(it->second)); + writeEnum(ostr, static_cast<const Enum*>(it->second), pSstr); } } } -void DocWriter::writeEnum(std::ostream& ostr, const Enum* pEnum) +void DocWriter::writeEnum(std::ostream& ostr, const Enum* pEnum, std::ostream* pSstr) { ostr << "<h3>"; const std::string& name = pEnum->name(); @@ -1866,7 +1966,7 @@ void DocWriter::writeEnum(std::ostream& ostr, const Enum* pEnum) if (pEnum->getAccess() != Symbol::ACC_PUBLIC) writeIcon(ostr, "protected"); ostr << "</h3>\n"; - writeDescription(ostr, pEnum->getDocumentation()); + writeDescription(ostr, pEnum->getDocumentation(), pSstr); for (Enum::Iterator it = pEnum->begin(); it != pEnum->end(); ++it) { const std::string& name = (*it)->name(); @@ -1876,7 +1976,7 @@ void DocWriter::writeEnum(std::ostream& ostr, const Enum* pEnum) if (!value.empty()) ostr << " = " << htmlize(value); ostr << "</p>\n"; - writeDescription(ostr, (*it)->getDocumentation()); + writeDescription(ostr, (*it)->getDocumentation(), pSstr); } } @@ -1928,7 +2028,7 @@ void DocWriter::writeMethods(std::ostream& ostr, const Struct* pStruct) } -void DocWriter::writeFunctionsSummary(std::ostream& ostr, const NameSpace* pNameSpace) +void DocWriter::writeFunctionsSummary(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr) { NameSpace::SymbolTable funcs; pNameSpace->functions(funcs); @@ -1950,7 +2050,7 @@ void DocWriter::writeFunctionsSummary(std::ostream& ostr, const NameSpace* pName } -void DocWriter::writeFunctions(std::ostream& ostr, const NameSpace* pNameSpace) +void DocWriter::writeFunctions(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr) { NameSpace::SymbolTable funcs; pNameSpace->functions(funcs); @@ -1965,7 +2065,7 @@ void DocWriter::writeFunctions(std::ostream& ostr, const NameSpace* pNameSpace) } -void DocWriter::writeFunction(std::ostream& ostr, const Function* pFunc) +void DocWriter::writeFunction(std::ostream& ostr, const Function* pFunc, std::ostream* pSstr) { ostr << "<h3>"; writeAnchor(ostr, pFunc->name(), pFunc); @@ -1979,12 +2079,6 @@ void DocWriter::writeFunction(std::ostream& ostr, const Function* pFunc) writeIcon(ostr, "inline"); ostr << "</h3>\n"; ostr << "<p class=\"decl\">"; - - const std::string& attrs = pFunc->getAttributeList(); - if (!attrs.empty()) - { - ostr << "<i>" << htmlize(attrs) << "</i><br />"; - } const std::string& decl = pFunc->declaration(); writeDecl(ostr, decl); if (!std::isalnum(decl[decl.length() - 1])) @@ -2022,7 +2116,7 @@ void DocWriter::writeFunction(std::ostream& ostr, const Function* pFunc) ostr << " = 0"; ostr << ";</p>\n"; - if (pFunc->attrs().has("deprecated") || pFunc->getAttributeList().compare(0, 12, "[[deprecated") == 0) + if (pFunc->attrs().has("deprecated")) { writeDeprecated(ostr, "function"); } @@ -2032,7 +2126,7 @@ void DocWriter::writeFunction(std::ostream& ostr, const Function* pFunc) if (doc.empty() && pFunc->isPublic() && !pOverridden && !pFunc->isConstructor() && !pFunc->isDestructor()) logger().notice(std::string("Undocumented public function: ") + pFunc->fullName()); - writeDescription(ostr, doc); + writeDescription(ostr, doc, pSstr); if (pOverridden) { ostr << "<div class=\"description\"><p><b>" << tr("See_also") << ":</b> "; @@ -2042,7 +2136,7 @@ void DocWriter::writeFunction(std::ostream& ostr, const Function* pFunc) } -void DocWriter::writeVariables(std::ostream& ostr, const NameSpace* pNameSpace) +void DocWriter::writeVariables(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr) { NameSpace::SymbolTable vars; pNameSpace->variables(vars); @@ -2059,18 +2153,18 @@ void DocWriter::writeVariables(std::ostream& ostr, const NameSpace* pNameSpace) for (NameSpace::Iterator it = vars.begin(); it != vars.end(); ++it) { if (it->second->getAccess() == Symbol::ACC_PUBLIC) - writeVariable(ostr, static_cast<const Variable*>(it->second)); + writeVariable(ostr, static_cast<const Variable*>(it->second), pSstr); } for (NameSpace::Iterator it = vars.begin(); it != vars.end(); ++it) { if (it->second->getAccess() == Symbol::ACC_PROTECTED) - writeVariable(ostr, static_cast<const Variable*>(it->second)); + writeVariable(ostr, static_cast<const Variable*>(it->second), pSstr); } } } -void DocWriter::writeVariable(std::ostream& ostr, const Variable* pVar) +void DocWriter::writeVariable(std::ostream& ostr, const Variable* pVar, std::ostream* pSstr) { ostr << "<h3>"; writeAnchor(ostr, pVar->name(), pVar); @@ -2082,7 +2176,7 @@ void DocWriter::writeVariable(std::ostream& ostr, const Variable* pVar) ostr << "<p class=\"decl\">"; writeDecl(ostr, pVar->declaration()); ostr << ";</p>\n"; - writeDescription(ostr, pVar->getDocumentation()); + writeDescription(ostr, pVar->getDocumentation(), pSstr); } @@ -2106,9 +2200,10 @@ void DocWriter::writeLink(std::ostream& ostr, const std::string& uri, const std: } -void DocWriter::writeLink(std::ostream& ostr, const Symbol* pSymbol, const std::string& name) +void DocWriter::writeLink(std::ostream& ostr, const Symbol* pSymbol, const std::string& name, std::ostream* pSstr) { ostr << "<a href=\"" << uriFor(pSymbol) << "\" title=\"" << titleFor(pSymbol) << "\">" << htmlizeName(name) << "</a>"; + if (pSstr) *pSstr << name; } @@ -2118,7 +2213,7 @@ void DocWriter::writeLink(std::ostream& ostr, const std::string& uri, const std: } -void DocWriter::writeTargetLink(std::ostream& ostr, const std::string& uri, const std::string& text, const std::string& target) +void DocWriter::writeTargetLink(std::ostream& ostr, const std::string& uri, const std::string& text, const std::string& target, std::ostream* pSstr) { if (_noFrames && target != "_blank") ostr << "<a href=\"" << uri << "\">" << text << "</a>"; @@ -2126,6 +2221,7 @@ void DocWriter::writeTargetLink(std::ostream& ostr, const std::string& uri, cons ostr << "<a href=\"" << uri << "\" target=\"" << target << "\">" << text << "</a>"; else ostr << "<a href=\"" << uri << "\">" << htmlize(text) << "</a>"; + if (pSstr) *pSstr << text; } @@ -2311,6 +2407,7 @@ void DocWriter::writePage(Page& page) std::string path(pathFor(page.fileName)); std::ofstream ostr(path.c_str()); + std::ostringstream sstr; if (!ostr.good()) throw Poco::CreateFileException(path); writeHeader(ostr, title, "js/iframeResizer.min.js"); writeTitle(ostr, tr(category), title); @@ -2321,12 +2418,13 @@ void DocWriter::writePage(Page& page) { writeTOC(ostr, toc); } - writeDescription(ostr, text); + writeDescription(ostr, text, &sstr); writeCopyright(ostr); endContent(ostr); endBody(ostr); ostr << "<script>CollapsibleLists.apply(true)</script>" << std::endl; writeFooter(ostr); + if (_searchIndex) writeSearchIndex(page.fileName, sstr.str()); } diff --git a/PocoDoc/src/DocWriter.h b/PocoDoc/src/DocWriter.h index 56bc16ecf..af2ee12e9 100644 --- a/PocoDoc/src/DocWriter.h +++ b/PocoDoc/src/DocWriter.h @@ -42,7 +42,7 @@ class DocWriter /// to a directory. { public: - DocWriter(const Poco::CppParser::NameSpace::SymbolTable& symbols, const std::string& path, bool prettifyCode = true, bool noFrames = false); + DocWriter(const Poco::CppParser::NameSpace::SymbolTable& symbols, const std::string& path, bool prettifyCode = true, bool noFrames = false, bool searchIndex = false); /// Creates the DocWriter. ~DocWriter(); @@ -56,6 +56,9 @@ public: void addPage(const std::string& path); /// Adds a page. + + static const std::string DATABASE_DIR; + static const std::string DATABASE_NAME; protected: enum TextState @@ -100,6 +103,10 @@ protected: typedef std::map<std::string, std::string> StringMap; typedef std::map<std::string, Page> PageMap; + void initDatabase(); + void writeSearchIndex(std::string link, std::string content); + static void writeSearchBox(std::ostream& ostr); + void writePages(); void writePage(Page& page); void scanTOC(const std::string& text, TOC& toc); @@ -134,18 +141,18 @@ protected: static void endBody(std::ostream& ostr); static void beginContent(std::ostream& ostr); static void endContent(std::ostream& ostr); - void writeDescription(std::ostream& ostr, const std::string& text); - void writeDescriptionLine(std::ostream& ostr, const std::string& text, TextState& state); + void writeDescription(std::ostream& ostr, const std::string& text, std::ostream* pSstr = nullptr); + void writeDescriptionLine(std::ostream& ostr, const std::string& text, TextState& state, std::ostream* pSstr = nullptr); void writeSummary(std::ostream& ostr, const std::string& text, const std::string& uri); static std::string htmlize(const std::string& str); static std::string htmlize(char c); static TextState analyzeLine(const std::string& line); static std::string htmlizeName(const std::string& name); - void writeText(std::ostream& ostr, const std::string& text); - void writeText(std::ostream& ostr, std::string::const_iterator begin, const std::string::const_iterator& end); + void writeText(std::ostream& ostr, const std::string& text, std::ostream* pSstr = nullptr); + void writeText(std::ostream& ostr, std::string::const_iterator begin, const std::string::const_iterator& end, std::ostream* pSstr = nullptr); void writeDecl(std::ostream& ostr, const std::string& decl); void writeDecl(std::ostream& ostr, std::string::const_iterator begin, const std::string::const_iterator& end); - bool writeSymbol(std::ostream& ostr, std::string& token, std::string::const_iterator& begin, const std::string::const_iterator& end); + bool writeSymbol(std::ostream& ostr, std::string& token, std::string::const_iterator& begin, const std::string::const_iterator& end, std::ostream* pSstr = nullptr); bool writeSpecial(std::ostream& ostr, std::string& token, std::string::const_iterator& begin, const std::string::const_iterator& end); void nextToken(std::string::const_iterator& it, const std::string::const_iterator& end, std::string& token); void writeListItem(std::ostream& ostr, const std::string& text); @@ -155,31 +162,31 @@ protected: void writeInheritance(std::ostream& ostr, const Poco::CppParser::Struct* pStruct); void writeMethodSummary(std::ostream& ostr, const Poco::CppParser::Struct* pStruct); void writeNestedClasses(std::ostream& ostr, const Poco::CppParser::Struct* pStruct); - void writeNameSpacesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace); - void writeNameSpaces(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace); - void writeClassesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace); - void writeClasses(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace); + void writeNameSpacesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr); + void writeNameSpaces(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr); + void writeClassesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr); + void writeClasses(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr); void writeClassSummary(std::ostream& ostr, const Poco::CppParser::Struct* pStruct); - void writeTypesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace); - void writeAliasesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace); - void writeTypes(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace); - void writeAliases(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace); - void writeType(std::ostream& ostr, const Poco::CppParser::TypeDef* pType); - void writeEnums(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace); - void writeEnum(std::ostream& ostr, const Poco::CppParser::Enum* pEnum); + void writeTypesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr); + void writeAliasesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr); + void writeTypes(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr); + void writeAliases(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr); + void writeType(std::ostream& ostr, const Poco::CppParser::TypeDef* pType, std::ostream* pSstr = nullptr); + void writeEnums(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr); + void writeEnum(std::ostream& ostr, const Poco::CppParser::Enum* pEnum, std::ostream* pSstr); void writeConstructors(std::ostream& ostr, const Poco::CppParser::Struct* pStruct); void writeDestructor(std::ostream& ostr, const Poco::CppParser::Struct* pStruct); void writeMethods(std::ostream& ostr, const Poco::CppParser::Struct* pNameSpace); - void writeFunctionsSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace); - void writeFunctions(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace); - void writeFunction(std::ostream& ostr, const Poco::CppParser::Function* pFunc); - void writeVariables(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace); - void writeVariable(std::ostream& ostr, const Poco::CppParser::Variable* pVar); + void writeFunctionsSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr); + void writeFunctions(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr); + void writeFunction(std::ostream& ostr, const Poco::CppParser::Function* pFunc, std::ostream* pSstr = nullptr); + void writeVariables(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr); + void writeVariable(std::ostream& ostr, const Poco::CppParser::Variable* pVar, std::ostream* pSstr = nullptr); static void writeNameListItem(std::ostream& ostr, const std::string& name, const Poco::CppParser::Symbol* pSymbol, const Poco::CppParser::NameSpace* pNameSpace, bool& first); static void writeLink(std::ostream& ostr, const std::string& uri, const std::string& text); - static void writeLink(std::ostream& ostr, const Poco::CppParser::Symbol* pSymbol, const std::string& text); + static void writeLink(std::ostream& ostr, const Poco::CppParser::Symbol* pSymbol, const std::string& text, std::ostream* pSstr = nullptr); static void writeLink(std::ostream& ostr, const std::string& uri, const std::string& text, const std::string& linkClass); - void writeTargetLink(std::ostream& ostr, const std::string& uri, const std::string& text, const std::string& target); + void writeTargetLink(std::ostream& ostr, const std::string& uri, const std::string& text, const std::string& target, std::ostream* pSstr = nullptr); static void writeImageLink(std::ostream& ostr, const std::string& uri, const std::string& image, const std::string& alt); static void writeImage(std::ostream& ostr, const std::string& uri, const std::string& caption); static void writeIcon(std::ostream& ostr, const std::string& icon); @@ -212,6 +219,7 @@ private: bool _pendingLine; int _indent; int _titleId; + bool _searchIndex; static std::string _language; static StringMap _strings; diff --git a/PocoDoc/src/PocoDoc.cpp b/PocoDoc/src/PocoDoc.cpp index 05fe0959d..3e9bbbc94 100644 --- a/PocoDoc/src/PocoDoc.cpp +++ b/PocoDoc/src/PocoDoc.cpp @@ -113,7 +113,8 @@ class PocoDocApp: public Application public: PocoDocApp(): _helpRequested(false), - _writeEclipseTOC(false) + _writeEclipseTOC(false), + _searchIndexEnabled(false) { std::setlocale(LC_ALL, ""); } @@ -168,6 +169,12 @@ protected: .required(false) .repeatable(false) .callback(OptionCallback<PocoDocApp>(this, &PocoDocApp::handleEclipse))); + + options.addOption( + Option("search-index", "s", "Enable search index (requires FTS5 support).") + .required(false) + .repeatable(false) + .callback(OptionCallback<PocoDocApp>(this, &PocoDocApp::handleSearchIndex))); } void handleHelp(const std::string& name, const std::string& value) @@ -201,6 +208,11 @@ protected: _writeEclipseTOC = true; } + void handleSearchIndex(const std::string& name, const std::string& value) + { + _searchIndexEnabled = true; + } + void handleConfig(const std::string& name, const std::string& value) { loadConfiguration(value, -200); @@ -233,7 +245,7 @@ protected: for (StringTokenizer::Iterator itg = excTokenizer.begin(); itg != excTokenizer.end(); ++itg) { Glob glob(*itg); - if (glob.match(p.getFileName())) + if (glob.match(p.getFileName()) || glob.match(p.toString())) include = false; } if (include) @@ -321,11 +333,6 @@ protected: logger().log(exc); ++errors; } - catch (std::exception& exc) - { - logger().error(std::string(exc.what())); - ++errors; - } } return errors; } @@ -351,7 +358,21 @@ protected: File file(path); file.createDirectories(); - DocWriter writer(_gst, path.toString(), config().getBool("PocoDoc.prettifyCode", false), _writeEclipseTOC); + if (_searchIndexEnabled || config().getBool("PocoDoc.searchIndex", false)) + { +#if defined(POCO_ENABLE_SQLITE_FTS5) + std::string dbDirectory = path.toString() + DocWriter::DATABASE_DIR; + Path dbPath(dbDirectory); + dbPath.makeDirectory(); + File dbFile(dbPath); + dbFile.createDirectories(); + _searchIndexEnabled = true; +#else + logger().error("FTS5 is not enabled, search is not supported"); +#endif + } + + DocWriter writer(_gst, path.toString(), config().getBool("PocoDoc.prettifyCode", false), _writeEclipseTOC, _searchIndexEnabled); if (config().hasProperty("PocoDoc.pages")) { @@ -520,6 +541,7 @@ protected: private: bool _helpRequested; bool _writeEclipseTOC; + bool _searchIndexEnabled; Poco::CppParser::NameSpace::SymbolTable _gst; }; diff --git a/ProGen/ProGen_vs170.vcxproj b/ProGen/ProGen_vs170.vcxproj index 865d38391..ee6dfd96d 100644 --- a/ProGen/ProGen_vs170.vcxproj +++ b/ProGen/ProGen_vs170.vcxproj @@ -981,4 +981,4 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <ImportGroup Label="ExtensionTargets"/> -</Project> +</Project> \ No newline at end of file diff --git a/configure b/configure index c3bb3e204..056ed2c93 100755 --- a/configure +++ b/configure @@ -86,7 +86,7 @@ $(ls -C "$base"/build/config/) Compile with -DPOCO_DATA_SQL_SERVER_BIG_STRINGS=1 Enables strings over 8000 bytes on MS SQL Server. - --sqlite-fts=<path> + --sqlite-fts Compile with -DPOCO_DATA_SQLITE_FTS. Compile SQLite with Full Text Search support. @@ -276,7 +276,7 @@ while [ $# -ge 1 ]; do flags="$flags -DSQLITE_THREADSAFE=$(echo "${1}" | awk '{print substr($0,22)}')" ;; --sqlite-fts) - flags="$flags -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_FTS3_PARENTHESIS" ;; + flags="$flags -DSQLITE_ENABLE_FTS5" ;; --poquito) flags="$flags -DPOCO_NO_FILECHANNEL -DPOCO_NO_SPLITTERCHANNEL -DPOCO_NO_SYSLOGCHANNEL -DPOCO_UTIL_NO_INIFILECONFIGURATION -DPOCO_UTIL_NO_JSONCONFIGURATION -DPOCO_UTIL_NO_XMLCONFIGURATION" ;;