[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=675ae20

The following commit has been merged in the master branch:
commit 675ae20b355696484ccddb1a742424b1023c0a48
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Nov 16 20:52:12 2015 +0000

    #1041.  Correction to r4021.  Reinstating Daniel's original code.  Apologies to Daniel.
---
 contrib/build/msvc/build.cmd  | 108 ++++++++++++++++--------------------------
 contrib/build/msvc/setenv.cmd |  43 ++++++-----------
 2 files changed, 55 insertions(+), 96 deletions(-)

diff --git a/contrib/build/msvc/build.cmd b/contrib/build/msvc/build.cmd
index 5b0a7cf..7285a8f 100644
--- a/contrib/build/msvc/build.cmd
+++ b/contrib/build/msvc/build.cmd
@@ -2,9 +2,10 @@
 SETLOCAL
 
 REM ---------------------------------------------------
-REM -- Created by danielkaneider
+REM -- Created by danielkaneider for the exiv2 project
 REM ---------------------------------------------------
 
+
 rem  https://github.com/madler/zlib/commits
 SET ZLIB_COMMIT_LONG=50893291621658f355bc5b4d450a8d06a563053d
 
@@ -17,6 +18,7 @@ SET CURL_COMMIT_LONG=dd39a671019d713bd077be9eed511c2dc6013598
 rem http://www.npcglib.org/~stathis/blog/precompiled-openssl/
 SET OPENSSL_VERSION=openssl-1.0.2d
 
+
 IF EXIST ..\msvc (
 	echo.
 	echo.ERROR: This file should NOT be executed within the exiv2 source directory,
@@ -25,62 +27,31 @@ IF EXIST ..\msvc (
 	goto error_end
 )
 
-echo testing compiler
-cl > NUL
+ml64.exe > NUL
 IF ERRORLEVEL 1 (
-	echo "*** ensure cl is not on path.  Run vcvars32.bat or vcvarsall.bat ***"
-	GOTO error_end
-)
-
-echo testing VSINSTALLDIR
-IF NOT EXIST "%VSINSTALLDIR%" (
-	echo "VSINSTALLDIR %VSINSTALLDIR% does not exist.  Ruv vcvars32.bat or vcvarsall.bat ***"
-	GOTO error_end
-)
-
-echo testing architecture
-if "%PROCESSOR_ARCHITECTURE%" EQU "AMD64" ( 
-	set Platform=x64
-	set RawPlatform=x64
-	set CpuPlatform=intel64
-) ELSE (
 	set Platform=Win32
 	set RawPlatform=x86
 	set CpuPlatform=ia32
+) ELSE (
+	set Platform=x64
+	set RawPlatform=x64
+	set CpuPlatform=intel64
 )
 
-echo testing svn is on path
-svn --version > NUL
-IF ERRORLEVEL 1 (
-	echo "*** please ensure SVN.exe is on the PATH ***"
-	GOTO error_end
-)
-
-echo testing cmake is on path
-cmake --version > NUL
-IF ERRORLEVEL 1 (
-	echo "*** please ensure cmake.exe is on the PATH ***"
-	GOTO error_end
-)
-
-echo calling setenv
 call setenv.cmd
-IF ERRORLEVEL 1 (
-	echo "*** setenv.cmd has failed ***"
-	GOTO error_end
-)
 
-echo testing the cygwin_dir exists
-if NOT EXIST %CYGWIN_DIR% (
-	echo "*** CYGWIN_DIR %CYGWIN_DIR% does not exist ***"
-	GOTO error_end
-)
 
 IF %Platform% EQU x64 (
 	set VS_CMAKE=%VS_CMAKE% Win64
 )
 
-echo testing cygwin tools are available
+IF NOT EXIST %CMAKE_EXE% (
+	echo.
+	echo.ERROR: CMake not found: %CMAKE_EXE%
+	echo.
+	goto error_end
+)
+
 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