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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:46:20 UTC 2017


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

The following commit has been merged in the master branch:
commit 78d658ea46e0dd6b2b6c4803f34283756b39a99d
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Mar 18 08:27:39 2016 +0000

    Documentation Update
---
 msvc2003/ReadMe.txt | 26 +++++++++++++-------------
 msvc2005/ReadMe.txt | 24 ++++++++++++------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/msvc2003/ReadMe.txt b/msvc2003/ReadMe.txt
index 0d507e0..f4e4143 100644
--- a/msvc2003/ReadMe.txt
+++ b/msvc2003/ReadMe.txt
@@ -21,9 +21,9 @@ All builds in msvc2003 are 32bit.
 1)  Build environments (solution files)
     exiv2.sln           - this builds the exiv2 libraries   (static and dynamic)
                           and the utility and test programs (exiv2.exe, exifprint.exe)
-                          
+
                           DEPENDS on zlib-1.2.3 and expat-2.0.1
-            
+
 
 How to build and test exiv2
 ----------------------------
@@ -39,10 +39,10 @@ How to build and test exiv2
     c:\gnu\expat-2.0.1    <---- vanilla expat
     c:\gnu\zlib-1.2.3     <---- vanilla zlib
     c:\gnu\exiv2          <---- this directory
-    
+
     You can download the libraries from http://clanmills.com/files/exiv2libs.zip (20mb)
     This archive includes libraries for use by msvc2003 and msvc2005.
-    
+
     If you unzip exiv2libs.zip into c:\exiv2libs, the batch file msvc2003/copylibs.zip
     will copy the files from c:\exiv2libs to the correct location.
 
@@ -51,7 +51,7 @@ How to build and test exiv2
     If you have copied expat-2.0.1 from the archive, you can skip this step.
 
     This is what I do:
-    a) Open expat-2.0.1\expat.dsw with DevStudio
+    a) Open expat-2.0.1\expat.dsw with Visual Studio
        This converts the expat-2.0.1 VC6 work space to DevStudio project files
        Say "Yes" to everything.
 
@@ -61,7 +61,7 @@ How to build and test exiv2
 
     Rattle roll.... less than a minute ...... rattle grrrrrrrr rump.
     ========== Build: 4 succeeded, 0 failed, 0 up-to-date, 0 skipped ==========
-    
+
 3)  Build zlib.  See zlib documents for details.
 
     If you have copied zlib-1.2.3 from the archive, you can skip this step.
@@ -74,7 +74,7 @@ How to build and test exiv2
     b) Build/Batch Build/Select
        { zlib } {DLL Debug | DLL Release | LIB Debug | LIB Release } (4 targets)
        Build
-      
+
     Rattle roll.... less than a minute ...... snap, crackle, pop (lots of warnings)
     ========== Build: 4 succeeded, 0 failed, 0 up-to-date, 0 skipped ==========
 
@@ -86,7 +86,7 @@ How to build and test exiv2
     At the end of building, you should see the beautiful output:
 
     ========== Build: 104 succeeded, 0 failed, 0 up-to-date, 0 skipped ==========
-    
+
     The build takes 6 minutes on my iMac with a 2.8GHz Duo Core Intel Processor
     and 4GBytes of Ram running XP/Pro SP3.
 
@@ -95,14 +95,14 @@ How to build and test exiv2
     +--------------------------------------------+
 
     The total build consumes 1.0GBytes of disk space.
-    There are 112 targets (4 expats, 4 zlibs and 108 exiv2 targets)
+    There are 116 targets (4 expats, 4 zlibs and 108 exiv2 targets)
     The pdb (debugging) files consume 300MB.
     The debug exiv2 static library alone (exiv2.lib) is 35MB
 
     A more modest build is to build exiv2
     { Debug | Release | DebugDLL | ReleaseDLL }
     This consumes: 400MB
-    
+
     A minimum build is to build exiv2/Release
     This consumes: 100MB
 
@@ -140,10 +140,10 @@ DebugDLL| ReleaseDLL = MD{d}  : link exiv2{d}.lib, xmpsdk.lib, libexpat.lib and
           Runtime DLLS        :      exiv2{d}.dll, libexpat.dll, zlib1{d}.dll and MSVC{R|P}{_0D.dll)
           _ = 7 for VS2003, 8 for VS2005 and 9 for VS2008
           The MSVC*.dll's are on most machines and a free download from Microsoft
-                        
+
 b) Static + MT build and work
 
-Debug | Release      = MT{d} :  link exiv2s{d}.lib, libexpatMT.lib, zlib{d}.lib xmpsdk.lib 
+Debug | Release      = MT{d} :  link exiv2s{d}.lib, libexpatMT.lib, zlib{d}.lib xmpsdk.lib
           Runtime DLLs       : none
 
 c) Static + MD will work (but not built)
@@ -196,7 +196,7 @@ The following warning and message are part of the build:
 2) zlib.lib(zutil.obj) : warning LNK4217: locally defined symbol _malloc imported in function _zcalloc
    I believe this is coming from zlib which uses the local (MD) c-runtime library.
    It's harmess (although frightening)
-   
+
 B) Partial Build errors
 -----------------------
 
diff --git a/msvc2005/ReadMe.txt b/msvc2005/ReadMe.txt
index 310a59e..af5cd0e 100644
--- a/msvc2005/ReadMe.txt
+++ b/msvc2005/ReadMe.txt
@@ -3,7 +3,7 @@ exiv2\msvc2005\ReadMe.txt
 
 +-----------------------------------------------------------+
 | msvc2005 builds 32bit and 64bit binaries                  |
