[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:43:11 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=d9bcc04

The following commit has been merged in the master branch:
commit d9bcc04633492c3432e124d387792b7a04eda842
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Jul 9 01:25:17 2012 +0000

    Added version.{c}h}pp/dumpLibraryInfo() and call from exiv2 -v -V to inspect libraries at run-time on W/L/M platforms.
---
 msvc/addmoddel/addmoddel.vcproj               |   2 +-
 msvc/convert-test/convert-test.vcproj         |   2 +-
 msvc/easyaccess-test/easyaccess-test.vcproj   |   2 +-
 msvc/exifcomment/exifcomment.vcproj           |   2 +-
 msvc/exifdata-test/exifdata-test.vcproj       |   2 +-
 msvc/exifprint/exifprint.vcproj               |   2 +-
 msvc/exiv2/exiv2.vcproj                       |   2 +-
 msvc/exiv2lib/exiv2lib.vcproj                 |   2 +-
 msvc/exivsimple/exivsimple.vcproj             |   2 +-
 msvc/iotest/iotest.vcproj                     |   2 +-
 msvc/iptceasy/iptceasy.vcproj                 |   2 +-
 msvc/iptcprint/iptcprint.vcproj               |   2 +-
 msvc/iptctest/iptctest.vcproj                 |   2 +-
 msvc/key-test/key-test.vcproj                 |   2 +-
 msvc/largeiptc-test/largeiptc-test.vcproj     |   2 +-
 msvc/metacopy/metacopy.vcproj                 |   2 +-
 msvc/mmap-test/mmap-test.vcproj               |   2 +-
 msvc/organize/organize.vcproj                 |   2 +-
 msvc/path-test/path-test.vcproj               |   2 +-
 msvc/prevtest/prevtest.vcproj                 |   2 +-
 msvc/stringto-test/stringto-test.vcproj       |   2 +-
 msvc/taglist/taglist.vcproj                   |   2 +-
 msvc/tiff-test/tiff-test.vcproj               |   2 +-
 msvc/utiltest/utiltest.vcproj                 |   2 +-
 msvc/werror-test/werror-test.vcproj           |   2 +-
 msvc/write-test/write-test.vcproj             |   2 +-
 msvc/write2-test/write2-test.vcproj           |   2 +-
 msvc/xmpparse/xmpparse.vcproj                 |   2 +-
 msvc/xmpparser-test/xmpparser-test.vcproj     |   2 +-
 msvc/xmpsample/xmpsample.vcproj               |   2 +-
 msvc/xmpsdk/xmpsdk.vcproj                     |   2 +-
 msvc64/addmoddel/addmoddel.vcproj             |   2 +-
 msvc64/convert-test/convert-test.vcproj       |   2 +-
 msvc64/easyaccess-test/easyaccess-test.vcproj |   2 +-
 msvc64/exifcomment/exifcomment.vcproj         |   2 +-
 msvc64/exifdata-test/exifdata-test.vcproj     |   2 +-
 msvc64/exifprint/exifprint.vcproj             |   2 +-
 msvc64/exiv2/exiv2.vcproj                     |   2 +-
 msvc64/exiv2lib/exiv2lib.vcproj               |   2 +-
 msvc64/iotest/iotest.vcproj                   |   2 +-
 msvc64/iptceasy/iptceasy.vcproj               |   2 +-
 msvc64/iptcprint/iptcprint.vcproj             |   2 +-
 msvc64/iptctest/iptctest.vcproj               |   2 +-
 msvc64/key-test/key-test.vcproj               |   2 +-
 msvc64/largeiptc-test/largeiptc-test.vcproj   |   2 +-
 msvc64/metacopy/metacopy.vcproj               |   2 +-
 msvc64/mmap-test/mmap-test.vcproj             |   2 +-
 msvc64/path-test/path-test.vcproj             |   2 +-
 msvc64/prevtest/prevtest.vcproj               |   2 +-
 msvc64/stringto-test/stringto-test.vcproj     |   2 +-
 msvc64/taglist/taglist.vcproj                 | 790 +-------------------------
 msvc64/tiff-test/tiff-test.vcproj             |   2 +-
 msvc64/tools/ppxml                            |   4 +-
 msvc64/utiltest/utiltest.vcproj               | 790 +-------------------------
 msvc64/werror-test/werror-test.vcproj         |   2 +-
 msvc64/write-test/write-test.vcproj           |   2 +-
 msvc64/write2-test/write2-test.vcproj         |   2 +-
 msvc64/xmpparse/xmpparse.vcproj               |   2 +-
 msvc64/xmpparser-test/xmpparser-test.vcproj   |   2 +-
 msvc64/xmpsample/xmpsample.vcproj             |   2 +-
 msvc64/xmpsdk/xmpsdk.vcproj                   |   2 +-
 src/exiv2.cpp                                 |   6 +-
 src/exiv2app.hpp                              |   2 +-
 src/version.cpp                               | 126 ++++
 src/version.hpp                               |   7 +
 65 files changed, 200 insertions(+), 1641 deletions(-)

