generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-01 10:57:56 +01:00
Code Issues Projects Releases Wiki Activity

Poco 1.9.0: Additional fixes for PDF and Encodings ()

Browse Source 
* Update gradle for the Encodings module

Signed-off-by: Francis ANDRE <francis.andre.kampbell@orange.fr>

* Add new PDF c++ files to VS projects

* Update gradle build
This commit is contained in:
zosrothko 2018-02-18 17:29:48 +01:00 committed by Aleksandar Fabijanic
parent 488d8e05c2
commit d993fb09b7
8 changed files with 368 additions and 189 deletions

46
Encodings/build.gradle Normal file

@ -0,0 +1,46 @@
model {
components {
Encodings(NativeLibrarySpec) {
sources {
rc {
source {
srcDir '..'
include 'DLLVersion.rc'
}
}
c {
source {
srcDir 'src'
include '**/*.c'
}
exportedHeaders {
srcDir 'include'
}
lib project: ':Foundation', library: 'Foundation'
}
cpp {
source {
srcDir 'src'
include '**/*.cpp'
}
exportedHeaders {
srcDir 'include'
}
lib project: ':Foundation', library: 'Foundation'
}
}
}
}
binaries {
withType(SharedLibraryBinarySpec) {
if (toolChain in VisualCpp) {
cCompiler.define "Encodings_EXPORTS"
cppCompiler.define "Encodings_EXPORTS"
}
}
withType(StaticLibraryBinarySpec) {
}
}
}
task poco { dependsOn "assemble" }

30
Encodings/samples/build.gradle Normal file

@ -0,0 +1,30 @@
model {
components {
TextConverter(NativeExecutableSpec) {
sources {
cpp.source { srcDir 'TextConverter/src' include '**/*.cpp' }
cpp.lib project: ':Encodings', library: 'Encodings'
cpp.lib project: ':Foundation', library: 'Foundation'
}
}
}
binaries {
all {
}
withType(SharedLibraryBinarySpec) {
lib project: ':Encodings', library: 'Encodings', linkage: 'shared'
lib project: ':Foundation', library: 'Foundation', linkage: 'shared'
}
withType(StaticLibraryBinarySpec) {
lib project: ':Encodings', library: 'Encodings', linkage: 'static'
lib project: ':Foundation', library: 'Foundation', linkage: 'static'
}
withType(NativeExecutableSpec) {
lib project: ':Encodings', library: 'Encodings', linkage: 'static'
lib project: ':Foundation', library: 'Foundation', linkage: 'static'
}
}
}
task samples { dependsOn "assemble" }

81
Encodings/testsuite/build.gradle Normal file

@ -0,0 +1,81 @@
import org.gradle.nativeplatform.test.cppunit.CppUnitTestSuiteSpec
model {
components {
withType(NativeComponentSpec) {
binaries.withType(NativeBinarySpec) {
if (buildType == buildTypes.debug) {
if (it instanceof NativeExecutableBinarySpec) {
executable.file = toLocalBin(appendDebugSuffix(executable.file), targetPlatform)
}
} else
if (buildType == buildTypes.release) {
if (it instanceof NativeExecutableBinarySpec) {
executable.file = toLocalBin(executable.file, targetPlatform)
}
}
}
}
TestSuite(NativeLibrarySpec) { m ->
sources {
cpp {
source {
srcDir 'src'
include '**/*.cpp'
exclude 'Win*.cpp'
exclude 'Driver.cpp'
}
exportedHeaders {
srcDir 'src'
}
lib project: ':CppUnit', library: 'CppUnit', linkage: 'shared'
lib project: ':Encodings', library: 'Encodings', linkage: 'shared'
lib project: ':Foundation', library: 'Foundation', linkage: 'shared'
}
}
binaries.all {
if (targetPlatform.operatingSystem.windows) {
sources {
platformWindows(CppSourceSet) {
lib m.sources.cpp
source {
srcDir 'src'
include 'Win*.cpp'
exclude '*Driver.cpp'
}
exportedHeaders {
srcDir 'src'
}
}
}
}
}
}
}
testSuites {
UtilTestSuite(org.gradle.nativeplatform.test.cppunit.CppUnitTestSuiteSpec) {
testing $.components.TestSuite
}
}
binaries {
withType(org.gradle.nativeplatform.test.cppunit.CppUnitTestSuiteBinarySpec) {
lib project: ':CppUnit', library: 'CppUnit', linkage: 'shared'
if (toolChain in VisualCpp) {
if (buildType == buildTypes.debug) {
cCompiler.args "/MDd"
cppCompiler.args "/MDd"
} else
if (buildType == buildTypes.release) {
cCompiler.args "/MD"
cppCompiler.args "/MD"
} else {
throw new GradleException("Unknown buildType" + buildType)
}
}
if (toolChain in Gcc) {
}
}
}
}
task testsuite { dependsOn "assemble" }

