From 312f46e6465008ab1ad564d9beafa1c0c6e3ee43 Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Mon, 15 Dec 2014 23:12:46 +0000
Subject: [PATCH] promote webready/jenkins_build.sh to trunk (runs exiv2 -v -V
 at end)

---
 jenkins_build.sh | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/jenkins_build.sh b/jenkins_build.sh
index 6a846960..08fda5fe 100755
--- a/jenkins_build.sh
+++ b/jenkins_build.sh
@@ -169,6 +169,7 @@ case "$build" in
         make -j4 samples "CXXFLAGS=-I${PWD}/usr/include -I${PWD}/src" "LDFLAGS=-L${PWD}/usr/lib -L${PWD}/xmpsdk/src/.libs -lexiv2"
         result=$?
         run_tests
+        exiv2 -v -V
   ;;
   
   CYGW) 
@@ -183,6 +184,7 @@ case "$build" in
         make install
         make -j4 samples
         run_tests
+        exiv2 -v -V
   ;;
 
   MING) 
@@ -191,6 +193,27 @@ case "$build" in
             export CXX=$(which g++)
             export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
             echo --- recursive MinGW build ---
+
+            ##########################
+            #  To build curl/MinGW/64 (on 32bit MinGW):
+            #  PKG_CONFIG_PATH="/usr/local/lib/pkgconfig/:/usr/lib/pkgconfig/"
+            #  cd /home/rmills/gnu/curl/curl-7.39.0>
+            #  ./configure --prefix=/usr/local --disable-static --enable-shared --host=i686-x64-mingw32
+            #  I haven't succeeded in getting openssl to link with curl on MinGW
+            #  --with-ssl=/usr/local
+            ##########################
+            if [ "$withcurl" == "--with-curl" ]; then
+            	withcurl="--with-curl=/usr/local"
+            fi
+
+            ##########################
+            # I have be unable to build libssh on MinGW (neither 32 nor 64 bits)
+            ##########################
+            if [ "$withssh" == "--with-ssh" ]; then
+            	echo "*** unable to build --with-ssh on MING ***"
+            	withssh="--without-ssh"
+            fi
+            
             ./configure $withcurl $withssh
             (cd src ; make svn_version.h)
             make        # DO NOT USE -j4.  It seems to hang the build!
@@ -282,7 +305,6 @@ case "$build" in
         result=$?
   ;;
   
-  
   NONE) 
         echo "**************************************"
         echo "*** no build requested for $target ***"