diff --git a/msvc/addmoddel/addmoddel.vcproj b/msvc/addmoddel/addmoddel.vcproj
index 66aadf8..58dc147 100644
--- a/msvc/addmoddel/addmoddel.vcproj
+++ b/msvc/addmoddel/addmoddel.vcproj
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="Windows-1252"?><VisualStudioProject	ProjectType="Visual C++"	Version="7.10"	Name="addmoddel"	ProjectGUID="{271E59C4-81F9-4231-85D3-E7DDB2E2BC08}"	RootNamespace="addmoddel"	Keyword="Win32Proj"	TargetFrameworkVersion="131072"	>	<Platforms>		<Platform			Name="Win32"		/>	</Platforms>	<ToolFiles>	</ToolFiles>	<Configurations>		<Configuration			Name="Debug|Win32"			OutputDirectory="Debug"			IntermediateDirectory="Debug"			ConfigurationType="1"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			>			<Tool				Name="VCPreBuildEventTool"				CommandLine=""			/>			<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;_CONSOLE"				MinimalRebuild="true"				BasicRuntimeChecks="3"				RuntimeLibrary="1"				BufferSecurityCheck="true"				RuntimeTypeInfo="true"				UsePrecompiledHeader="0"				BrowseInformation="1"				WarningLevel="3"				WarnAsError="true"				DebugInformationFormat="3"			/>			<Tool				Name="VCManagedResourceCompilerTool"			/>			<Tool				Name="VCResourceCompilerTool"			/>			<Tool				Name="VCPreLinkEventTool"			/>			<Tool				Name="VCLinkerTool"				LinkLibraryDependencies="false"				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32in\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Debug\zlibd.lib"				OutputFile="$(OutDir)/addmoddel.exe"				LinkIncremental="1"				AdditionalLibraryDirectories=""				GenerateDebugInformation="true"				ProgramDatabaseFile="$(OutDir)/addmoddel.pdb"				SubSystem="1"				RandomizedBaseAddress="1"				DataExecutionPrevention="0"				TargetMachine="1"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCManifestTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCAppVerifierTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="copy target to bin"				CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""			/>		</Configuration>		<Configuration			Name="Release|Win32"			OutputDirectory="Release"			IntermediateDirectory="Release"			ConfigurationType="1"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			>			<Tool				Name="VCPreBuildEventTool"				CommandLine=""			/>			<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;_CONSOLE"				RuntimeLibrary="0"				RuntimeTypeInfo="true"				UsePrecompiledHeader="0"				BrowseInformation="1"				WarningLevel="3"				WarnAsError="true"				DebugInformationFormat="3"			/>			<Tool				Name="VCManagedResourceCompilerTool"			/>			<Tool				Name="VCResourceCompilerTool"			/>			<Tool				Name="VCPreLinkEventTool"			/>			<Tool				Name="VCLinkerTool"				LinkLibraryDependencies="false"				AdditionalOptions="/NODEFAULTLIB:MSVCRT"				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32in
elease\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Release\zlib.lib"				LinkIncremental="1"				GenerateDebugInformation="false"				SubSystem="1"				OptimizeReferences="2"				EnableCOMDATFolding="2"				RandomizedBaseAddress="1"				DataExecutionPrevention="0"				TargetMachine="1"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCManifestTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCAppVerifierTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="copy target to bin"				CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""			/>		</Configuration>		<Configuration			Name="DebugDLL|Win32"			OutputDirectory="$(ConfigurationName)"			IntermediateDirectory="$(ConfigurationName)"			ConfigurationType="1"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			>			<Tool				Name="VCPreBuildEventTool"				Description="copy expat dll"				CommandLine="copy/y ..\..\..\expat-2.0.1\win32in\debug\*.dll "$(TargetDir)""			/>			<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;_CONSOLE;EXV_HAVE_DLL"				MinimalRebuild="true"				BasicRuntimeChecks="3"				RuntimeLibrary="3"				BufferSecurityCheck="true"				RuntimeTypeInfo="true"				UsePrecompiledHeader="0"				BrowseInformation="1"				WarningLevel="3"				WarnAsError="true"				DebugInformationFormat="3"			/>			<Tool				Name="VCManagedResourceCompilerTool"			/>			<Tool				Name="VCResourceCompilerTool"			/>			<Tool				Name="VCPreLinkEventTool"				Description="copy the dlls"				CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""			/>			<Tool				Name="VCLinkerTool"				LinkLibraryDependencies="false"				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32in\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.lib"				OutputFile="$(OutDir)/addmoddel.exe"				LinkIncremental="1"				GenerateDebugInformation="true"				ProgramDatabaseFile="$(OutDir)/addmoddel.pdb"				SubSystem="1"				RandomizedBaseAddress="1"				DataExecutionPrevention="0"				TargetMachine="1"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCManifestTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCAppVerifierTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="copy target to bin"				CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""			/>		</Configuration>		<Configuration			Name="ReleaseDLL|Win32"			OutputDirectory="$(ConfigurationName)"			IntermediateDirectory="$(ConfigurationName)"			ConfigurationType="1"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			>			<Tool				Name="VCPreBuildEventTool"				Description="copy expat dll"				CommandLine="copy/y ..\..\..\expat-2.0.1\win32in
elease\*.dll "$(TargetDir)""			/>			<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;_NDEBUG;_CONSOLE;EXV_HAVE_DLL"				MinimalRebuild="true"				BasicRuntimeChecks="3"				RuntimeLibrary="2"				BufferSecurityCheck="true"				RuntimeTypeInfo="true"				UsePrecompiledHeader="0"				BrowseInformation="1"				WarningLevel="3"				WarnAsError="true"				DebugInformationFormat="3"			/>			<Tool				Name="VCManagedResourceCompilerTool"			/>			<Tool				Name="VCResourceCompilerTool"			/>			<Tool				Name="VCPreLinkEventTool"				Description="copy the dlls"				CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""			/>			<Tool				Name="VCLinkerTool"				LinkLibraryDependencies="false"				AdditionalOptions="/NODEFAULTLIB:LIBCMT"				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32in
elease\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.lib"				OutputFile="$(OutDir)/addmoddel.exe"				LinkIncremental="1"				GenerateDebugInformation="false"				ProgramDatabaseFile="$(OutDir)/addmoddel.pdb"				SubSystem="1"				RandomizedBaseAddress="1"				DataExecutionPrevention="0"				TargetMachine="1"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCManifestTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCAppVerifierTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="copy target to bin"				CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""			/>		</Configuration>	</Configurations>	<References>	</References>	<Files>		<Filter			Name="Source Files"			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"			>			<File				RelativePath="..\..\samplesddmoddel.cpp"				>			</File>		</Filter>		<Filter			Name="Header Files"			Filter="h;hpp;hxx;hm;inl;inc;xsd"			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"			>		</Filter>		<Filter			Name="Resource Files"			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"			>		</Filter>	</Files>	<Globals>	</Globals></VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?><VisualStudioProject	ProjectType="Visual C++"	Version="7.10"	Name="addmoddel"	ProjectGUID="{271E59C4-81F9-4231-85D3-E7DDB2E2BC08}"	RootNamespace="addmoddel"	Keyword="Win32Proj"	TargetFrameworkVersion="131072"	>	<Platforms>		<Platform			Name="Win32"		/>	</Platforms>	<ToolFiles>	</ToolFiles>	<Configurations>		<Configuration			Name="Debug|Win32"			OutputDirectory="Debug"			IntermediateDirectory="Debug"			ConfigurationType="1"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			>			<Tool				Name="VCPreBuildEventTool"				CommandLine=""			/>			<Tool				Name="VCCustomBuildTool"			/>			<Tool				Name="VCXMLDataGeneratorTool"			/>			<Tool				Name="VCWebServiceProxyGeneratorTool"			/>			<Tool				Name="VCMIDLTool"			/>			<Tool				Name="VCCLCompilerTool"				Optimization="0"				AdditionalIncludeDirectories="../include;../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"				MinimalRebuild="true"				BasicRuntimeChecks="3"				RuntimeLibrary="1"				BufferSecurityCheck="true"				RuntimeTypeInfo="true"				UsePrecompiledHeader="0"				BrowseInformation="1"				WarningLevel="3"				WarnAsError="true"				DebugInformationFormat="3"			/>			<Tool				Name="VCManagedResourceCompilerTool"			/>			<Tool				Name="VCResourceCompilerTool"			/>			<Tool				Name="VCPreLinkEventTool"			/>			<Tool				Name="VCLinkerTool"				LinkLibraryDependencies="false"				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32in\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Debug\zlibd.lib"				OutputFile="$(OutDir)/addmoddel.exe"				LinkIncremental="1"				AdditionalLibraryDirectories=""				GenerateDebugInformation="true"				ProgramDatabaseFile="$(OutDir)/addmoddel.pdb"				SubSystem="1"				RandomizedBaseAddress="1"				DataExecutionPrevention="0"				TargetMachine="1"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCManifestTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCAppVerifierTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="copy target to bin"				CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""			/>		</Configuration>		<Configuration			Name="Release|Win32"			OutputDirectory="Release"			IntermediateDirectory="Release"			ConfigurationType="1"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			>			<Tool				Name="VCPreBuildEventTool"				CommandLine=""			/>			<Tool				Name="VCCustomBuildTool"			/>			<Tool				Name="VCXMLDataGeneratorTool"			/>			<Tool				Name="VCWebServiceProxyGeneratorTool"			/>			<Tool				Name="VCMIDLTool"			/>			<Tool				Name="VCCLCompilerTool"				AdditionalIncludeDirectories="../include;../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE"				RuntimeLibrary="0"				RuntimeTypeInfo="true"				UsePrecompiledHeader="0"				BrowseInformation="1"				WarningLevel="3"				WarnAsError="true"				DebugInformationFormat="3"			/>			<Tool				Name="VCManagedResourceCompilerTool"			/>			<Tool				Name="VCResourceCompilerTool"			/>			<Tool				Name="VCPreLinkEventTool"			/>			<Tool				Name="VCLinkerTool"				LinkLibraryDependencies="false"				AdditionalOptions="/NODEFAULTLIB:MSVCRT"				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32in
elease\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Release\zlib.lib"				LinkIncremental="1"				GenerateDebugInformation="false"				SubSystem="1"				OptimizeReferences="2"				EnableCOMDATFolding="2"				RandomizedBaseAddress="1"				DataExecutionPrevention="0"				TargetMachine="1"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCManifestTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCAppVerifierTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="copy target to bin"				CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""			/>		</Configuration>		<Configuration			Name="DebugDLL|Win32"			OutputDirectory="$(ConfigurationName)"			IntermediateDirectory="$(ConfigurationName)"			ConfigurationType="1"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			>			<Tool				Name="VCPreBuildEventTool"				Description="copy expat dll"				CommandLine="copy/y ..\..\..\expat-2.0.1\win32in\debug\*.dll "$(TargetDir)""			/>			<Tool				Name="VCCustomBuildTool"			/>			<Tool				Name="VCXMLDataGeneratorTool"			/>			<Tool				Name="VCWebServiceProxyGeneratorTool"			/>			<Tool				Name="VCMIDLTool"			/>			<Tool				Name="VCCLCompilerTool"				Optimization="0"				AdditionalIncludeDirectories="../include;../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;EXV_HAVE_DLL"				MinimalRebuild="true"				BasicRuntimeChecks="3"				RuntimeLibrary="3"				BufferSecurityCheck="true"				RuntimeTypeInfo="true"				UsePrecompiledHeader="0"				BrowseInformation="1"				WarningLevel="3"				WarnAsError="true"				DebugInformationFormat="3"			/>			<Tool				Name="VCManagedResourceCompilerTool"			/>			<Tool				Name="VCResourceCompilerTool"			/>			<Tool				Name="VCPreLinkEventTool"				Description="copy the dlls"				CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""			/>			<Tool				Name="VCLinkerTool"				LinkLibraryDependencies="false"				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32in\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.lib"				OutputFile="$(OutDir)/addmoddel.exe"				LinkIncremental="1"				GenerateDebugInformation="true"				ProgramDatabaseFile="$(OutDir)/addmoddel.pdb"				SubSystem="1"				RandomizedBaseAddress="1"				DataExecutionPrevention="0"				TargetMachine="1"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCManifestTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCAppVerifierTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="copy target to bin"				CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""			/>		</Configuration>		<Configuration			Name="ReleaseDLL|Win32"			OutputDirectory="$(ConfigurationName)"			IntermediateDirectory="$(ConfigurationName)"			ConfigurationType="1"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			>			<Tool				Name="VCPreBuildEventTool"				Description="copy expat dll"				CommandLine="copy/y ..\..\..\expat-2.0.1\win32in
elease\*.dll "$(TargetDir)""			/>			<Tool				Name="VCCustomBuildTool"			/>			<Tool				Name="VCXMLDataGeneratorTool"			/>			<Tool				Name="VCWebServiceProxyGeneratorTool"			/>			<Tool				Name="VCMIDLTool"			/>			<Tool				Name="VCCLCompilerTool"				Optimization="0"				AdditionalIncludeDirectories="../include;../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;EXV_HAVE_DLL"				MinimalRebuild="true"				BasicRuntimeChecks="3"				RuntimeLibrary="2"				BufferSecurityCheck="true"				RuntimeTypeInfo="true"				UsePrecompiledHeader="0"				BrowseInformation="1"				WarningLevel="3"				WarnAsError="true"				DebugInformationFormat="3"			/>			<Tool				Name="VCManagedResourceCompilerTool"			/>			<Tool				Name="VCResourceCompilerTool"			/>			<Tool				Name="VCPreLinkEventTool"				Description="copy the dlls"				CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""			/>			<Tool				Name="VCLinkerTool"				LinkLibraryDependencies="false"				AdditionalOptions="/NODEFAULTLIB:LIBCMT"				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32in
elease\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.lib"				OutputFile="$(OutDir)/addmoddel.exe"				LinkIncremental="1"				GenerateDebugInformation="false"				ProgramDatabaseFile="$(OutDir)/addmoddel.pdb"				SubSystem="1"				RandomizedBaseAddress="1"				DataExecutionPrevention="0"				TargetMachine="1"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCManifestTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCAppVerifierTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="copy target to bin"				CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""			/>		</Configuration>	</Configurations>	<References>	</References>	<Files>		<Filter			Name="Source Files"			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"			>			<File				RelativePath="..\..\samplesddmoddel.cpp"				>			</File>		</Filter>		<Filter			Name="Header Files"			Filter="h;hpp;hxx;hm;inl;inc;xsd"			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"			>		</Filter>		<Filter			Name="Resource Files"			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"			>		</Filter>	</Files>	<Globals>	</Globals></VisualStudioProject>
 <!-- use perl script exiv2/msvc64/ppxml to pretty print this file -->
