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

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


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

The following commit has been merged in the master branch:
commit 47a144580d5fcf7268433df9ec30616f6524fed5
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Feb 3 03:59:20 2009 +0000

    Time for an update before investigating adding Brad's "organizer" to the mix.
---
 msvc/README-MSVC.txt              | 179 +++++++++++-----
 msvc/depends1.exe                 | Bin 9216 -> 0 bytes
 msvc/zlib4exiv2/zlib4exiv2.vcproj | 427 --------------------------------------
 3 files changed, 127 insertions(+), 479 deletions(-)

diff --git a/msvc/README-MSVC.txt b/msvc/README-MSVC.txt
index 1f4f195..4c706a1 100644
--- a/msvc/README-MSVC.txt
+++ b/msvc/README-MSVC.txt
@@ -1,6 +1,9 @@
 Notes about msvc build of exiv2
 -------------------------------
 
+Andreas:
+I've put status notes at the bottom which you'll probably want to delete when you commit this file.
+
 Tools
 -----
 
@@ -12,16 +15,16 @@ How to build and test
 ---------------------
 
 1)  Dependancies
-    You need expat-2.0.1 and zlib-1.2.3 which you can download from
+    You need expat-2.0.1 AND zlib-1.2.3 which you can download from
     http://expat.sourceforge.net/ and http://zlib.net/, respectively.
-    expat-2.0.1, zlib-1.2.3 and exiv2 should be in the same directory.
+    expat-2.0.1, zlib and exiv2 should be in the same directory
 
     I usually use c:\gnu, however the name 'c:\gnu' does not matter
     nor does it have to be a topmost directory.
 
     c:\gnu\expat-2.0.1    <---- vanilla expat
     c:\gnu\zlib-1.2.3     <---- vanilla zlib
-    c:\gnu\exiv2          <---- exiv2 top level directory
+    c:\gnu\exiv2          <---- this directory
 
 2)  Build expat. See expat documents for details.
     This is what I do:
@@ -60,8 +63,8 @@ How to build and test
 
     ========== Build: 92 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. (VS 2005 and VS 2008)
+    The build takes 6 minutes on my iMac with a 2.8GHz Duo Core Intel Processor
+    and 4GBytes of Ram. (VS 2005 and VS 2008)
 
     And about 16 minutes on my elderly 2003 laptop (VS 2003 .Net)
     (DeLL Inspiron 8500 2.2GHz Pentium and 1.25GBytes of Ram)
@@ -80,12 +83,12 @@ How to build and test
     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
 
 5)  Test from the Command Line (cmd.exe):
-
+    
     cd exiv2\msvc
     C:\gnu\exiv2\msvc>runner.bat > new.txt
     exiv2.exe: An action must be specified
@@ -96,8 +99,7 @@ How to build and test
     C:\gnu\exiv2\msvc>diff.exe   runner.txt new.txt
     --- no differences should be reported --
     
-    The test takes less than 1 minute and runs 200 different test
-    programs.
+    The test takes less than 1 minute and runs 200 different test programs.
     
 Where are the libraries and executables?
 ----------------------------------------
@@ -117,43 +119,34 @@ DLL targets link dynamically
 - exiv2.exe requires libexpat.dll, exiv2.dll and zlib1.dll (zlib1d.dll for debug)
 - the objects use the dynamic c runtime dlls (MSVCR70.dll and friends)
 
+
 Linking Applications with the exiv2 libraries
 ---------------------------------------------
 
-The following 'flavors' have been built:
+The following 'flavors' have been build:
 
 a) DLLs + MD build and work
 
-DebugDLL | ReleaseDLL = MD{d} : link exiv2.lib, xmpsdk.lib, libexpat.lib
-                                and zlib1{d}.lib
-          Runtime DLLS        : exiv2.dll, libexpat.dll, zlib1{d}.dll
-                                and MSVC{R|P}{_0D.dll)
-                                _ = 7 for VS2003, 8 for VS2005 and 9 for VS2008
+DebugDLL| ReleaseDLL = MD{d}  : link exiv2.lib, xmpsdk.lib, libexpat.lib and zlib1{d}.lib
+          Runtime DLLS        :      exiv2.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 exiv2.lib, libexpatMT.lib, zlib{d}.lib
-                               xmpsdk.lib 
+Debug | Release      = MT{d} :  link exiv2.lib, libexpatMT.lib, zlib{d}.lib xmpsdk.lib 
           Runtime DLLs       : none
 
 c) Static + MD will work (but not built)
 
 During the development of the build environment, this was working.
