[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=42ecc38

The following commit has been merged in the master branch:
commit 42ecc38e3524b9511a3f44e67aba830e9057906b
Author: danielkaneider <kaneiderdaniel at gmail.com>
Date:   Mon Nov 2 21:24:56 2015 +0000

    [msvc] updated build files
---
 contrib/build/msvc/build.cmd  | 29 ++++++++++++++++-------------
 contrib/build/msvc/setenv.cmd |  2 ++
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/contrib/build/msvc/build.cmd b/contrib/build/msvc/build.cmd
index 6133110..641bf50 100644
--- a/contrib/build/msvc/build.cmd
+++ b/contrib/build/msvc/build.cmd
@@ -19,6 +19,14 @@ 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,
+	echo.       but in a new empty folder!
+	echo.
+	goto error_end
+)
+
 ml64.exe > NUL
 IF ERRORLEVEL 1 (
 	set Platform=Win32
@@ -30,12 +38,7 @@ IF ERRORLEVEL 1 (
 	set CpuPlatform=intel64
 )
 
-IF EXIST ..\..\..\exiv2-trunk (
-	CD ..\..\..
-	call exiv2-trunkuild\msvc\setenv.cmd
-) ELSE (
-	call setenv.cmd
-)
+call setenv.cmd
 
 
 IF %Platform% EQU x64 (
@@ -250,19 +253,19 @@ IF NOT EXIST libssh-%SSH_VERSION%.build (
 
 
 
-IF NOT EXIST exiv2-trunk (
-    %CYGWIN_DIR%in\svn.exe co svn://dev.exiv2.org/svn/trunk exiv2-trunk
+IF NOT EXIST %EXIV_DIR% (
+    %CYGWIN_DIR%in\svn.exe co svn://dev.exiv2.org/svn/trunk %EXIV_DIR%
 ) ELSE (
-REM    %CYGWIN_DIR%in\svn.exe update exiv2-trunk
+REM    %CYGWIN_DIR%in\svn.exe update %EXIV_DIR%
 )
 
-IF NOT EXIST exiv2-trunk.build (
-    mkdir exiv2-trunk.build
+IF NOT EXIST %EXIV_DIR%.build (
+    mkdir %EXIV_DIR%.build
 )
     
-pushd exiv2-trunk.build
+pushd %EXIV_DIR%.build
 
-%CMAKE_DIR%in
-- 
exiv2 packaging