[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:03 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=dfb1d55
The following commit has been merged in the master branch:
commit dfb1d5501d0bc2d643678df2ce1f822a5924b7a9
Author: Robin Mills <robin at clanmills.com>
Date: Wed Apr 25 04:14:01 2012 +0000
adding missing msvc projects
---
.../easyaccess-test.vcproj} | 20 ++++++-------
msvc/exiv2.sln | 22 ++++++++++++++
.../exifprint.vcproj => key-test/key-test.vcproj} | 20 ++++++-------
msvc/path-test/libexpat.dll | Bin 0 -> 397312 bytes
.../exiv2.vcproj => path-test/path-test.vcproj} | 32 +++++++--------------
.../werror-test.vcproj} | 20 ++++++-------
6 files changed, 62 insertions(+), 52 deletions(-)
diff --git a/msvc/exifprint/exifprint.vcproj b/msvc/easyaccess-test/easyaccess-test.vcproj
similarity index 95%
copy from msvc/exifprint/exifprint.vcproj
copy to msvc/easyaccess-test/easyaccess-test.vcproj
index d6f5113..af3d856 100644
--- a/msvc/exifprint/exifprint.vcproj
+++ b/msvc/easyaccess-test/easyaccess-test.vcproj
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
- Name="exifprint"
+ Name="easyaccess-test"
ProjectGUID="{8391174F-52D5-4111-A0FE-E87135301CFB}"
- RootNamespace="exifprint"
+ RootNamespace="easyaccess-test"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@@ -69,10 +69,10 @@
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)/exifprint.exe"
+ OutputFile="$(OutDir)/easyaccess-test.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/exifprint.pdb"
+ ProgramDatabaseFile="$(OutDir)/easyaccess-test.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -151,7 +151,7 @@
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)/exifprint.exe"
+ OutputFile="$(OutDir)/easyaccess-test.exe"
LinkIncremental="1"
GenerateDebugInformation="false"
SubSystem="1"
@@ -241,10 +241,10 @@
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)/exifprint.exe"
+ OutputFile="$(OutDir)/easyaccess-test.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/exifprint.pdb"
+ ProgramDatabaseFile="$(OutDir)/easyaccess-test.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -330,11 +330,11 @@
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)/exifprint.exe"
+ OutputFile="$(OutDir)/easyaccess-test.exe"
LinkIncremental="1"
DelayLoadDLLs=""
GenerateDebugInformation="false"
- ProgramDatabaseFile="$(OutDir)/exifprint.pdb"
+ ProgramDatabaseFile="$(OutDir)/easyaccess-test.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -374,7 +374,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\samples\exifprint.cpp"
+ RelativePath="..\..\samples\easyaccess-test.cpp"
>
</File>
</Filter>
diff --git a/msvc/exiv2.sln b/msvc/exiv2.sln
index 9a35111..9abb63f 100644
--- a/msvc/exiv2.sln
+++ b/msvc/exiv2.sln
@@ -4,6 +4,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exifprint", "exifprint\exif
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
EndProjectSection
EndProject
+
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "key-test", "key-test\key-test.vcproj", "{8391174F-52D5-4111-A0FE-E87135301CFB}"
+ ProjectSection(ProjectDependencies) = postProject
+ {A11EF580-92C8-4CA8-B0CE-3D906280A54D} = {A11EF580-92C8-4CA8-B0CE-3D906280A54D}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "path-test", "path-test\path-test.vcproj", "{8391174F-52D5-4111-A0FE-E87135301CFB}"
+ ProjectSection(ProjectDependencies) = postProject
+ {A21EF580-92C8-4CA8-B0CE-3D906280A54D} = {A21EF580-92C8-4CA8-B0CE-3D906280A54D}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "werror-test", "werror-test\werror-test.vcproj", "{8391174F-52D5-4111-A0FE-E87135301CFB}"
+ ProjectSection(ProjectDependencies) = postProject
+ {A31EF580-92C8-4CA8-B0CE-3D906280A54D} = {A31EF580-92C8-4CA8-B0CE-3D906280A54D}
+ EndProjectSection
+EndProject
+
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "easyaccess-test", "easyaccess-test\easyaccess-test.vcproj", "{8391174F-52D5-4111-A0FE-E87135301CFB}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FF1EF580-92C8-4CA8-B0CE-3D906280A54D} = {FF1EF580-92C8-4CA8-B0CE-3D906280A54D}
+ EndProjectSection
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exiv2lib", "exiv2lib\exiv2lib.vcproj", "{831EF580-92C8-4CA8-B0CE-3D906280A54D}"
ProjectSection(ProjectDependencies) = postProject
{09877CF4-83B6-44FE-A2E2-629AA5C8093E} = {09877CF4-83B6-44FE-A2E2-629AA5C8093E}
diff --git a/msvc/exifprint/exifprint.vcproj b/msvc/key-test/key-test.vcproj
similarity index 96%
copy from msvc/exifprint/exifprint.vcproj
copy to msvc/key-test/key-test.vcproj
index d6f5113..72ff430 100644
--- a/msvc/exifprint/exifprint.vcproj
+++ b/msvc/key-test/key-test.vcproj
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
- Name="exifprint"
+ Name="key-test"
ProjectGUID="{8391174F-52D5-4111-A0FE-E87135301CFB}"
- RootNamespace="exifprint"
+ RootNamespace="key-test"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@@ -69,10 +69,10 @@
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)/exifprint.exe"
+ OutputFile="$(OutDir)/key-test.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/exifprint.pdb"
+ ProgramDatabaseFile="$(OutDir)/key-test.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -151,7 +151,7 @@
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)/exifprint.exe"
+ OutputFile="$(OutDir)/key-test.exe"
LinkIncremental="1"
GenerateDebugInformation="false"
SubSystem="1"
@@ -241,10 +241,10 @@
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)/exifprint.exe"
+ OutputFile="$(OutDir)/key-test.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/exifprint.pdb"
+ ProgramDatabaseFile="$(OutDir)/key-test.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -330,11 +330,11 @@
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)/exifprint.exe"
+ OutputFile="$(OutDir)/key-test.exe"
LinkIncremental="1"
DelayLoadDLLs=""
GenerateDebugInformation="false"
- ProgramDatabaseFile="$(OutDir)/exifprint.pdb"
+ ProgramDatabaseFile="$(OutDir)/key-test.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -374,7 +374,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\samples\exifprint.cpp"
+ RelativePath="..\..\samples\key-test.cpp"
>
</File>
</Filter>
diff --git a/msvc/path-test/libexpat.dll b/msvc/path-test/libexpat.dll
new file mode 100644
index 0000000..edb5aa4
Binary files /dev/null and b/msvc/path-test/libexpat.dll differ
diff --git a/msvc/exiv2/exiv2.vcproj b/msvc/path-test/path-test.vcproj
similarity index 95%
copy from msvc/exiv2/exiv2.vcproj
copy to msvc/path-test/path-test.vcproj
index 6c24c40..5e444bf 100644
--- a/msvc/exiv2/exiv2.vcproj
+++ b/msvc/path-test/path-test.vcproj
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
- Name="exiv2"
+ Name="path-test"
ProjectGUID="{07293CAC-00DA-493E-90C9-5D010C2B1B53}"
- RootNamespace="exiv2"
+ RootNamespace="path-test"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@@ -69,11 +69,11 @@
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)/exiv2.exe"
+ OutputFile="$(OutDir)/path-test.exe"
LinkIncremental="1"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
+ ProgramDatabaseFile="$(OutDir)/path-test.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -152,7 +152,7 @@
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)/exiv2.exe"
+ OutputFile="$(OutDir)/path-test.exe"
LinkIncremental="1"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="false"
@@ -243,10 +243,10 @@
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)/exiv2.exe"
+ OutputFile="$(OutDir)/path-test.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
+ ProgramDatabaseFile="$(OutDir)/path-test.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -332,10 +332,10 @@
LinkLibraryDependencies="false"
AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
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)/exiv2.exe"
+ OutputFile="$(OutDir)/path-test.exe"
LinkIncremental="1"
GenerateDebugInformation="false"
- ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
+ ProgramDatabaseFile="$(OutDir)/path-test.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -375,11 +375,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\srcctions.cpp"
- >
- </File>
- <File
- RelativePath="..\..\src\exiv2.cpp"
+ RelativePath="..\..\src\path-test.cpp"
>
</File>
<File
@@ -401,14 +397,6 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\..\srcctions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\src\exiv2.hpp"
- >
- </File>
- <File
RelativePath="..\..\src\getopt_win32.h"
>
</File>
diff --git a/msvc/exifprint/exifprint.vcproj b/msvc/werror-test/werror-test.vcproj
similarity index 95%
copy from msvc/exifprint/exifprint.vcproj
copy to msvc/werror-test/werror-test.vcproj
index d6f5113..608579a 100644
--- a/msvc/exifprint/exifprint.vcproj
+++ b/msvc/werror-test/werror-test.vcproj
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
- Name="exifprint"
+ Name="werror-test"
ProjectGUID="{8391174F-52D5-4111-A0FE-E87135301CFB}"
- RootNamespace="exifprint"
+ RootNamespace="werror-test"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@@ -69,10 +69,10 @@
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)/exifprint.exe"
+ OutputFile="$(OutDir)/werror-test.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/exifprint.pdb"
+ ProgramDatabaseFile="$(OutDir)/werror-test.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -151,7 +151,7 @@
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)/exifprint.exe"
+ OutputFile="$(OutDir)/werror-test.exe"
LinkIncremental="1"
GenerateDebugInformation="false"
SubSystem="1"
@@ -241,10 +241,10 @@
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)/exifprint.exe"
+ OutputFile="$(OutDir)/werror-test.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/exifprint.pdb"
+ ProgramDatabaseFile="$(OutDir)/werror-test.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -330,11 +330,11 @@
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)/exifprint.exe"
+ OutputFile="$(OutDir)/werror-test.exe"
LinkIncremental="1"
DelayLoadDLLs=""
GenerateDebugInformation="false"
- ProgramDatabaseFile="$(OutDir)/exifprint.pdb"
+ ProgramDatabaseFile="$(OutDir)/werror-test.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -374,7 +374,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\samples\exifprint.cpp"
+ RelativePath="..\..\samples\werror-test.cpp"
>
</File>
</Filter>
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list