354
PDF/PDF_vs140.vcxproj

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="debug_shared|Win32"> <ProjectConfiguration Include="debug_shared|Win32">
@ -32,7 +32,7 @@
<RootNamespace>PDF</RootNamespace> <RootNamespace>PDF</RootNamespace>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
</PropertyGroup> </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"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
@ -63,27 +63,27 @@
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v140</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"/> <ImportGroup Label="ExtensionSettings" />
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets"> <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>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets"> <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>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets"> <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>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets"> <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>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets"> <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>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets"> <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>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>14.0.25123.0</_ProjectFileVersion> <_ProjectFileVersion>14.0.25123.0</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoPDFd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoPDFd</TargetName>
@ -132,7 +132,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
@ -163,9 +163,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
@ -193,7 +193,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<ProgramDataBaseFileName>..\lib\PocoPDFmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\PocoPDFmtd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -218,9 +218,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Lib> <Lib>
@ -240,7 +240,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<ProgramDataBaseFileName>..\lib\PocoPDFmdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\PocoPDFmdd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -265,10 +265,10 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<ProgramDataBaseFileName>..\lib\PocoPDFmd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\PocoPDFmd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Lib> <Lib>
@ -276,161 +276,165 @@
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\adler32.c"/> <ClCompile Include="src\adler32.c" />
<ClCompile Include="src\compress.c"/> <ClCompile Include="src\AttributedString.cpp" />
<ClCompile Include="src\crc32.c"/> <ClCompile Include="src\Cell.cpp" />
<ClCompile Include="src\deflate.c"/> <ClCompile Include="src\compress.c" />
<ClCompile Include="src\Destination.cpp"/> <ClCompile Include="src\crc32.c" />
<ClCompile Include="src\Document.cpp"/> <ClCompile Include="src\deflate.c" />
<ClCompile Include="src\Encoder.cpp"/> <ClCompile Include="src\Destination.cpp" />
<ClCompile Include="src\Font.cpp"/> <ClCompile Include="src\Document.cpp" />
<ClCompile Include="src\gzio.c"/> <ClCompile Include="src\Encoder.cpp" />
<ClCompile Include="src\hpdf_3dmeasure.c"/> <ClCompile Include="src\Font.cpp" />
<ClCompile Include="src\hpdf_annotation.c"/> <ClCompile Include="src\gzio.c" />
<ClCompile Include="src\hpdf_array.c"/> <ClCompile Include="src\hpdf_3dmeasure.c" />
<ClCompile Include="src\hpdf_binary.c"/> <ClCompile Include="src\hpdf_annotation.c" />
<ClCompile Include="src\hpdf_boolean.c"/> <ClCompile Include="src\hpdf_array.c" />
<ClCompile Include="src\hpdf_catalog.c"/> <ClCompile Include="src\hpdf_binary.c" />
<ClCompile Include="src\hpdf_destination.c"/> <ClCompile Include="src\hpdf_boolean.c" />
<ClCompile Include="src\hpdf_dict.c"/> <ClCompile Include="src\hpdf_catalog.c" />
<ClCompile Include="src\hpdf_doc.c"/> <ClCompile Include="src\hpdf_destination.c" />
<ClCompile Include="src\hpdf_doc_png.c"/> <ClCompile Include="src\hpdf_dict.c" />
<ClCompile Include="src\hpdf_encoder.c"/> <ClCompile Include="src\hpdf_doc.c" />
<ClCompile Include="src\hpdf_encoder_cns.c"/> <ClCompile Include="src\hpdf_doc_png.c" />
<ClCompile Include="src\hpdf_encoder_cnt.c"/> <ClCompile Include="src\hpdf_encoder.c" />
<ClCompile Include="src\hpdf_encoder_jp.c"/> <ClCompile Include="src\hpdf_encoder_cns.c" />
<ClCompile Include="src\hpdf_encoder_kr.c"/> <ClCompile Include="src\hpdf_encoder_cnt.c" />
<ClCompile Include="src\hpdf_encoder_utf.c"/> <ClCompile Include="src\hpdf_encoder_jp.c" />
<ClCompile Include="src\hpdf_encrypt.c"/> <ClCompile Include="src\hpdf_encoder_kr.c" />
<ClCompile Include="src\hpdf_encryptdict.c"/> <ClCompile Include="src\hpdf_encoder_utf.c" />
<ClCompile Include="src\hpdf_error.c"/> <ClCompile Include="src\hpdf_encrypt.c" />
<ClCompile Include="src\hpdf_exdata.c"/> <ClCompile Include="src\hpdf_encryptdict.c" />
<ClCompile Include="src\hpdf_ext_gstate.c"/> <ClCompile Include="src\hpdf_error.c" />
<ClCompile Include="src\hpdf_font.c"/> <ClCompile Include="src\hpdf_exdata.c" />
<ClCompile Include="src\hpdf_fontdef.c"/> <ClCompile Include="src\hpdf_ext_gstate.c" />
<ClCompile Include="src\hpdf_fontdef_base14.c"/> <ClCompile Include="src\hpdf_font.c" />
<ClCompile Include="src\hpdf_fontdef_cid.c"/> <ClCompile Include="src\hpdf_fontdef.c" />
<ClCompile Include="src\hpdf_fontdef_cns.c"/> <ClCompile Include="src\hpdf_fontdef_base14.c" />
<ClCompile Include="src\hpdf_fontdef_cnt.c"/> <ClCompile Include="src\hpdf_fontdef_cid.c" />
<ClCompile Include="src\hpdf_fontdef_jp.c"/> <ClCompile Include="src\hpdf_fontdef_cns.c" />
<ClCompile Include="src\hpdf_fontdef_kr.c"/> <ClCompile Include="src\hpdf_fontdef_cnt.c" />
<ClCompile Include="src\hpdf_fontdef_tt.c"/> <ClCompile Include="src\hpdf_fontdef_jp.c" />
<ClCompile Include="src\hpdf_fontdef_type1.c"/> <ClCompile Include="src\hpdf_fontdef_kr.c" />
<ClCompile Include="src\hpdf_font_cid.c"/> <ClCompile Include="src\hpdf_fontdef_tt.c" />
<ClCompile Include="src\hpdf_font_tt.c"/> <ClCompile Include="src\hpdf_fontdef_type1.c" />
<ClCompile Include="src\hpdf_font_type1.c"/> <ClCompile Include="src\hpdf_font_cid.c" />
<ClCompile Include="src\hpdf_gstate.c"/> <ClCompile Include="src\hpdf_font_tt.c" />
<ClCompile Include="src\hpdf_image.c"/> <ClCompile Include="src\hpdf_font_type1.c" />
<ClCompile Include="src\hpdf_image_ccitt.c"/> <ClCompile Include="src\hpdf_gstate.c" />
<ClCompile Include="src\hpdf_image_png.c"/> <ClCompile Include="src\hpdf_image.c" />
<ClCompile Include="src\hpdf_info.c"/> <ClCompile Include="src\hpdf_image_ccitt.c" />
<ClCompile Include="src\hpdf_list.c"/> <ClCompile Include="src\hpdf_image_png.c" />
<ClCompile Include="src\hpdf_mmgr.c"/> <ClCompile Include="src\hpdf_info.c" />
<ClCompile Include="src\hpdf_name.c"/> <ClCompile Include="src\hpdf_list.c" />
<ClCompile Include="src\hpdf_namedict.c"/> <ClCompile Include="src\hpdf_mmgr.c" />
<ClCompile Include="src\hpdf_null.c"/> <ClCompile Include="src\hpdf_name.c" />
<ClCompile Include="src\hpdf_number.c"/> <ClCompile Include="src\hpdf_namedict.c" />
<ClCompile Include="src\hpdf_objects.c"/> <ClCompile Include="src\hpdf_null.c" />
<ClCompile Include="src\hpdf_outline.c"/> <ClCompile Include="src\hpdf_number.c" />
<ClCompile Include="src\hpdf_pages.c"/> <ClCompile Include="src\hpdf_objects.c" />
<ClCompile Include="src\hpdf_page_label.c"/> <ClCompile Include="src\hpdf_outline.c" />
<ClCompile Include="src\hpdf_page_operator.c"/> <ClCompile Include="src\hpdf_pages.c" />
<ClCompile Include="src\hpdf_pdfa.c"/> <ClCompile Include="src\hpdf_page_label.c" />
<ClCompile Include="src\hpdf_real.c"/> <ClCompile Include="src\hpdf_page_operator.c" />
<ClCompile Include="src\hpdf_streams.c"/> <ClCompile Include="src\hpdf_pdfa.c" />
<ClCompile Include="src\hpdf_string.c"/> <ClCompile Include="src\hpdf_real.c" />
<ClCompile Include="src\hpdf_u3d.c"/> <ClCompile Include="src\hpdf_streams.c" />
<ClCompile Include="src\hpdf_utils.c"/> <ClCompile Include="src\hpdf_string.c" />
<ClCompile Include="src\hpdf_xref.c"/> <ClCompile Include="src\hpdf_u3d.c" />
<ClCompile Include="src\Image.cpp"/> <ClCompile Include="src\hpdf_utils.c" />
<ClCompile Include="src\infback.c"/> <ClCompile Include="src\hpdf_xref.c" />
<ClCompile Include="src\inffast.c"/> <ClCompile Include="src\Image.cpp" />
<ClCompile Include="src\inflate.c"/> <ClCompile Include="src\infback.c" />
<ClCompile Include="src\inftrees.c"/> <ClCompile Include="src\inffast.c" />
<ClCompile Include="src\LinkAnnotation.cpp"/> <ClCompile Include="src\inflate.c" />
<ClCompile Include="src\Outline.cpp"/> <ClCompile Include="src\inftrees.c" />
<ClCompile Include="src\Page.cpp"/> <ClCompile Include="src\LinkAnnotation.cpp" />
<ClCompile Include="src\PDFException.cpp"/> <ClCompile Include="src\Outline.cpp" />
<ClCompile Include="src\png.c"/> <ClCompile Include="src\Page.cpp" />
<ClCompile Include="src\pngerror.c"/> <ClCompile Include="src\PDFException.cpp" />
<ClCompile Include="src\pnggccrd.c"/> <ClCompile Include="src\png.c" />
<ClCompile Include="src\pngget.c"/> <ClCompile Include="src\pngerror.c" />
<ClCompile Include="src\pngmem.c"/> <ClCompile Include="src\pnggccrd.c" />
<ClCompile Include="src\pngpread.c"/> <ClCompile Include="src\pngget.c" />
<ClCompile Include="src\pngread.c"/> <ClCompile Include="src\pngmem.c" />
<ClCompile Include="src\pngrio.c"/> <ClCompile Include="src\pngpread.c" />
<ClCompile Include="src\pngrtran.c"/> <ClCompile Include="src\pngread.c" />
<ClCompile Include="src\pngrutil.c"/> <ClCompile Include="src\pngrio.c" />
<ClCompile Include="src\pngset.c"/> <ClCompile Include="src\pngrtran.c" />
<ClCompile Include="src\pngtest.c"/> <ClCompile Include="src\pngrutil.c" />
<ClCompile Include="src\pngtrans.c"/> <ClCompile Include="src\pngset.c" />
<ClCompile Include="src\pngvcrd.c"/> <ClCompile Include="src\pngtest.c" />
<ClCompile Include="src\pngwio.c"/> <ClCompile Include="src\pngtrans.c" />
<ClCompile Include="src\pngwrite.c"/> <ClCompile Include="src\pngvcrd.c" />
<ClCompile Include="src\pngwtran.c"/> <ClCompile Include="src\pngwio.c" />
<ClCompile Include="src\pngwutil.c"/> <ClCompile Include="src\pngwrite.c" />
<ClCompile Include="src\TextAnnotation.cpp"/> <ClCompile Include="src\pngwtran.c" />
<ClCompile Include="src\trees.c"/> <ClCompile Include="src\pngwutil.c" />
<ClCompile Include="src\zutil.c"/> <ClCompile Include="src\Table.cpp" />
<ClCompile Include="src\TextAnnotation.cpp" />
<ClCompile Include="src\trees.c" />
<ClCompile Include="src\XMLTemplate.cpp" />
<ClCompile Include="src\zutil.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\Poco\PDF\crc32.h"/> <ClInclude Include="include\Poco\PDF\crc32.h" />
<ClInclude Include="include\Poco\PDF\deflate.h"/> <ClInclude Include="include\Poco\PDF\deflate.h" />
<ClInclude Include="include\Poco\PDF\Destination.h"/> <ClInclude Include="include\Poco\PDF\Destination.h" />
<ClInclude Include="include\Poco\PDF\Document.h"/> <ClInclude Include="include\Poco\PDF\Document.h" />
<ClInclude Include="include\Poco\PDF\Encoder.h"/> <ClInclude Include="include\Poco\PDF\Encoder.h" />
<ClInclude Include="include\Poco\PDF\Font.h"/> <ClInclude Include="include\Poco\PDF\Font.h" />
<ClInclude Include="include\Poco\PDF\hpdf.h"/> <ClInclude Include="include\Poco\PDF\hpdf.h" />
<ClInclude Include="include\Poco\PDF\hpdf_3dmeasure.h"/> <ClInclude Include="include\Poco\PDF\hpdf_3dmeasure.h" />
<ClInclude Include="include\Poco\PDF\hpdf_annotation.h"/> <ClInclude Include="include\Poco\PDF\hpdf_annotation.h" />
<ClInclude Include="include\Poco\PDF\hpdf_catalog.h"/> <ClInclude Include="include\Poco\PDF\hpdf_catalog.h" />
<ClInclude Include="include\Poco\PDF\hpdf_conf.h"/> <ClInclude Include="include\Poco\PDF\hpdf_conf.h" />
<ClInclude Include="include\Poco\PDF\hpdf_consts.h"/> <ClInclude Include="include\Poco\PDF\hpdf_consts.h" />
<ClInclude Include="include\Poco\PDF\hpdf_destination.h"/> <ClInclude Include="include\Poco\PDF\hpdf_destination.h" />
<ClInclude Include="include\Poco\PDF\hpdf_doc.h"/> <ClInclude Include="include\Poco\PDF\hpdf_doc.h" />
<ClInclude Include="include\Poco\PDF\hpdf_encoder.h"/> <ClInclude Include="include\Poco\PDF\hpdf_encoder.h" />
<ClInclude Include="include\Poco\PDF\hpdf_encrypt.h"/> <ClInclude Include="include\Poco\PDF\hpdf_encrypt.h" />
<ClInclude Include="include\Poco\PDF\hpdf_encryptdict.h"/> <ClInclude Include="include\Poco\PDF\hpdf_encryptdict.h" />
<ClInclude Include="include\Poco\PDF\hpdf_error.h"/> <ClInclude Include="include\Poco\PDF\hpdf_error.h" />
<ClInclude Include="include\Poco\PDF\hpdf_exdata.h"/> <ClInclude Include="include\Poco\PDF\hpdf_exdata.h" />
<ClInclude Include="include\Poco\PDF\hpdf_ext_gstate.h"/> <ClInclude Include="include\Poco\PDF\hpdf_ext_gstate.h" />
<ClInclude Include="include\Poco\PDF\hpdf_font.h"/> <ClInclude Include="include\Poco\PDF\hpdf_font.h" />
<ClInclude Include="include\Poco\PDF\hpdf_fontdef.h"/> <ClInclude Include="include\Poco\PDF\hpdf_fontdef.h" />
<ClInclude Include="include\Poco\PDF\hpdf_gstate.h"/> <ClInclude Include="include\Poco\PDF\hpdf_gstate.h" />
<ClInclude Include="include\Poco\PDF\hpdf_image.h"/> <ClInclude Include="include\Poco\PDF\hpdf_image.h" />
<ClInclude Include="include\Poco\PDF\hpdf_info.h"/> <ClInclude Include="include\Poco\PDF\hpdf_info.h" />
<ClInclude Include="include\Poco\PDF\hpdf_list.h"/> <ClInclude Include="include\Poco\PDF\hpdf_list.h" />
<ClInclude Include="include\Poco\PDF\hpdf_mmgr.h"/> <ClInclude Include="include\Poco\PDF\hpdf_mmgr.h" />
<ClInclude Include="include\Poco\PDF\hpdf_namedict.h"/> <ClInclude Include="include\Poco\PDF\hpdf_namedict.h" />
<ClInclude Include="include\Poco\PDF\hpdf_objects.h"/> <ClInclude Include="include\Poco\PDF\hpdf_objects.h" />
<ClInclude Include="include\Poco\PDF\hpdf_outline.h"/> <ClInclude Include="include\Poco\PDF\hpdf_outline.h" />
<ClInclude Include="include\Poco\PDF\hpdf_pages.h"/> <ClInclude Include="include\Poco\PDF\hpdf_pages.h" />
<ClInclude Include="include\Poco\PDF\hpdf_page_label.h"/> <ClInclude Include="include\Poco\PDF\hpdf_page_label.h" />
<ClInclude Include="include\Poco\PDF\hpdf_pdfa.h"/> <ClInclude Include="include\Poco\PDF\hpdf_pdfa.h" />
<ClInclude Include="include\Poco\PDF\hpdf_streams.h"/> <ClInclude Include="include\Poco\PDF\hpdf_streams.h" />
<ClInclude Include="include\Poco\PDF\hpdf_types.h"/> <ClInclude Include="include\Poco\PDF\hpdf_types.h" />
<ClInclude Include="include\Poco\PDF\hpdf_u3d.h"/> <ClInclude Include="include\Poco\PDF\hpdf_u3d.h" />
<ClInclude Include="include\Poco\PDF\hpdf_utils.h"/> <ClInclude Include="include\Poco\PDF\hpdf_utils.h" />
<ClInclude Include="include\Poco\PDF\hpdf_version.h"/> <ClInclude Include="include\Poco\PDF\hpdf_version.h" />
<ClInclude Include="include\Poco\PDF\Image.h"/> <ClInclude Include="include\Poco\PDF\Image.h" />
<ClInclude Include="include\Poco\PDF\inffast.h"/> <ClInclude Include="include\Poco\PDF\inffast.h" />
<ClInclude Include="include\Poco\PDF\inffixed.h"/> <ClInclude Include="include\Poco\PDF\inffixed.h" />
<ClInclude Include="include\Poco\PDF\inflate.h"/> <ClInclude Include="include\Poco\PDF\inflate.h" />
<ClInclude Include="include\Poco\PDF\inftrees.h"/> <ClInclude Include="include\Poco\PDF\inftrees.h" />
<ClInclude Include="include\Poco\PDF\LinkAnnotation.h"/> <ClInclude Include="include\Poco\PDF\LinkAnnotation.h" />
<ClInclude Include="include\Poco\PDF\Outline.h"/> <ClInclude Include="include\Poco\PDF\Outline.h" />
<ClInclude Include="include\Poco\PDF\Page.h"/> <ClInclude Include="include\Poco\PDF\Page.h" />
<ClInclude Include="include\Poco\PDF\PDF.h"/> <ClInclude Include="include\Poco\PDF\PDF.h" />
<ClInclude Include="include\Poco\PDF\PDFException.h"/> <ClInclude Include="include\Poco\PDF\PDFException.h" />
<ClInclude Include="include\Poco\PDF\png.h"/> <ClInclude Include="include\Poco\PDF\png.h" />
<ClInclude Include="include\Poco\PDF\pngconf.h"/> <ClInclude Include="include\Poco\PDF\pngconf.h" />
<ClInclude Include="include\Poco\PDF\Resource.h"/> <ClInclude Include="include\Poco\PDF\Resource.h" />
<ClInclude Include="include\Poco\PDF\TextAnnotation.h"/> <ClInclude Include="include\Poco\PDF\TextAnnotation.h" />
<ClInclude Include="include\Poco\PDF\trees.h"/> <ClInclude Include="include\Poco\PDF\trees.h" />
<ClInclude Include="include\Poco\PDF\zconf.h"/> <ClInclude Include="include\Poco\PDF\zconf.h" />
<ClInclude Include="include\Poco\PDF\zlib.h"/> <ClInclude Include="include\Poco\PDF\zlib.h" />
<ClInclude Include="include\Poco\PDF\zutil.h"/> <ClInclude Include="include\Poco\PDF\zutil.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"/> <ImportGroup Label="ExtensionTargets" />
</Project> </Project>

