[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:40:35 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=7b75bba
The following commit has been merged in the master branch:
commit 7b75bbaa042a2305c9dd55ddd271585c20cbd958
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sat Jun 20 04:26:46 2009 +0000
Removed r1799, r1797 from trunk (#634, #579)
---
msvc/exiv2lib/exiv2lib.vcproj | 681 ++++++++++++++++++++++++-----------------
msvc/include/exv_msvc.h | 10 -
msvc/include/sys/mman.h | 57 ----
msvc/include/sys/socket.h | 7 -
msvc/include/sys/types.h | 8 -
msvc/include/winposix_export.h | 39 ---
msvc/src/mmap.cpp | 196 ------------
src/basicio.cpp | 6 +-
8 files changed, 412 insertions(+), 592 deletions(-)
diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index c2cc430..d7bb898 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -5,272 +5,329 @@
Name="exiv2lib"
ProjectGUID="{831EF580-92C8-4CA8-B0CE-3D906280A54D}"
RootNamespace="exiv2lib"
- Keyword="Win32Proj">
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4"
- CharacterSet="2">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="if exist ..\include\exiv2 goto :jail
mkdir ..\include\exiv2\
copy/y ..\..\src\*.h ..\include\exiv2\
copy/y ..\..\src\*.hpp ..\include\exiv2\
cd ..\include\exiv2
del *_int.hpp
cd ..\..\exiv2lib
:jail
"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
PreprocessorDefinitions="WIN32;_DEBUG"
- MinimalRebuild="TRUE"
+ MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
- BufferSecurityCheck="TRUE"
- RuntimeTypeInfo="TRUE"
+ BufferSecurityCheck="true"
+ RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
BrowseInformation="1"
WarningLevel="3"
- WarnAsError="TRUE"
- DebugInformationFormat="3"/>
+ WarnAsError="true"
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/exiv2.lib"
- AdditionalLibraryDirectories="..\xmpsdk\Debug;..\..\..\expat-2.0.1\win32in\debug"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"
- Description="create the bin (delivery) directory"
- CommandLine="mkdir ..in\Debug\
-copy/y "$(TargetPath)" ..in\Debug\$(TargetFileName)
-"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreBuildEventTool"
- CommandLine="if exist ..\include\exiv2 goto :jail
-mkdir ..\include\exiv2\
-copy/y ..\..\src\*.h ..\include\exiv2\
-copy/y ..\..\src\*.hpp ..\include\exiv2\
-cd ..\include\exiv2
-del *_int.hpp
-cd ..\..\exiv2lib
-:jail
-"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCLibrarianTool"
+ LinkLibraryDependencies="true"
+ OutputFile="$(OutDir)/exiv2.lib"
+ AdditionalLibraryDirectories="..\xmpsdk\Debug;..\..\..\expat-2.0.1\win32in\debug"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCManagedWrapperGeneratorTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ Description="create the bin (delivery) directory"
+ CommandLine="mkdir ..in\Debug\
copy/y "$(TargetPath)" ..in\Debug\$(TargetFileName)
"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
- CharacterSet="2">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ Description="copy expat and zlib binaries"
+ CommandLine="if exist ..\include\exiv2 goto :jail
mkdir ..\include\exiv2\
copy/y ..\..\src\*.h ..\include\exiv2\
copy/y ..\..\src\*.hpp ..\include\exiv2\
cd ..\include\exiv2
del *_int.hpp
cd ..\..\exiv2lib
:jail

"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
PreprocessorDefinitions="WIN32;_NDEBUG"
RuntimeLibrary="0"
- RuntimeTypeInfo="TRUE"
+ RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
BrowseInformation="1"
WarningLevel="3"
- WarnAsError="TRUE"
- DebugInformationFormat="3"/>
+ WarnAsError="true"
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/exiv2.lib"
- AdditionalLibraryDirectories="..\xmpsdk\Release;..\..\..\expat-2.0.1\win32in
elease"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
- Name="VCPostBuildEventTool"
- Description="create the bin (delivery) directory"
- CommandLine="mkdir ..in\Release\
-copy/y "$(TargetPath)" ..in\$(ConfigurationName)\$(TargetFileName)
-
-"/>
- <Tool
- Name="VCPreBuildEventTool"
- Description="copy expat and zlib binaries"
- CommandLine="if exist ..\include\exiv2 goto :jail
-mkdir ..\include\exiv2\
-copy/y ..\..\src\*.h ..\include\exiv2\
-copy/y ..\..\src\*.hpp ..\include\exiv2\
-cd ..\include\exiv2
-del *_int.hpp
-cd ..\..\exiv2lib
-:jail
-
-"/>
- <Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCLibrarianTool"
+ LinkLibraryDependencies="true"
+ OutputFile="$(OutDir)/exiv2.lib"
+ AdditionalLibraryDirectories="..\xmpsdk\Release;..\..\..\expat-2.0.1\win32in
elease"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCManagedWrapperGeneratorTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ Description="create the bin (delivery) directory"
+ CommandLine="mkdir ..in\Release\
copy/y "$(TargetPath)" ..in\$(ConfigurationName)\$(TargetFileName)

"
+ />
</Configuration>
<Configuration
Name="DebugDLL|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="2">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ Description="copy expat and zlib dlls"
+ CommandLine="if exist ..\include\exiv2 goto :jail
mkdir ..\include\exiv2\
copy/y ..\..\src\*.h ..\include\exiv2\
copy/y ..\..\src\*.hpp ..\include\exiv2\
cd ..\include\exiv2
del *_int.hpp
cd ..\..\exiv2lib
:jail
copy/y ..\..\..\expat-2.0.1\win32in\Debug\libexpat.dll $(OutDir)
copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.dll $(OutDir)
"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
PreprocessorDefinitions="WIN32;_DEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB"
- MinimalRebuild="TRUE"
+ MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- BufferSecurityCheck="TRUE"
- RuntimeTypeInfo="TRUE"
+ BufferSecurityCheck="true"
+ RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
BrowseInformation="1"
WarningLevel="3"
- WarnAsError="FALSE"
- DebugInformationFormat="3"/>
+ WarnAsError="false"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NODEFAULTLIB:LIBMTD"
AdditionalDependencies="..\xmpsdk\DebugDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32in\debug\libexpat.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.lib"
OutputFile="$(OutDir)\exiv2.dll"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(TargetDir)\exiv2.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCPostBuildEventTool"
- Description="create the bin (delivery) directorie"
- CommandLine="mkdir "$(SolutionDir)in\DebugDLL\"
-copy/y ..\..\..\expat-2.0.1\win32in\Debug\libexpat.dll "$(SolutionDir)in\$(ConfigurationName)\"
-copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)\$(TargetFileName)"
-copy/y "$(TargetDir)\*.dll" "$(SolutionDir)in\$(ConfigurationName)\"
-copy/y "$(TargetDir)\*.lib" "$(SolutionDir)in\$(ConfigurationName)\"
-
-"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPreBuildEventTool"
- Description="copy expat and zlib dlls"
- CommandLine="if exist ..\include\exiv2 goto :jail
-mkdir ..\include\exiv2\
-copy/y ..\..\src\*.h ..\include\exiv2\
-copy/y ..\..\src\*.hpp ..\include\exiv2\
-cd ..\include\exiv2
-del *_int.hpp
-cd ..\..\exiv2lib
-:jail
-copy/y ..\..\..\expat-2.0.1\win32in\Debug\libexpat.dll $(OutDir)
-copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.dll $(OutDir)
-"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ Description="create the bin (delivery) directorie"
+ CommandLine="mkdir "$(SolutionDir)in\DebugDLL\"
copy/y ..\..\..\expat-2.0.1\win32in\Debug\libexpat.dll "$(SolutionDir)in\$(ConfigurationName)\"
copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)\$(TargetFileName)"
copy/y "$(TargetDir)\*.dll" "$(SolutionDir)in\$(ConfigurationName)\"
copy/y "$(TargetDir)\*.lib" "$(SolutionDir)in\$(ConfigurationName)\"