-However it was dropped from the release because expat-2.0.1 does not
-support an MD build.
+However it was dropped from the release because expat-2.0.1 does not support an MD build.
 
-When you choose to link your application with the exiv2 library, can
-choose any of the 3 configurations.  Please use Google to find
-additional advice about which flavor is best for your needs.
+When you choose to link your application with the exiv2 library, can choose any of the 3 configurations.  Please use Google to find additional advice about which flavor is best for your needs.
 
 d) DLLs + MT WILL NOT FUNCTION even if you build it
 
-Do not build DLLs + MT.  Exiv2.dll exports STL template objects which
-will crash when linked with the MT run-time.  This is because
-Exiv2.dll is linked with it's own (static) c-runtime library.
-Exiv2.exe is linked with a different c-runtime library.  The two
-cannot co-exist.
+Do not build DLLs + MT.  Exiv2.dll exports STL template objects which will crash when linked with the MT run-time.  This is because Exiv2.dll is linked with it's own (static) c-runtime library.  Exiv2.exe is linked with a different c-runtime library.  The two cannot co-exist.
 
 This is not a bug.  There is no workaround.
 
@@ -176,8 +169,7 @@ http://clanmills.com
 
 APPENDIX
 
-The following topics are documented for additional information about
-the status of the build.
+The following topics are documented for additional information about the status of the build.
 
 A) Build warning messages
 B) Partial Build errors
@@ -188,41 +180,124 @@ A) Build warning messages
 
 The following warning and message are part of the build:
 
-1) exiv2.lib(xmlparse.obj) : warning LNK4075: ignoring
-   '/EDITANDCONTINUE' due to '/INCREMENTAL:NO' specification To
-   eliminate this message, you will have to modify project settings in
-   expat-2.0.1 and rebuild expat.
-
-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 harmless
-   (although frightening)
+1) exiv2.lib(xmlparse.obj) : warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/INCREMENTAL:NO' specification
+   To eliminate this message, you will have to modify project settings in expat-2.0.1 and rebuild expat.
 
+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
 -----------------------
 
-Andreas assures me that if you cannot build some targets, e.g.,
-exifprint/ReleaseDLL on a clean VC71 machine.  I haven't been able to
-reproduce this.  Please drop me an email if you find any of those.
-I'm cross-eyed building different flavors of this on different version
-of DevStudio.
+Andreas assures me that if you cannot build some targets, eg exifprint/ReleaseDLL on a clean VC71 machine.  I havne't been able to reproduced this.  Please drop me an email if you find any of those.  I'm cross-eyed building different flavors of this on different version of DevStudio.
 
 C) Debugging exiv2 library code
 -------------------------------
 
-You may wish to debug the exiv2 library code using one of the test
-utilities.  Examples: exiv2.exe and exifprint.exe.  You'll find this a
-little frustrating because the exiv2.sln file contains all the test
-programs.  When you change the library code, DevStudio will relink all
-20 test programs.  To avoid this frustration, unload the project
-files which you are not using.  For example, if you are debugging
-exiv2.exe, you only require the following projects to be loaded:
+You may wish to debug the exiv2 library code using one of the test utilities.  Examples: exiv2.exe and exifprint.exe.  You'll find this a little frustrating because the exiv2.sln file contains all the test programs.  When you change the library code, DevStudio will relink all 20 test programs.  To avoid this frustruation, unload the project files which you are no using.  For example, if you are debugging exiv2.exe, you only require the following projects to be loaded:
 
 xmpsdk
 exiv2lib
 exiv2
 
