[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:08 UTC 2017


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

The following commit has been merged in the master branch:
commit 9e9898025a8afa71295b77003d97630b68f157bb
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Dec 12 16:00:49 2010 +0000

    msvc64: Updated to build with VS2005 and later.  Changed expat201 and zlib123 to expat and zlib. Linking error fixed for exiv2lib\Win32\DebugDLL
---
 msvc/README-MSVC.txt                        | 16 ++++++-
 msvc64/ReadMe.txt                           | 24 ++++++-----
 msvc64/addmoddel/addmoddel.vcproj           |  2 +-
 msvc64/convert-test/convert-test.vcproj     |  2 +-
 msvc64/editem.bat                           | 31 ++++++++++++++
 msvc64/exifcomment/exifcomment.vcproj       |  2 +-
 msvc64/exifdata-test/exifdata-test.vcproj   |  2 +-
 msvc64/exifprint/exifprint.vcproj           |  2 +-
 msvc64/exiv2.sln                            |  8 ++--
 msvc64/exiv2/exiv2.vcproj                   | 35 ++++++++--------
 msvc64/exiv2lib/exiv2lib.vcproj             | 65 +++++++++++++++--------------
 msvc64/exivsimple/exivsimple.vcproj         |  2 +-
 msvc64/{expat201 => expat}/expat.sln        |  4 +-
 msvc64/{expat201 => expat}/expat.vcproj     |  2 +-
 msvc64/iotest/iotest.vcproj                 |  2 +-
 msvc64/iptceasy/iptceasy.vcproj             |  2 +-
 msvc64/iptcprint/iptcprint.vcproj           |  2 +-
 msvc64/iptctest/iptctest.vcproj             |  2 +-
 msvc64/largeiptc-test/largeiptc-test.vcproj |  2 +-
 msvc64/metacopy/metacopy.vcproj             |  2 +-
 msvc64/mmap-test/mmap-test.vcproj           |  2 +-
 msvc64/prevtest/prevtest.vcproj             |  2 +-
 msvc64/stringto-test/stringto-test.vcproj   |  2 +-
 msvc64/taglist/taglist.vcproj               |  2 +-
 msvc64/tiff-test/tiff-test.vcproj           |  2 +-
 msvc64/utiltest/utiltest.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 +-
 msvc64/{zlib123 => zlib}/zlib.sln           |  4 +-
 msvc64/{zlib123 => zlib}/zlib.vcproj        |  2 +-
 34 files changed, 143 insertions(+), 96 deletions(-)

diff --git a/msvc/README-MSVC.txt b/msvc/README-MSVC.txt
index 0d4e1c2..6f071fc 100644
--- a/msvc/README-MSVC.txt
+++ b/msvc/README-MSVC.txt
@@ -1,5 +1,17 @@
-Notes about msvc build of exiv2
--------------------------------
+Notes about msvc 32 bit build of exiv2
+--------------------------------------
+
++------------------------------------------------------+
+| This version of the build environment builds 32 bit  |
+| builds of exiv2 for DevStudio 2003 (VS7.1) and later |
+|                                                      |
+| Please use the project files in msvc64 for 32 and 64 |
+| bit builds in VS2005 and later.                      |
+| The organize application is not supported in msvc64  |
+| (however it can be added if requested)               |
+|                                                      |
+| Please see msvc64\ReadMe.txt for more information    |
++------------------------------------------------------+
 
 Tools
 -----
diff --git a/msvc64/ReadMe.txt b/msvc64/ReadMe.txt
index 71d8639..3b68da2 100644
--- a/msvc64/ReadMe.txt
+++ b/msvc64/ReadMe.txt
@@ -1,11 +1,14 @@
 exiv2\msvc64\ReadMe.txt
------------------------
+--------------------------
 
-Updated: 2010-12-07
+Updated: 2010-12-12
 
-
-This is "work in progress".  At this time, you can build the libraries and the exiv2.exe application.
-You cannot build the test applications such as exifprint.exe
+Work in progress.
+1) Working.
+   Build 32 bit and 64bit builds of exiv2 (and libraries exiv2lib,expat,zlib,xmpsdk) in 32bit and 64bits.
+2) TODO:
+   Test Applications (exifprint etc)
+   Test build with VS2008 and VS2010
 
 Robin Mills
 http://clanmills.com
@@ -40,15 +43,15 @@ c:\gnu>dir
 c:\gnu>
 
 zlib and expat
-msvc64\zlib123\zlib.{sln|vcproj}	   DevStudio Solution and Project files
+msvc64\zlib\zlib.{sln|vcproj}	   DevStudio Solution and Project files
 ..\..\..\zlib-1.2.3\                   Source code
 
-msvc64\expat201\expat.sln expat.vcproj DevStudio Solution and Project files
+msvc64\expat\expat.sln expat.vcproj DevStudio Solution and Project files
 ..\..\..\expat-2.0.1\                  Source code
 
 1.1  Architecture
      There are directories for every component:
-     The libraries: zlib123, expat201, xmpsdk, exiv2lib
+     The libraries: zlib, expat, xmpsdk, exiv2lib
      Applications:  exiv2, exifprint etc......
      
      For each component, there are three build directories:
@@ -57,7 +60,7 @@ msvc64\expat201\expat.sln expat.vcproj DevStudio Solution and Project files
      exiv2lib\x64\{Debug|Release|DebugDLL|ReleaseDLL}       64 bit builds
      
 1.2  Changing the version of expat/zlib/xmpsdk
-     The directory expat is a copy of expat201, zlib is a copy of zlib123
+     The directory expat is a copy of expat, zlib is a copy of zlib
      
      As new versions of the libraries become available (eg zlib125) it will be added.
      To build exiv2 with zlib125, the directory zlib125 should be copied to zlib.
@@ -82,8 +85,7 @@ msvc64\expat201\expat.sln expat.vcproj DevStudio Solution and Project files
 	    Copyright (C) 2004 Cosmin Truta.
 	    For conditions of distribution and use, see copyright notice in zlib.h.
 	
-	    And was obtained from:  http://www.achacha.org/vc2008_zlib123/
-	
+	    And was obtained from:  http://www.achacha.org/vc2008_zlib/
 
      expat 64 bit build
      http://www.start64.com/index.php?option=com_content&task=view&id=3461&Itemid=114
diff --git a/msvc64/addmoddel/addmoddel.vcproj b/msvc64/addmoddel/addmoddel.vcproj
index 66eb976..b46a892 100644
--- a/msvc64/addmoddel/addmoddel.vcproj
+++ b/msvc64/addmoddel/addmoddel.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="8.00"
 	Name="addmoddel"
 	ProjectGUID="{271E59C4-81F9-4231-85D3-E7DDB2E2BC08}"
 	RootNamespace="addmoddel"
diff --git a/msvc64/convert-test/convert-test.vcproj b/msvc64/convert-test/convert-test.vcproj
index 4e6a595..24fd75a 100644
--- a/msvc64/convert-test/convert-test.vcproj
+++ b/msvc64/convert-test/convert-test.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="8.00"
 	Name="convert-test"
 	ProjectGUID="{610E69BF-9FB7-4A63-AFB5-88C2BA4BE6C1}"
 	RootNamespace="convert-test"
diff --git a/msvc64/editem.bat b/msvc64/editem.bat
new file mode 100644
index 0000000..58a577a
--- /dev/null
+++ b/msvc64/editem.bat
@@ -0,0 +1,31 @@
+ce addmoddelddmoddel.vcproj
+ce convert-test
-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list