8
PDF/PDF_vs140.vcxproj.filters

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Source Files"> <Filter Include="Source Files">
@ -327,6 +327,12 @@
<ClCompile Include="src\hpdf_xref.c"> <ClCompile Include="src\hpdf_xref.c">
<Filter>3rd Party\HARU\Source Files</Filter> <Filter>3rd Party\HARU\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\XMLTemplate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\AttributedString.cpp" />
<ClCompile Include="src\Cell.cpp" />
<ClCompile Include="src\Table.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\Poco\PDF\Destination.h"> <ClInclude Include="include\Poco\PDF\Destination.h">

8
PDF/PDF_vs90.vcproj

@ -390,6 +390,10 @@
<Files> <Files>
<Filter <Filter
Name="Source Files"> Name="Source Files">
<File
RelativePath=".\src\AttributedString.cpp"/>
<File
RelativePath=".\src\Cell.cpp"/>
<File <File
RelativePath=".\src\Destination.cpp"/> RelativePath=".\src\Destination.cpp"/>
<File <File
@ -408,8 +412,12 @@
RelativePath=".\src\Page.cpp"/> RelativePath=".\src\Page.cpp"/>
<File <File
RelativePath=".\src\PDFException.cpp"/> RelativePath=".\src\PDFException.cpp"/>
<File
RelativePath=".\src\Table.cpp"/>
<File <File
RelativePath=".\src\TextAnnotation.cpp"/> RelativePath=".\src\TextAnnotation.cpp"/>
<File
RelativePath=".\src\XMLTemplate.cpp"/>
</Filter> </Filter>
<Filter <Filter
Name="Header Files"> Name="Header Files">

