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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:45:19 UTC 2017


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

The following commit has been merged in the master branch:
commit f52eacf9217fcc4a00f37e292aeafa0e6da037dd
Author: Robin Mills <robin at clanmills.com>
Date:   Sat May 9 09:24:41 2015 +0000

    #1071  Remove Jzon from libexiv2
    1) Move src/Jzon.cpp and include/exiv2/Jzon.hpp to samples/Jzon.{cpp|hpp}
    2) Update build environment appropriately.
---
 config/Doxyfile                     |   4 +-
 msvc2003/exiv2json/exiv2json.vcproj |   2 +-
 msvc2003/exiv2lib/exiv2lib.vcproj   | 567 +-----------------------------------
 msvc2005/exiv2json/exiv2json.vcproj |   2 +-
 msvc2005/libexiv2/libexiv2.vcproj   |   2 +-
 samples/CMakeLists.txt              |   7 +-
 {src => samples}/Jzon.cpp           |   0
 {include/exiv2 => samples}/Jzon.h   |   0
 samples/Makefile                    |   7 +
 src/CMakeLists.txt                  |   2 -
 src/Makefile                        |   2 -
 11 files changed, 19 insertions(+), 576 deletions(-)

diff --git a/config/Doxyfile b/config/Doxyfile
index 374de91..2d1dab7 100644
--- a/config/Doxyfile
+++ b/config/Doxyfile
@@ -700,10 +700,10 @@ RECURSIVE              = NO
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = ../include/exiv2/Jzon.h \
+EXCLUDE                = ../samples/Jzon.h \
                          ../src/getopt_win32.c \
                          ../src/getopt_win32.h \
-                         ../src/Jzon.cpp \
+                         ../samples/Jzon.cpp \
                          ../src/localtime.c \
                          ../src/private.h \
                          ../src/timegm.h \
diff --git a/msvc2003/exiv2json/exiv2json.vcproj b/msvc2003/exiv2json/exiv2json.vcproj
index de2d1b2..a86bb75 100644
--- a/msvc2003/exiv2json/exiv2json.vcproj
+++ b/msvc2003/exiv2json/exiv2json.vcproj
@@ -1 +1 @@
-<?xml version="1.0" encoding="Windows-1252"?><VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="exiv2json" ProjectGUID="{8391174F-52D5-4111-A0FE-E87135301CFB}" RootNamespace="exiv2json" 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"/><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="EXV_USE_CURL=0;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)/exiv2json.exe" LinkIncremental="1" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/exiv2json.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"/><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="EXV_USE_CURL=0;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" OutputFile="$(OutDir)/exiv2json.exe" 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" 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="EXV_USE_CURL=0;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)/exiv2json.exe" LinkIncremental="1" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/exiv2json.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" 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="EXV_USE_CURL=0;WIN32;_NDEBUG;_CONSOLE;EXV_HAVE_DLL;EXV_HAVE_DLL" MinimalRebuild="true" BasicRuntimeChecks="0" 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)/exiv2json.exe" LinkIncremental="1" DelayLoadDLLs="" GenerateDebugInformation="false" ProgramDatabaseFile="$(OutDir)/exiv2json.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\exiv2json.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 -->
\ No newline at end of file
+<?xml version="1.0" encoding="Windows-1252"?><VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="exiv2json" ProjectGUID="{8391174F-52D5-4111-A0FE-E87135301CFB}" RootNamespace="exiv2json" 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"/><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="EXV_USE_CURL=0;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)/exiv2json.exe" LinkIncremental="1" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/exiv2json.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"/><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="EXV_USE_CURL=0;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" OutputFile="$(OutDir)/exiv2json.exe" 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" 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="EXV_USE_CURL=0;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)/exiv2json.exe" LinkIncremental="1" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/exiv2json.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" 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="EXV_USE_CURL=0;WIN32;_NDEBUG;_CONSOLE;EXV_HAVE_DLL;EXV_HAVE_DLL" MinimalRebuild="true" BasicRuntimeChecks="0" 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)/exiv2json.exe" LinkIncremental="1" DelayLoadDLLs="" GenerateDebugInformation="false" ProgramDatabaseFile="$(OutDir)/exiv2json.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\exiv2json.cpp">         </File><File RelativePath="..\..\samples\Jzon.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 -->
\ No newline at end of file
diff --git a/msvc2003/exiv2lib/exiv2lib.vcproj b/msvc2003/exiv2lib/exiv2lib.vcproj
index 306c586..5b4df81 100644
--- a/msvc2003/exiv2lib/exiv2lib.vcproj
+++ b/msvc2003/exiv2lib/exiv2lib.vcproj
@@ -1,566 +1 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="exiv2lib"
-	ProjectGUID="{831EF580-92C8-4CA8-B0CE-3D906280A54D}"
-	RootNamespace="exiv2lib"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
-				PreprocessorDefinitions="EXV_USE_CURL=0;WIN32;_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				BrowseInformation="1"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/exiv2sd.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\$(ConfigurationName)
-copy/y "$(TargetPath)" ..in\$(ConfigurationName)\
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include;../../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
-				PreprocessorDefinitions="EXV_USE_CURL=0;WIN32;_NDEBUG"
-				RuntimeLibrary="0"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				BrowseInformation="1"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/exiv2s.lib"
-				AdditionalLibraryDirectories="..\xmpsdk\Release;..\..\..\expat-2.0.1\win32in
elease"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="create the bin (delivery) directory"
-				CommandLine="mkdir ..in\$(ConfigurationName)
-copy/y "$(TargetPath)" ..in\$(ConfigurationName)\
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="DebugDLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
-				PreprocessorDefinitions="EXV_USE_CURL=0;WIN32;_DEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				BrowseInformation="1"
-				WarningLevel="3"
-				WarnAsError="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<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)\exiv2d.dll"
-				GenerateDebugInformation="TRUE"
-				ImportLibrary="$(TargetDir)\exiv2d.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="create the bin (delivery) directory"
-				CommandLine="mkdir ..in\$(ConfigurationName)
-copy/y "$(TargetPath)" ..in\$(ConfigurationName)\
-copy/y "$(TargetDir)*.dll" ..in\$(ConfigurationName)\
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="copy expat and zlib dlls"
-				CommandLine="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="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				AdditionalIncludeDirectories="../../include;../../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
-				PreprocessorDefinitions="EXV_USE_CURL=0;WIN32;_NDEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				BrowseInformation="1"
-				WarningLevel="3"
-				WarnAsError="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<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"
-				ImportLibrary="$(TargetDir)\exiv2.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="create the bin (delivery) directory"
-				CommandLine="mkdir ..in\$(ConfigurationName)
-copy/y "$(TargetPath)" ..in\$(ConfigurationName)
-copy/y "$(TargetDir)*.dll" ..in\$(ConfigurationName)\
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="copy expat and zlib dlls"
-				CommandLine="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="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</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="..\..\srcsfvideo.cpp">
-			</File>
-			<File
-				RelativePath="..\..\srcasicio.cpp">
-			</File>
-			<File
-				RelativePath="..\..\srcmpimage.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src
-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list