-(when exiting DevStudio, say "No" when it asks you if you wish to save
-changes to exiv2.sln)
+(when exiting DevStudio, say "No" when it asks you if you wish to save changes to exiv2.sln)
+
+
+------------------------------------------------------
+--- STATUS INFORMATION for ANDREAS -------------------
+------------------------------------------------------
+
+Code base: trunk/1657 
+Sunday 20081109 22:30PST
+
+Changes since 10081101 22:30PST
+
+ 1 Removed zlib4exiv2 project
+ 2 Fixed the crashing DLL builds
+ 3 Documented all build warnings and messages
+ 4 Added notes to the Appendix.
+ 6 replaced test.png with file with exif data
+ 7 runner.bat is much longer
+ 8 replaced depends1.exe with depends2.exe
+   The new version never reports anything to do with MSVC*.dll
+   This was done to avoid having different versions of runner.txt for each version of VS.
+ 9 Build is using less disk space (down from 1.2G to 1.0G)
+10 Fixer linking errors during Debug|Release link of exiv2lib with VC7.1
+
+Priorities for 0.18final
+------------------------
+
+1 More testing of partial builds
+2 Make the test program longer and deeper
+3 Build and test pyexiv2 and exiv2net
+- We're not going to distribute pyexiv2 or exiv2net
+- I'd like to test that those work correctly with our builds
+
+Changes since 20081101 17.00PST
+-------------------------------
+
+1 Don't copy src\*_int.hpp to msvc/include/exiv2 directory
+
+2 Test Builds            2008 2005 2003
+  Batch Build All        Y    Y    Y
+
+3 Partial builds: select target/config + build (clean build)
+  exifprint Debug        Y    Y    Y+W
+            DebugDLL     Y    Y    Y
+            Release      Y    Y    Y+W
+            ReleaseDLL   Y    Y    Y
+            
+  exiv2     Debug        Y    Y    Y+W
+            DebugDLL     Y    Y
+            Release      Y    Y    Y+W
+            ReleaseDLL   Y    Y    Y
+
+  W = Warnings about multiple-defined externals
+      MSVC is linking expat twice.
+
+Changes since 20081030
+----------------------
+
+1) zlib directory
+   zlib now lives in c:\gnu\zlib-1.2.3
+   
+2) Removed unnecessary copying of exv_msvc.h to msvc/include directory
+  
+3) Investigated linker /EDITANDCONTINUE warning
+   For example:  exiv2.lib(xmlparse.obj) : warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/INCREMENTAL:NO' specification
+   Cannot fix.  It's coming from expat/expat-static Debug builds
+   Fix is to modify expat/expat-static.vcproj Compiler/Generaral/Debug Information ZI (not Zi)
+
+4) Investigated what happens when expat isn't built!
+   - documented below.
+
+5) Tested more 'partial' target builds
+   Tested:
+   { exiv2   |exiv2print  }
+   { Debug   | Release    | DebugDLL | ReleaseDLL } Manual build (F7)
+   { Debug   | Release    | DebugDLL | ReleaseDLL } using Batch/Build
+   { VS 2003 | 2005       | 2008 }
+   
+   2*3*8 = 48 partial builds
+   (and of course 3 full builds)
+   
+   VC71 (VS 2003) in not good at dependancies.  On a 'clean' directory:
+   If I select exifprint+Debug Build (or Release or DebugDLL or ReleaseDLL) it builds successfully
+   If I use Batch Build/ and select exifprint { Debug etc } all 4 targets fail to build!
+   VC71 is not attempting to build the dependant sub projects.
+   
+   VC8 and VC9 (VS 2005 and 2008) are working fine.  Both report
+   ========== Build: 14 succeeded, 0 failed, 0 up-to-date, 0 skipped ==========   
+   
+   I think the Batch/Build feature in VC71 simply builds (It omits dependancy analysis).
+   I don't intend to do any more work on this on VC71.
+                             
+6) I did some debugging
+   exiv2.exe and exifprint.exe (Debug/DebugDLL on VS/2005)
+   
+   I was surprised when all .exe's relinked when I changed library code (not only the target .exe)
+   I'll have to investigate this.  I'll fix this when I investigate the crashing DLLs
   
 -- end --
diff --git a/msvc/depends1.exe b/msvc/depends1.exe
deleted file mode 100644
index 434b68d..0000000
Binary files a/msvc/depends1.exe and /dev/null differ
diff --git a/msvc/zlib4exiv2/zlib4exiv2.vcproj b/msvc/zlib4exiv2/zlib4exiv2.vcproj
deleted file mode 100644
index 8ae7313..0000000
--- a/msvc/zlib4exiv2/zlib4exiv2.vcproj
+++ /dev/null
@@ -1,427 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="zlib4exiv2"
-	ProjectGUID="{63176FFE-AD2C-421A-856B-5740D2CCB76C}"
-	RootNamespace="zlib4exiv2"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\zlib4exiv2.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\zlib4exiv2.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="DebugDLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
-				ImportLibrary="$(OutDir)\$(TargetName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
-				ImportLibrary="$(OutDir)\$(TargetName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\zlib-1.2.3dler32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\zlib-1.2.3
-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list