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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b091dceb593f0c03959c513b73387b1742898d2b
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Jan 3 23:05:38 2011 +0000

    msvc64: adding runner.py and associated files.
---
 msvc64/ReadMe.txt                     |   36 +-
 msvc64/buildall.bat                   |   22 +
 msvc64/editem.bat                     |   34 -
 msvc64/runner.txt                     | 1125 +++++++++++++++++++++++++++++++++
 {msvc => msvc64/testimages}/test.jpg  |  Bin
 {msvc => msvc64/testimages}/test.png  |  Bin
 {msvc => msvc64/testimages}/test.tiff |  Bin
 msvc64/tools/bin/depends32.exe        |  Bin 0 -> 68608 bytes
 msvc64/tools/bin/depends64.exe        |  Bin 0 -> 75776 bytes
 9 files changed, 1178 insertions(+), 39 deletions(-)

diff --git a/msvc64/ReadMe.txt b/msvc64/ReadMe.txt
index aec6bb1..dd51d80 100644
--- a/msvc64/ReadMe.txt
+++ b/msvc64/ReadMe.txt
@@ -1,7 +1,7 @@
 exiv2\msvc64\ReadMe.txt
 -----------------------
 
-Updated: 2011-01-02 
+Updated: 2011-01-03 
 This is work in progress.
 However this is sufficiently robust to be in current use by a commercial licensee of exiv2.
 
@@ -9,13 +9,12 @@ However this is sufficiently robust to be in current use by a commercial license
      Build 32bit and 64bit builds of exiv2.exe (and libraries exiv2lib,expat,zlib,xmpsdk).
      Builds with VS2005, 2008 and 2010.
      Supports zlib-1.2.5 or zlib-1.2.3
-     Notes added about building with VS2010 Express
      setbuild.py "doctors" the project files for DevStudio Express
+     runner.py build verification script (and binaries/code for depends{32|64}.exe)
 
 2)   TODO (in priority order)
-     a) Provide a "runner.bat" build verification test script
-     b) Build sample/test applications (exifprint etc)
-     c) Use .vsprop files to hold "common" project settings
+     a) Build sample/test applications (exifprint etc)
+     b) Use .vsprop files to hold "common" project settings
    
      Assistance appreciated if you wish to become involved.
 
@@ -42,6 +41,10 @@ T A B L E  o f  C O N T E N T S
 3    Acknowledgment of prior work
 3.1  Differences between inherited project and the exiv2 projects
 
+4    Batch builds and tests
+4.1  buildall.bat
+4.2  runner.py
+
 ## End Table of Contents End ##
 ####
 
@@ -132,6 +135,10 @@ T A B L E  o f  C O N T E N T S
      Select Platform="Win32" Configuration="Debug|DebugDLL|Release|ReleaseDLL"  Build.
      Build the Configurations you need.  Build time is about 2 minutes/Configuration.
      
+     To remove the "memory" of old configurations:
+     setbuild.py all && del/s *.orig
+     (Run this before doing an svn update of the code)
+     
 2    Design
 
      expat and zlib do not provide 64bit builds for DevStudio,
@@ -203,5 +210,24 @@ T A B L E  o f  C O N T E N T S
 3.1  Differences between inherited projects and the exiv2 projects
      There is no compatiblity.
 
+4    Batch builds and tests
+	 
+4.1  buildall.bat
+     This is a real "throw away" kind of script.
+     You will have to run vcvars32.bat for the compiler you intend to use to ensure devenv is on your path.
+
+4.2  runner.py
+	 runner.py [Win32|x64|all]
+	 
+	 This script runs some basic "sanity" checks on the build.  You should compare the output of runner.py
+	 with the reference output runner.txt.  diff/windiff/winmergeu - or whatever your favorite diff tool.
+	 
+	 python runner.py all > new.txt
+	 winmergeu.exe new.txt runner.txt
+	 
+	 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/buildall.bat b/msvc64/buildall.bat
new file mode 100644
index 0000000..19fc334
--- /dev/null
+++ b/msvc64/buildall.bat
@@ -0,0 +1,22 @@
+ at echo off
+
+rem ##
+rem buildall [/rebuild]
+
+setlocal
+set "ACTION=%1%"
+if NOT DEFINED ACTION set "ACTION=/build"
+
+devenv exiv2.sln %ACTION% "Debug|Win32" 
+devenv exiv2.sln %ACTION% "DebugDLL|Win32" 
+devenv exiv2.sln %ACTION% "Release|Win32" 
+devenv exiv2.sln %ACTION% "ReleaseDLL|Win32" 
+devenv exiv2.sln %ACTION% "Debug|x64" 
+devenv exiv2.sln %ACTION% "DebugDLL|x64" 
+devenv exiv2.sln %ACTION% "Release|x64" 
+devenv exiv2.sln %ACTION% "ReleaseDLL|x64" 
+
+endlocal
+
+rem That's all Folks!
+rem ##
diff --git a/msvc64/editem.bat b/msvc64/editem.bat
deleted file mode 100644
index ec6ef48..0000000
--- a/msvc64/editem.bat
+++ /dev/null
@@ -1,34 +0,0 @@
- at echo off
-rem edit the project files
-rem
-rem ce addmoddelddmoddel.vcproj
-rem ce convert-test
-- 
exiv2 packaging