From 95fc78c65d18d9820aef0fb19dc026ac6ef85f30 Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Thu, 26 Nov 2015 18:47:21 +0000
Subject: [PATCH] #1041.  Adding option --test and --bash to cmakeBuild.cmd. 
 Correction to vcvars.bat to respect 32 bit builds by setting
 PROCESSOR_ARGUMENT.

---
 contrib/cmake/msvc/cmakeBuild.cmd    | 21 ++++++++++++++++++---
 contrib/cmake/msvc/cmakeDefaults.cmd |  1 +
 contrib/cmake/msvc/vcvars.bat        |  3 ++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/contrib/cmake/msvc/cmakeBuild.cmd b/contrib/cmake/msvc/cmakeBuild.cmd
index 5daab54c..5701c8a4 100755
--- a/contrib/cmake/msvc/cmakeBuild.cmd
+++ b/contrib/cmake/msvc/cmakeBuild.cmd
@@ -26,6 +26,8 @@ if /I "%1" == "--expat"           set "_EXPAT_=%2"& shift
 if /I "%1" == "--libssh"          set "_LIBSSH_=%2"& shift
 if /I "%1" == "--curl"            set "_CURL_=%2"& shift
 if /I "%1" == "--openssl"         set "_OPENSSL_=%2"& shift
+if /I "%1" == "--test"            set "_TEST_=1"
+if /I "%1" == "--bash"            set "_BASH_=%2"& shift
 
 shift
 if not (%1) EQU () goto GETOPTS
@@ -179,13 +181,16 @@ set  _LIBPATH_=%_LIBPATH_:\=/%
 set  _INCPATH_=%_INCPATH_:\=/%
 set  _BINPATH_=%_BINPATH_:\=/%
 
+if defined _TEST_ if NOT EXIST "%_BASH_%" (
+	echo "*** bash does not exist %_BASH_% ***"
+	GOTO error_end
+)
 
 if NOT DEFINED _GENERATOR_       set "_GENERATOR_=%VS_CMAKE%"
 if /I "%_GENERATOR_%" == "NMake" set "_GENERATOR_=NMake Makefiles"
 
 if defined _VIDEO_ set _VIDEO_=-DEXIV2_ENABLE_VIDEO=ON
 
-
 rem  ----
 echo.
 echo.config    = %_CONFIG_%
@@ -201,6 +206,8 @@ echo.openssh   = %_OPENSSL_%
 echo.libpat    = %_LIBPATH_%
 echo.incpat    = %_INCPATH_%
 echo.binpat    = %_BINPATH_%
+echo.test      = %_TEST_%
+echo.bash      = %_BASH_%
 echo.
 
 IF DEFINED _DRYRUN_  exit /b 1
@@ -296,6 +303,14 @@ pushd        "%EXIV_B%"
 	if NOT defined _SILENT_ copy/y "samples\%_CONFIG_%\"*.exe "%_INSTALL_%\bin"
 popd
 
+if defined _TEST_ (
+	for /f "tokens=*" %%a in ('cygpath -au .') do set BUILDDIR=%%a
+	pushd "%_EXIV2_%\test"
+	"%_BASH_%" -c "export 'PATH=/usr/bin:$PATH' ; ./testMSVC.sh ${BUILDDIR}/dist/bin"	
+	popd
+	exit /b 0
+)
+
 rem -----------------------------------------
 rem Exit
 :end
@@ -309,9 +324,9 @@ exit /b 1
 rem -----------------------------------------
 rem Functions
 :help
-echo Options: --help ^| --pause ^| --webready ^| --dryrun ^| --verbose ^| --rebuild ^| --silent ^| --verbose ^| --video
+echo Options: --help ^| --pause ^| --webready ^| --dryrun ^| --verbose ^| --rebuild ^| --silent ^| --verbose ^| --video ^| --test
 echo.         --exiv2 directory ^| --temp directory ^| --config name ^| --generator generator
-echo.         --zlib zlib.1.2.8 ^| --expat expat-2.1.0 ^| --curl curl-7.45.0 ^| --libssh libssh-0.7.2 ^| --openssl openssl-1.0.1p
+echo.         --zlib zlib.1.2.8 ^| --expat expat-2.1.0 ^| --curl curl-7.45.0 ^| --libssh libssh-0.7.2 ^| --openssl openssl-1.0.1p ^| --bash c:\cygwin64\bin\bash
 exit /b 0
 
 :echo
diff --git a/contrib/cmake/msvc/cmakeDefaults.cmd b/contrib/cmake/msvc/cmakeDefaults.cmd
index ee95f870..69bf0868 100755
--- a/contrib/cmake/msvc/cmakeDefaults.cmd
+++ b/contrib/cmake/msvc/cmakeDefaults.cmd
@@ -8,6 +8,7 @@ if NOT DEFINED _LIBSSH_      SET _LIBSSH_=libssh-0.7.2
 if NOT DEFINED _OPENSSL_     SET _OPENSSL_=openssl-1.0.1p
 if NOT DEFINED _ZLIB_        SET _ZLIB_=zlib-1.2.8
 if NOT DEFINED _EXPAT_       SET _EXPAT_=expat-2.1.0
+if NOT DEFINED _BASH_        SET _BASH_=c:\cygwin64\bin\bash.exe
 
 rem That's all Folks!
 rem
diff --git a/contrib/cmake/msvc/vcvars.bat b/contrib/cmake/msvc/vcvars.bat
index d0709679..87052a11 100755
--- a/contrib/cmake/msvc/vcvars.bat
+++ b/contrib/cmake/msvc/vcvars.bat
@@ -38,7 +38,8 @@ if DEFINED _VC_ (
   if "%2" EQU "64" (
     vcvarsall.bat x86_amd64
   ) else (
-    vcvarsall.bat x86  
+    vcvarsall.bat x86
+    set PROCESSOR_ARCHITECTURE=x86
   )
   if errorlevel 1 (
   	echo.*** error - failed ***