"
+ />
</Configuration>
<Configuration
Name="ReleaseDLL|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="2">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ Description="copy expat and zlib dlls"
+ CommandLine="if exist ..\include\exiv2 goto :jail
mkdir ..\include\exiv2\
copy/y ..\..\src\*.h ..\include\exiv2\
copy/y ..\..\src\*.hpp ..\include\exiv2\
cd ..\include\exiv2
del *_int.hpp
cd ..\..\exiv2lib
:jail
copy/y ..\..\..\expat-2.0.1\win32in\Release\*.dll $(OutDir)
copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.dll $(OutDir)

"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
PreprocessorDefinitions="WIN32;_NDEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB"
- MinimalRebuild="TRUE"
+ MinimalRebuild="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
- BufferSecurityCheck="TRUE"
- RuntimeTypeInfo="TRUE"
+ BufferSecurityCheck="true"
+ RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
BrowseInformation="1"
WarningLevel="3"
- WarnAsError="FALSE"
- DebugInformationFormat="3"/>
+ WarnAsError="false"
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NODEFAULTLIB:LIBCMT"
AdditionalDependencies="..\xmpsdk\ReleaseDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32in
elease\libexpat.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.lib"
OutputFile="$(OutDir)\exiv2.dll"
- GenerateDebugInformation="FALSE"
+ GenerateDebugInformation="false"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(TargetDir)\exiv2.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"
- Description="create the bin (delivery) directory"
- CommandLine="mkdir "$(SolutionDir)in\$(ConfigurationName)\"
-copy/y ..\..\..\expat-2.0.1\win32in\Release\libexpat.dll "$(SolutionDir)in\$(ConfigurationName)\"
-copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)\$(TargetFileName)"
-copy/y "$(TargetDir)\*.dll" "$(SolutionDir)in\$(ConfigurationName)\"
-copy/y "$(TargetDir)\*.lib" "$(SolutionDir)in\$(ConfigurationName)\"
-"/>
- <Tool
- Name="VCPreBuildEventTool"
- Description="copy expat and zlib dlls"
- CommandLine="if exist ..\include\exiv2 goto :jail
-mkdir ..\include\exiv2\
-copy/y ..\..\src\*.h ..\include\exiv2\
-copy/y ..\..\src\*.hpp ..\include\exiv2\
-cd ..\include\exiv2
-del *_int.hpp
-cd ..\..\exiv2lib
-:jail
-copy/y ..\..\..\expat-2.0.1\win32in\Release\*.dll $(OutDir)
-copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.dll $(OutDir)
-
-"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCManagedWrapperGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ Description="create the bin (delivery) directory"
+ CommandLine="mkdir "$(SolutionDir)in\$(ConfigurationName)\"
copy/y ..\..\..\expat-2.0.1\win32in\Release\libexpat.dll "$(SolutionDir)in\$(ConfigurationName)\"
copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)\$(TargetFileName)"
copy/y "$(TargetDir)\*.dll" "$(SolutionDir)in\$(ConfigurationName)\"
copy/y "$(TargetDir)\*.lib" "$(SolutionDir)in\$(ConfigurationName)\"
"
+ />
</Configuration>
</Configurations>
<References>
@@ -279,318 +336,396 @@ copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.dll $(OutDi
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
<File
- RelativePath="..\..\srcasicio.cpp">
+ RelativePath="..\..\srcasicio.cpp"
+ >
</File>
<File
- RelativePath="..\..\srcmpimage.cpp">
+ RelativePath="..\..\srcmpimage.cpp"
+ >
</File>
<File
- RelativePath="..\..\src
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list