[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:42:17 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=e724043
The following commit has been merged in the master branch:
commit e7240431a542c4c6d2109aae8ff1845fe7e8a1ae
Author: Robin Mills <robin at clanmills.com>
Date: Sat Feb 26 01:33:53 2011 +0000
msvc64: fixed include reference to zlib-1.2.3. Document update concerning zlib-1.2.3 support. Validation script correction.
---
msvc64/ReadMe.txt | 12 ++++++++++--
msvc64/exiv2/exiv2.vcproj | 16 ++++++++--------
msvc64/exiv2lib/exiv2lib.vcproj | 16 ++++++++--------
msvc64/runner.py | 1 -
msvc64/runner.txt | 9 ---------
msvc64/xmpsdk/xmpsdk.vcproj | 16 ++++++++--------
6 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/msvc64/ReadMe.txt b/msvc64/ReadMe.txt
index 097a680..c6c4575 100644
--- a/msvc64/ReadMe.txt
+++ b/msvc64/ReadMe.txt
@@ -1,7 +1,7 @@
exiv2\msvc64\ReadMe.txt
-----------------------
-Updated: 2011-01-03
+Updated: 2011-02-25
This is work in progress.
However this is sufficiently robust to be in current use by a commercial licensee of exiv2.
@@ -106,6 +106,15 @@ T A B L E o f C O N T E N T S
2010-12-02 20:58 <DIR> zlib-1.2.3 OPTIONAL <--- "vanilla" zlib 1.2.3 source tree
c:\gnu>
Please see exiv2\msvc\README-MSVC.txt for information about obtaining zlib-1.2.3
+
+ 3) Alter the "AdditionalIncludeDirectories" in the following projects:
+ xmpsdk.vcproj
+ exiv2lib.vcproj
+ exiv2.vcproj
+ There are 8 occurances of "AdditionalIncludeDirectories" in each of the 3 projects.
+
+ If you have both 1.2.3 and 1.2.5 in your build tree, you'll probably "get away with" not
+ making this change - however this is due to good luck and you should really adjust the vcprojects.
1.6 Express editions of DevStudio (or 32 bit only builds, or 64 bit only builds)
Express does not provide a 64bit compiler.
@@ -232,6 +241,5 @@ T A B L E o f C O N T E N T S
If you have only build Win32 (or x64), you'll have to remove the output from runner.txt for the target
that isn't of interest.
-
# That's all Folks!
##
diff --git a/msvc64/exiv2/exiv2.vcproj b/msvc64/exiv2/exiv2.vcproj
index b7479f9..5ff8542 100644
--- a/msvc64/exiv2/exiv2.vcproj
+++ b/msvc64/exiv2/exiv2.vcproj
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -131,7 +131,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -217,7 +217,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
@@ -302,7 +302,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
@@ -389,7 +389,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -479,7 +479,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -569,7 +569,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
MinimalRebuild="true"
BasicRuntimeChecks="0"
@@ -659,7 +659,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
MinimalRebuild="true"
BasicRuntimeChecks="0"
diff --git a/msvc64/exiv2lib/exiv2lib.vcproj b/msvc64/exiv2lib/exiv2lib.vcproj
index c21063a..a75cf26 100644
--- a/msvc64/exiv2lib/exiv2lib.vcproj
+++ b/msvc64/exiv2lib/exiv2lib.vcproj
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -185,7 +185,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_NDEBUG"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
@@ -253,7 +253,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_NDEBUG"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
@@ -321,7 +321,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_DEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -408,7 +408,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_DEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -494,7 +494,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="1"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_NDEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="0"
@@ -581,7 +581,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="1"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_NDEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="0"
diff --git a/msvc64/runner.py b/msvc64/runner.py
index d81baf6..aa2b900 100644
--- a/msvc64/runner.py
+++ b/msvc64/runner.py
@@ -77,7 +77,6 @@ def runner(option):
if option:
directory = os.path.join(directory,option)
- print "directory = ",directory
global paths
paths=[]
diff --git a/msvc64/runner.txt b/msvc64/runner.txt
index 6fc9a45..bab04ac 100644
--- a/msvc64/runner.txt
+++ b/msvc64/runner.txt
@@ -1042,10 +1042,6 @@ KERNEL32.dll
KERNELBASE.dll
ntdll.dll
zlib1.dll
-KERNEL32.dll
-KERNELBASE.dll
-ntdll.dll
-zlib1d.dll
exiv2d.dll
KERNEL32.dll
KERNELBASE.dll
@@ -1074,10 +1070,6 @@ KERNEL32.dll
KERNELBASE.dll
ntdll.dll
zlib1.dll
-KERNEL32.dll
-KERNELBASE.dll
-ntdll.dll
-zlib1d.dll
exiv2.exe
exiv2d.dll
KERNEL32.dll
@@ -1122,4 +1114,3 @@ exiv2.exe
KERNEL32.dll
KERNELBASE.dll
ntdll.dll
-directory = C:\gnu.master\exiv2\msvc64in
diff --git a/msvc64/xmpsdk/xmpsdk.vcproj b/msvc64/xmpsdk/xmpsdk.vcproj
index 0e0e8a2..d751ca9 100644
--- a/msvc64/xmpsdk/xmpsdk.vcproj
+++ b/msvc64/xmpsdk/xmpsdk.vcproj
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;XML_STATIC"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -112,7 +112,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;XML_STATIC"
MinimalRebuild="false"
RuntimeLibrary="0"
@@ -176,7 +176,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_DebugDLL;_LIB;"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -242,7 +242,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
MinimalRebuild="false"
RuntimeLibrary="2"
@@ -307,7 +307,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;XML_STATIC"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -375,7 +375,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;XML_STATIC"
MinimalRebuild="false"
RuntimeLibrary="0"
@@ -440,7 +440,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;_DebugDLL;_LIB;"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -507,7 +507,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.5;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
MinimalRebuild="false"
RuntimeLibrary="2"
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list