#1109 Work in Progress on MinGW/32 daily build

contrib/buildserver/cmake_daily.sh

@@ -30,7 +30,9 @@ echo "---- dist = $dist ------"
 echo "---- build = $build ------"
 
 ##
-# test the build (don't test msvc because it was tested by cmakeBuild)
+# test the build
+# - don't test msvc because it was tested by cmakeBuild
+# - don't test mingw because it's build with autotools and tested in line
 testBuild()
 {
     if [ -e $dist/bin/exiv2 ]; then
@@ -105,13 +107,16 @@ testBuild()
         mingw)
             if [ ! -z "$RECURSIVE" ]; then
                 # we are already in MinGW/bash, so build
+                ##
+                # dont use cmake as I can't get it to work
                 # cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$dist -DEXIV2_ENABLE_NLS=OFF -DCMAKE_C_COMPILER=$(which gcc) -DCMAKE_CXX_COMPILER=$(which g++) $exiv2
-                make distclean
+
+                ##
+                # build with autotools
+                make clean
                 make config
                 ./configure --prefix=/usr/local
                 make
-                # run exiv2 to check the build is sane
-                bin/.libs/exiv2 --verbose --version
 
                 # install and copy the build to the dist
                 make   install
@@ -147,9 +152,6 @@ testBuild()
                     export LDFLAGS=-m64
                     /c/MinGW64/msys/1.0/bin/bash.exe -c "export PATH=/c/TDM-GCC-64/bin:/c/MinGW64/bin:/c/MinGW64/msys/1.0/bin:/c/MinGW64/msys/1.0/local/bin; $0"
                     result=$?
-                    if [ "$result" == "0" ]; then
-                        testBuild
-                    fi
                 fi
                 if [ "$win32" == true ]; then
                     export CFLAGS=-m32
@@ -157,9 +159,6 @@ testBuild()
                     export LDFLAGS=-m32
                     /c/MinGW/msys/1.0/bin/bash.exe -c "export PATH=/c/Qt/Qt5.6.0/5.6/mingw49_32/bin:/c/Qt/Qt5.6.0/Tools/mingw492_32/bin:/c/MinGW/bin:/usr/bin:/usr/local/bin:/c/cygwin64/bin:/c/Users/rmills/com:.; $0"
                     result=$?
-                    if [ "$result" == "0" ]; then
-                        testBuild
-                    fi
                 fi
             fi
         ;;