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

The following commit has been merged in the master branch:
commit db16f80d9f5873f45dcdbaa396bc5e64578fa1c4
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Dec 10 04:00:06 2015 +0000

    #1041 We often build Win32 although we request x64.  I suspect a rogue copy of vcvars.bat on the builder's path.
---
 contrib/cmake/msvc/cmakeDefaults.cmd | 2 +-
 jenkins_daily.sh                     | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/contrib/cmake/msvc/cmakeDefaults.cmd b/contrib/cmake/msvc/cmakeDefaults.cmd
index e7dc16c..31ae55d 100755
--- a/contrib/cmake/msvc/cmakeDefaults.cmd
+++ b/contrib/cmake/msvc/cmakeDefaults.cmd
@@ -16,7 +16,7 @@ if NOT DEFINED _MODE_        SET _MODE_=dll
 if NOT DEFINED  COPYCMD      SET COPYCMD=/Y
 
 rem ---------- check that EXIV2   exists
-call:echo checking that %_EXIV2_% exists
+echo checking that %_EXIV2_% exists
 if NOT EXIST %_EXIV2_% (
     echo "_EXIV2_ = %_EXIV2_% does not exist ***" >&2
     exit /b 1
diff --git a/jenkins_daily.sh b/jenkins_daily.sh
index 8bddcd6..6712555 100755
--- a/jenkins_daily.sh
+++ b/jenkins_daily.sh
@@ -23,6 +23,7 @@ exiv2=$(cygpath -aw .)
 build=$(cygpath -aw .\build)
  dist=$(cygpath -au .\build\dist\$vs\$arch\$mode\$config\bin)
  di32=$(cygpath -au .\build\dist\$vs\Win32\$mode\$config\bin)
+ di64=$(cygpath -au .\build\dist\$vs\x64\$mode\$config\bin)
  msvc=$(cygpath -aw ./contrib/cmake/msvc)
 
 ##
@@ -42,10 +43,14 @@ mkdir -p  $dist
 
 ##
 # test the build
+# For an unknown reason, we sometimes build the wrong architecture
 export EXIV2_BINDIR=$dist
-if [ ! -e $dist/exiv2.exe -a -e $di32/exiv2.exe ]; then
+if [ "$arch" == "x64" -a !-e $dist/exiv2.exe -a -e $di32/exiv2.exe  ]; then
     export EXIV2_BINDIR=$di32
 fi 
+if [ "$arch" == "Win32" -a !-e $dist/exiv2.exe -a -e $di64/exiv2.exe  ]; then
+    export EXIV2_BINDIR=$di64
+fi 
 pushd  test
     for test in addmoddel.sh \
         bugfixes-test.sh     \

-- 
exiv2 packaging