1
PDF/build.gradle

@ -21,6 +21,7 @@ project(":PDF") {
srcDirs 'include', 'include/Poco/PDF' srcDirs 'include', 'include/Poco/PDF'
} }
lib project: ':Util', library: 'Util' lib project: ':Util', library: 'Util'
lib project: ':XML', library: 'XML'
lib project: ':Foundation', library: 'Foundation' lib project: ':Foundation', library: 'Foundation'
} }
} }

29
settings.gradle

@ -2,6 +2,7 @@ def os = org.gradle.internal.os.OperatingSystem.current()
rootProject.name = 'Poco' rootProject.name = 'Poco'
include ':CppUnit' include ':CppUnit'
include ':Encodings'
include ':Foundation' include ':Foundation'
include ':XML' include ':XML'
include ':JSON' include ':JSON'
@ -12,12 +13,12 @@ include ':NetSSL_OpenSSL'
if (os.windows) { if (os.windows) {
include ':NetSSL_Win' include ':NetSSL_Win'
} }
include ':Data' include ':SQL'
if (os.windows) { if (os.windows) {
include ':Data:ODBC' include ':SQL:ODBC'
include ':Data:SQLite' include ':SQL:SQLite'
include ':Data:MySQL' include ':SQL:MySQL'
include ':Data:PostgreSQL' include ':SQL:PostgreSQL'
} }
include ':Zip' include ':Zip'
include ':PageCompiler' include ':PageCompiler'
@ -29,38 +30,40 @@ include ':Redis'
include ':PocoDoc' include ':PocoDoc'
include ':ProGen' include ':ProGen'
include ':Encodings:testsuite'
include ':Foundation:testsuite' include ':Foundation:testsuite'
include ':XML:testsuite' include ':XML:testsuite'
include ':JSON:testsuite' include ':JSON:testsuite'
include ':Util:testsuite' include ':Util:testsuite'
include ':Net:testsuite' include ':Net:testsuite'
include ':Crypto:testsuite' //include ':Crypto:testsuite'
include ':NetSSL_OpenSSL:testsuite' include ':NetSSL_OpenSSL:testsuite'
if (os.windows) { if (os.windows) {
include ':NetSSL_Win:testsuite' include ':NetSSL_Win:testsuite'
} }
include ':Data:testsuite' include ':SQL:testsuite'
if (os.windows) { if (os.windows) {
include ':Data:ODBC:testsuite' include ':SQL:ODBC:testsuite'
include ':Data:SQLite:testsuite' include ':SQL:SQLite:testsuite'
include ':Data:MySQL:testsuite' include ':SQL:MySQL:testsuite'
include ':Data:PostgreSQL:testsuite' include ':SQL:PostgreSQL:testsuite'
} }
//include ':MongoDB:testsuite' //include ':MongoDB:testsuite'
include ':Redis:testsuite' include ':Redis:testsuite'
include ':CppParser:testsuite' include ':CppParser:testsuite'
include ':Zip:testsuite' include ':Zip:testsuite'
include ':Encodings:samples'
include ':Foundation:samples' include ':Foundation:samples'
if (os.windows) { if (os.windows) {
include ':Data:samples' include ':SQL:samples'
} }
include ':NetSSL_OpenSSL:samples' include ':NetSSL_OpenSSL:samples'
if (os.windows) { if (os.windows) {
include ':NetSSL_Win:samples' include ':NetSSL_Win:samples'
} }
include ':JSON:samples' include ':JSON:samples'
include ':MongoDB:samples' //include ':MongoDB:samples'
include ':Net:samples' include ':Net:samples'
include ':PageCompiler:samples' include ':PageCompiler:samples'
include ':PDF:samples' include ':PDF:samples'