[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=14e8d28

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

    #1041 Enable user to pass arguments to jenkins_daily.sh.  Better 'no build generated' handling.
---
 jenkins_daily.sh | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/jenkins_daily.sh b/jenkins_daily.sh
index 6712555..b8d3f5b 100755
--- a/jenkins_daily.sh
+++ b/jenkins_daily.sh
@@ -37,21 +37,26 @@ mkdir -p  $dist
 (
   	PATH="$msvc:c:\Program Files\csvn\bin:c:\Program Files\7-zip:c:\Program Files (x86)\cmake\bin:$PATH:/cygdrive/c/Windows/System32"
   	result=0
-  	cmd.exe /c "cd $build && vcvars $vs $arch && cmakeBuild --rebuild --exiv2=$exiv2"
+  	cmd.exe /c "cd $build && vcvars $vs $arch && cmakeBuild --rebuild --exiv2=$exiv2 $*"
   	result=$?
 )
 
 ##
 # test the build
 # For an unknown reason, we sometimes build the wrong architecture
+# I suspect this is due to a rogue version of vcvars.bat which does not understand x64
 export EXIV2_BINDIR=$dist
-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
+if [ ! -e $dist/exiv2.exe ]; then
+    if [ "$arch" == "x64" -a -e $di32/exiv2.exe  ]; then
+        export EXIV2_BINDIR=$di32
+    fi 
+    if [ "$arch" == "Win32" -a -e $di64/exiv2.exe  ]; then
+        export EXIV2_BINDIR=$di64
+    fi
+fi
+
+if [ -e $dist/exiv2.exe ]; then
+  pushd  test
     for test in addmoddel.sh \
         bugfixes-test.sh     \
         exifdata-test.sh     \
@@ -71,12 +76,17 @@ pushd  test
     do
       echo '++' $test '++' ; ./$test
     done
-popd
+  popd
 
-$EXIV2_BINDIR/exiv2 -vV
-ls -alt $EXIV2_BINDIR
-$EXIV2_BINDIR/exiv2 -vV -g date -g time -g version
-ls -alt $EXIV2_BINDIR/exiv2.exe
+  $EXIV2_BINDIR/exiv2 -vV
+  ls -alt $EXIV2_BINDIR
+  $EXIV2_BINDIR/exiv2 -vV -g date -g time -g version
+  ls -alt $EXIV2_BINDIR/exiv2.exe
+else
+  echo ""
+  echo "**** no build created ****"
+  echo ""
+fi
 
 exit $result
 # That's all Folks!

-- 
exiv2 packaging