diff --git a/msvc/convert-test/convert-test.vcproj b/msvc/convert-test/convert-test.vcproj
index 0850b3b..0c8b2f0 100644
--- a/msvc/convert-test/convert-test.vcproj
+++ b/msvc/convert-test/convert-test.vcproj
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="Windows-1252"?><VisualStudioProject	ProjectType="Visual C++"	Version="7.10"	Name="convert-test"	ProjectGUID="{610E69BF-9FB7-4A63-AFB5-88C2BA4BE6C1}"	RootNamespace="convert-test"	Keyword="Win32Proj"	TargetFrameworkVersion="131072"	>	<Platforms>		<Platform			Name="Win32"		/>	</Platforms>	<ToolFiles>	</ToolFiles>	<Configurations>		<Configuration			Name="Debug|Win32"			OutputDirectory="Debug"			IntermediateDirectory="Debug"			ConfigurationType="1"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			>			<Tool				Name="VCPreBuildEventTool"				CommandLine=""			/>			<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;_CONSOLE"				MinimalRebuild="true"				BasicRuntimeChecks="3"				RuntimeLibrary="1"				BufferSecurityCheck="true"				RuntimeTypeInfo="true"				UsePrecompiledHeader="0"				BrowseInformation="1"				WarningLevel="3"				WarnAsError="true"				DebugInformationFormat="3"			/>			<Tool				Name="VCManagedResourceCompilerTool"			/>			<Tool				Name="VCResourceCompilerTool"			/>			<Tool				Name="VCPreLinkEventTool"			/>			<Tool				Name="VCLinkerTool"				LinkLibraryDependencies="false"				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32in\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Debug\zlibd.lib"				OutputFile="$(OutDir)/convert-test.exe"				LinkIncremental="1"				AdditionalLibraryDirectories=""				GenerateDebugInformation="true"				ProgramDatabaseFile="$(OutDir)/convert-test.pdb"				SubSystem="1"				RandomizedBaseAddress="1"				DataExecutionPrevention="0"				TargetMachine="1"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCManifestTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCAppVerifierTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="copy target to bin"				CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""			/>		</Configuration>		<Configuration			Name="Release|Win32"			OutputDirectory="Release"			IntermediateDirectory="Release"			ConfigurationType="1"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			>			<Tool				Name="VCPreBuildEventTool"				CommandLine=""			/>			<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;_CONSOLE"				RuntimeLibrary="0"				RuntimeTypeInfo="true"				UsePrecompiledHeader="0"				BrowseInformation="1"				WarningLevel="3"				WarnAsError="true"				DebugInformationFormat="3"			/>			<Tool				Name="VCManagedResourceCompilerTool"			/>			<Tool				Name="VCResourceCompilerTool"			/>			<Tool				Name="VCPreLinkEventTool"			/>			<Tool				Name="VCLinkerTool"				LinkLibraryDependencies="false"				AdditionalOptions="/NODEFAULTLIB:MSVCRT"				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32in
elease\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Release\zlib.lib"				LinkIncremental="1"				GenerateDebugInformation="false"				SubSystem="1"				OptimizeReferences="2"				EnableCOMDATFolding="2"				RandomizedBaseAddress="1"				DataExecutionPrevention="0"				TargetMachine="1"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCManifestTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCAppVerifierTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="copy target to bin"				CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""			/>		</Configuration>		<Configuration			Name="DebugDLL|Win32"			OutputDirectory="$(ConfigurationName)"			IntermediateDirectory="$(ConfigurationName)"			ConfigurationType="1"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			>			<Tool				Name="VCPreBuildEventTool"				Description="copy expat dll"				CommandLine="copy/y ..\..\..\expat-2.0.1\win32in\debug\*.dll "$(TargetDir)""			/>			<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;_CONSOLE;EXV_HAVE_DLL"				MinimalRebuild="true"				BasicRuntimeChecks="3"				RuntimeLibrary="3"				BufferSecurityCheck="true"				RuntimeTypeInfo="true"				UsePrecompiledHeader="0"				BrowseInformation="1"				WarningLevel="3"				WarnAsError="true"				DebugInformationFormat="3"			/>			<Tool				Name="VCManagedResourceCompilerTool"			/>			<Tool				Name="VCResourceCompilerTool"			/>			<Tool				Name="VCPreLinkEventTool"				Description="copy the dlls"				CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""			/>			<Tool				Name="VCLinkerTool"				LinkLibraryDependencies="false"				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32in\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.lib"				OutputFile="$(OutDir)/convert-test.exe"				LinkIncremental="1"				GenerateDebugInformation="true"				ProgramDatabaseFile="$(OutDir)/convert-test.pdb"				SubSystem="1"				RandomizedBaseAddress="1"				DataExecutionPrevention="0"				TargetMachine="1"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCManifestTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCAppVerifierTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="copy target to bin"				CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""			/>		</Configuration>		<Configuration			Name="ReleaseDLL|Win32"			OutputDirectory="$(ConfigurationName)"			IntermediateDirectory="$(ConfigurationName)"			ConfigurationType="1"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			>			<Tool				Name="VCPreBuildEventTool"				Description="copy expat dll"				CommandLine="copy/y ..\..\..\expat-2.0.1\win32in
elease\*.dll "$(TargetDir)""			/>			<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;_NDEBUG;_CONSOLE;EXV_HAVE_DLL"				MinimalRebuild="true"				BasicRuntimeChecks="3"				RuntimeLibrary="2"				BufferSecurityCheck="true"				RuntimeTypeInfo="true"				UsePrecompiledHeader="0"				BrowseInformation="1"				WarningLevel="3"				WarnAsError="true"				DebugInformationFormat="3"			/>			<Tool				Name="VCManagedResourceCompilerTool"			/>			<Tool				Name="VCResourceCompilerTool"			/>			<Tool				Name="VCPreLinkEventTool"				Description="copy the dlls"				CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""			/>			<Tool				Name="VCLinkerTool"				LinkLibraryDependencies="false"				AdditionalOptions="/NODEFAULTLIB:LIBCMT"				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32in
elease\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.lib"				OutputFile="$(OutDir)/convert-test.exe"				LinkIncremental="1"				GenerateDebugInformation="false"				ProgramDatabaseFile="$(OutDir)/convert-test.pdb"				SubSystem="1"				RandomizedBaseAddress="1"				DataExecutionPrevention="0"				TargetMachine="1"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCManifestTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCAppVerifierTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="copy target to bin"				CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""			/>		</Configuration>	</Configurations>	<References>	</References>	<Files>		<Filter			Name="Source Files"			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"			>			<File				RelativePath="..\..\samples
-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list