From bb4017e2a2a29dd24575f7e2ca97aefd7020283e Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 19 Dec 2015 22:21:00 +0000 Subject: [PATCH] #1109 and #1041 Update to jenkins_build.sh surprise: msvc build did not execute. The "what kind of build is this?" code has been in service for about 1 year. --- contrib/buildserver/jenkins_build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/buildserver/jenkins_build.sh b/contrib/buildserver/jenkins_build.sh index 249872be..16499e3a 100755 --- a/contrib/buildserver/jenkins_build.sh +++ b/contrib/buildserver/jenkins_build.sh @@ -101,8 +101,8 @@ build=NONE if [ $PLATFORM == "linux" -a "$target" == "linux" -a "$linux" == "true" ]; then build=UNIX ; fi if [ $PLATFORM == "macosx" -a "$target" == "macosx" -a "$macosx" == "true" ]; then build=UNIX ; fi if [ $PLATFORM == "cygwin" -a "$target" == "cygwin" -a "$cygwin" == "true" ]; then build=CYGW ; fi -if [ $PLATFORM == "cygwin" -a "$target" == "mingw" -a "$mingw" == "true" ]; then build=MING ; fi -if [ $PLATFORM == "cygwin" -a "$target" == "msvc" -a "$msvc" == "true" ]; then build=MSVC ; fi +if [ "$target" == "mingw" -a "$mingw" == "true" ]; then build=MING ; fi +if [ "$target" == "msvc" -a "$msvc" == "true" ]; then build=MSVC ; fi if [ $PLATFORM == "mingw" -a "$target" == "mingw" ]; then build=MING ; fi echo "3 target = $target platform = $PLATFORM build = $build"