From 1f71667b435e43f7bba43912ac84fee072ff04d5 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Fri, 29 Sep 2017 13:23:51 +0100 Subject: [PATCH] Jenkins maintenance --- contrib/buildserver/dailyCMake.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/buildserver/dailyCMake.sh b/contrib/buildserver/dailyCMake.sh index 38079064..e65d716b 100755 --- a/contrib/buildserver/dailyCMake.sh +++ b/contrib/buildserver/dailyCMake.sh @@ -12,7 +12,7 @@ source $(find . -name buildserver.library) if [ "$PLATFORM" == "msvc" ]; then exiv2=$(cygpath -aw .) build=$(cygpath -aw ./build) - dist=$(cygpath -au ./build/contrib/cmake/msvc/dist/) + dist=$(cygpath -au ./build/dist/) msvc=$(cygpath -au ./contrib/cmake/msvc) else exiv2=$PWD @@ -100,9 +100,10 @@ testBuild() cmd.exe /c "cd $build && vcvars $VS $ARCH && cmakeBuild --build --samples --exiv2 $exiv2 $*" done done - # cmd.exe /c "cd $build && cmakeBuildAll --rebuild --exiv2=$exiv2 $*" result=$? ) + + mv $msvc/dist . # bring the new build here cp $msvc/vcvars.bat $build/dist # required by test_daily.sh ;;