-|          with Visual Studio 2005/8/10/12/13/14            |
+|          with Visual Studio 2005/8/10/12/13/15            |
 | msvc2003 builds 32bit binaries                            |
 |          with Visual Studio 2003/5/8                      |
 +-----------------------------------------------------------+
@@ -24,7 +24,7 @@ T A B L E  o f  C O N T E N T S
 1.4  Configuring build options (such as video and webready)
 1.5  Building with exiv2-webready.sln
 1.6  What is build
-1.7  Express editions of DevStudio (or 32 bit only builds, or 64 bit only builds)
+1.7  Express editions of Visual Studio (or 32 bit only builds, or 64 bit only builds)
 
 2    Design
 2.1  Architecture
@@ -53,7 +53,7 @@ T A B L E  o f  C O N T E N T S
      This has been tested with the "Pro" versions of VS 2005/08/10/12
      Some Express editions don't support 64 bit builds
      however it is  possible to build 32 bit libraries with "Express".
-     See notes below about DevStudio Express and building only Win32 or x64 builds
+     See notes below about Visual Studio Express and building only Win32 or x64 builds
 
      You need a DOS version of perl to build openssl.  Not the cygwin version.
      I use ActiveState Perl.
@@ -111,7 +111,7 @@ T A B L E  o f  C O N T E N T S
 
      If you haven't installed the x64 compiler, don't select the 64 bit configurations!
      You may have to hand-edit the vcproj and sln files to hide the 64 bit information.
-     See the notes about DevStudio Express for more information about this.
+     See the notes about Visual Studio Express for more information about this.
 
      Build time is 20 minutes on a 2.2GHz Duo Core and consumes 3.0 gBytes of disk space.
      Build time with webready is of the order of one hour as we add 5 libraries.
@@ -176,9 +176,9 @@ T A B L E  o f  C O N T E N T S
      The Debug|Release builds use static C runtime libraries
      This is discussed in exiv2\msvc2003\ReadMe.txt
 
-1.7  Express editions of DevStudio (or 32 bit only builds, or 64 bit only builds)
+1.7  Express editions of Visual Studio (or 32 bit only builds, or 64 bit only builds)
      Some Express Editions do not provide a 64 bit compiler.
-     You can build 32 bit libraries with DevStudio Express (with a little effort)
+     You can build 32 bit libraries with Visual Studio Express (with a little effort)
 
      Before loading the project, use the python script setbuild.py to select Win32:
 
@@ -200,7 +200,7 @@ T A B L E  o f  C O N T E N T S
      I personally don't recommend notepad for any purpose at all.
      I use TextPad http://www.textpad.com/  Notepad++ is also good.
 
-     DevStudio Express 2010 does not have the "Batch Build" feature.
+     Visual Studio Express 2010 does not have the "Batch Build" feature.
      Select "exiv2" right-click "Set as Startup Project" and
      Select Platform="Win32" Configuration="Debug|DebugDLL|Release|ReleaseDLL"  Build.
      Build the Configurations you need.  Build time is about 2 minutes/Configuration.
@@ -210,7 +210,7 @@ T A B L E  o f  C O N T E N T S
 
 2    Design
 
-     expat and zlib1.2.5 (and earlier) do not provide 64 bit builds for DevStudio.
+     expat and zlib1.2.5 (and earlier) do not provide 64 bit builds for Visual Studio.
 
      The projects provided for zlib1.2.7 support 64 bit builds, however it didn't
      work cleanly for me.  They use different projects for VC9 and VC10.
@@ -227,10 +227,10 @@ T A B L E  o f  C O N T E N T S
      The names expat-2.1.0 and zlib-1.2.7 are fixed (and used by the .vcproj files)
 
      zlib and expat
-     exiv2\msvc2005\zlib\zlib.vcproj                          DevStudio files
+     exiv2\msvc2005\zlib\zlib.vcproj                          Visual Studio files
      ..\..\..\zlib                                            Source code
 
-     exiv2\msvc2005\expat\expat.vcproj                        DevStudio files
+     exiv2\msvc2005\expat\expat.vcproj                        Visual Studio files
      ..\..\..\expat                                           Source code
 
 2.1  Architecture
@@ -253,13 +253,13 @@ T A B L E  o f  C O N T E N T S
      1) msvc2005 supports 64 bit and 32 bit builds
      2) msvc2005 provides projects to build expat, zlib, curl, libssh and openssl
      3) msvc2005 is designed to accomodate new versions of expat and zlib when they become available.
-     4) msvc2005 supports DevStudio 2005 and later (no support for 2003)
+     4) msvc2005 supports Visual Studio 2005 and later (no support for 2003)
      5) msvc2005 does not require you to build 'vanilla' expat and zlib projects in advance
      6) msvc2005 does not support the organize application
      7) msvc2005 supports building with zlib1.2.7 or 1.2.8
      8) msvc2005 supports building with expat2.1.0 or expat2.0.1
 
-     msvc2003 will continue to be supported for 32 bit builds using DevStudio 2003/05/08,
+     msvc2003 will continue to be supported for 32 bit builds using Visual Studio 2003/05/08,
      however there is no plan to enhance or develop msvc2003 going forward.
 
 3    Batch builds and tests

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list