[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=7645823

The following commit has been merged in the master branch:
commit 76458232f82b720653c1e73c5ed8a038f6797c1e
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Nov 17 20:29:27 2015 +0000

    #1041.  Simplified building and linking curl etc.  curl etc aren't building (something to do with CMake).  Good day's progress.
---
 contrib/cmake/msvc/ReadMe.txt |  16 +++--
 contrib/cmake/msvc/build.cmd  | 156 ++++++++++++------------------------------
 contrib/cmake/msvc/setenv.cmd |   4 +-
 3 files changed, 55 insertions(+), 121 deletions(-)

diff --git a/contrib/cmake/msvc/ReadMe.txt b/contrib/cmake/msvc/ReadMe.txt
index 430ede7..e2b9f05 100755
--- a/contrib/cmake/msvc/ReadMe.txt
+++ b/contrib/cmake/msvc/ReadMe.txt
@@ -1,16 +1,20 @@
 contrib/cmake/msvc/ReadMe.txt
 -----------------------------
 
-These scripts are "in development".  They are derived from Daniels contrib/build scripts.
+These scripts are "in development".
+They are derived from Daniels contrib/build scripts.
 
-Rather that endlessly discuss these scripts with Daniel
+Status:
+2015-11-17 Added command-line parser
+           Building exiv2 with zlib and expat and exiv2
+           -webready = curl etc broken
+2015-11-16 The current status is "Work in Progress" = Not working yet.
+           These script are not for public use at the moment by Daniel or anybody else.
+
+Rather than endlessly discuss these scripts with Daniel
 I'm going to do parallel development and see how that goes.
 
 I'll discuss this with Daniel when I'm convinced my versions are working well.
 
-The current status is "Work in Progress" = Not working yet.
-These script are not for public use at the moment by Daniel or anybody else.
-
 Robin Mills
 robin at clanmills.com
-Updated: 2015-11-16
diff --git a/contrib/cmake/msvc/build.cmd b/contrib/cmake/msvc/build.cmd
index 879f2dd..247e56a 100755
--- a/contrib/cmake/msvc/build.cmd
+++ b/contrib/cmake/msvc/build.cmd
@@ -1,7 +1,7 @@
 @echo off
 setlocal enableextensions
 
-set "BUILD_DIR=%CD%"
+set "_BUILDDIR_=%CD%"
 
 :GETOPTS
 if /I "%1" == "--help" (
@@ -12,6 +12,7 @@ if /I "%1" == "--webready"        set "_WEBREADY_=1"
 if /I "%1" == "--config"          set "_CONFIG_=%2"& shift
 if /I "%1" == "--temp"            set "_TEMP_=%2"& shift
 if /I "%1" == "--generator"       set "_GENERATOR_=%2"& shift
+if /I "%1" == "--cygwin"          set "_CYGWIN_=%2"& shift
 if /I "%1" == "--exiv2"           set "_EXIV2_=%2"& shift
 if /I "%1" == "--verbose"         set "_VERBOSE_=1"
 if /I "%1" == "--dryrun"          set "_DRYRUN_=1"
@@ -156,49 +157,31 @@ IF ERRORLEVEL 1 (
 )
 
 rem  ----
-call:echo testing the cygwin_dir exists
-if NOT EXIST %CYGWIN_DIR% (
-	echo "*** CYGWIN_DIR %CYGWIN_DIR% does not exist ***"
+call:echo testing that _CYGWIN_ exists
+if NOT EXIST %_CYGWIN_% (
+	echo "*** _CYGWIN_ %_CYGWIN_% does not exist ***"
 	GOTO error_end
 )
 
 rem  ----
 call:echo testing cygwin tools are available
-SET 7Z_PATH=%CYGWIN_DIR%\lib\p7zipz.exe
-IF NOT EXIST %CYGWIN_DIR%\lib\p7zipz.exe GOTO cygwin_error
-IF NOT EXIST %CYGWIN_DIR%in
-- 
exiv2 packaging