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

The following commit has been merged in the master branch:
commit bd9a52a9279b6364cd39c5c3dc59c555ef3659eb
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Dec 24 09:53:32 2015 +0000

    #1109.  Build and test Visual Studio 2005/2008/2010/2012/2013/2015 x64/Win32
---
 contrib/buildserver/cmake_daily.sh | 15 ++++++++-------
 contrib/buildserver/test_daily.sh  | 33 +++++++++++++++++++--------------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/contrib/buildserver/cmake_daily.sh b/contrib/buildserver/cmake_daily.sh
index 767e596..d38741c 100755
--- a/contrib/buildserver/cmake_daily.sh
+++ b/contrib/buildserver/cmake_daily.sh
@@ -7,10 +7,10 @@ source $(find . -name buildserver.library)
 
 ##
 # configure the build (only used for msvc builds)
-arch=x64
-mode=dll
-config=Release
-vs=2013
+#arch=x64
+#mode=dll
+#config=Release
+#vs=2013
 
 result=0
 
@@ -52,13 +52,14 @@ echo "---- build = $build ------"
         (
           PATH="$msvc:/cygdrive/c/Program Files/csvn/bin:/cygdrive/c/Program Files (x86)/WANdisco/Subversion/csvn/bin:/cygdrive/c/Program Files/7-zip:/cygdrive/c/Program Files (x86)/cmake/bin:$PATH:/cygdrive/c/Windows/System32"
           # cmd.exe /c "cd $build && vcvars $vs $arch && cmakeBuild --rebuild --exiv2=$exiv2 $*"
-          for ARCH in x64 win32; do #always build x64 (used by test suite)
-          	for VS in 2005 2013; do #always build 2013 (used by test suite)
-              cmd.exe /c "cd $build && vcvars $VS $ARCH && cmakeBuild --rebuild --exiv2=$exiv2 $*"
+          for ARCH in x64 Win32; do
+          	for VS in 2005 2008 2010 2012 2013 2015; do
+              cmd.exe /c "cd $build && vcvars $VS $ARCH && cmakeBuild --rebuild --exiv2=$exiv2 --test $*"
             done
           done
           result=$?
           cp     $msvc/vcvars.bat $build/dist # required by test_daily.sh
+          if [ -e $build/dist/cygwin ]; then rm -rf $build/dist/cygwin ; fi
         )
     ;;
 
diff --git a/contrib/buildserver/test_daily.sh b/contrib/buildserver/test_daily.sh
index f665b43..3b3276c 100755
--- a/contrib/buildserver/test_daily.sh
+++ b/contrib/buildserver/test_daily.sh
@@ -77,20 +77,25 @@ case $PLATFORM in
     ;;
 
     msvc)
-        # test the delivered exiv2
-        PATH="$PWD/2013/x64/dll/Release/bin:$PATH"
-        exiv2 -vV | grep $grep_args
-
-        # compile, link and test the sample code
-        (
-            export PATH="/cygdrive/c/Windows/System32:$PATH"
-            echo ''
-		    cmd /c 'vcvars.bat 2013 64 && cl /EHsc -I2013\x64\dll\Release\include /MD samples\exifprint.cpp /link 2013\x64\dll\Release\lib\exiv2.lib'
-            ls -alt exifprint.exe
-            echo ''
-        )
-
-        ./exifprint.exe --version     | grep $grep_args
+        for vs in 2005 2008 2010 2012 2013 2015; do
+          for arch in x64 Win32; do
+            if [ -e "$PWD/$vs/$arch/dll/Release/bin/exiv2.exe" ] ; then (
+              # test the delivered exiv2
+              PATH="$PWD/2013/x64/dll/Release/bin:$PATH"
+              exiv2 -vV | grep $grep_args
+
+              # compile, link and test the sample code
+              (
+                export PATH="/cygdrive/c/Windows/System32:$PATH"
+                echo ''
+		        cmd /c 'vcvars.bat 2013 64 && cl /EHsc -I2013\x64\dll\Release\include /MD samples\exifprint.cpp /link 2013\x64\dll\Release\lib\exiv2.lib'
+                ls -alt exifprint.exe
+                echo ''
+              )
+              ./exifprint.exe --version     | grep $grep_args
+            ) fi
+          done
+        done
     ;;
 
     *) echo unknown platform $platform

-- 
exiv2 packaging