From 907326673edd5de34c57643d2e3775a780b60a8b Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Fri, 29 Sep 2017 12:35:56 +0100
Subject: [PATCH] Jenkins maintenance

---
 contrib/buildserver/dailyBuild.sh | 8 ++++----
 contrib/buildserver/dailyCMake.sh | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/buildserver/dailyBuild.sh b/contrib/buildserver/dailyBuild.sh
index 7ec12df7..4a70b7ad 100755
--- a/contrib/buildserver/dailyBuild.sh
+++ b/contrib/buildserver/dailyBuild.sh
@@ -8,10 +8,10 @@
 # 2 executes dailyTest.sh to test that the build bundles are good
 # 3 rebuilds all links in userContent/builds/{Latest Date Platform SVN}
 
-ssh rmills@rmillsmm         'cd ~/gnu/exiv2/buildserver ; rm -rf exiv2 ; git clone http://github.com/clanmills/exiv2.git ; cd exiv2/ ;                               contrib/buildserver/dailyCMake.sh'
-ssh rmills@rmillsmm-kubuntu 'cd ~/gnu/exiv2/buildserver ; rm -rf exiv2 ; git clone http://github.com/clanmills/exiv2.git ; cd exiv2/ ;                               contrib/buildserver/dailyCMake.sh'
-ssh rmills@rmillsmm-w7      'cd ~/gnu/exiv2/buildserver ; rm -rf exiv2 ; git clone http://github.com/clanmills/exiv2.git ; cd exiv2/ ;                               contrib/buildserver/dailyCMake.sh'
-ssh rmills@rmillsmm-w7      'cd ~/gnu/exiv2/buildserver ; rm -rf exiv2 ; git clone http://github.com/clanmills/exiv2.git ; cd exiv2/ ; env PLATFORM=msvc             contrib/buildserver/dailyCMake.sh'
+ssh rmills@rmillsmm         'cd ~/gnu/exiv2/buildserver ; rm -rf exiv2 ; git clone http://github.com/exiv2/exiv2.git ; cd exiv2/ ;                               contrib/buildserver/dailyCMake.sh'
+ssh rmills@rmillsmm-kubuntu 'cd ~/gnu/exiv2/buildserver ; rm -rf exiv2 ; git clone http://github.com/exiv2/exiv2.git ; cd exiv2/ ;                               contrib/buildserver/dailyCMake.sh'
+ssh rmills@rmillsmm-w7      'cd ~/gnu/exiv2/buildserver ; rm -rf exiv2 ; git clone http://github.com/exiv2/exiv2.git ; cd exiv2/ ;                               contrib/buildserver/dailyCMake.sh'
+ssh rmills@rmillsmm-w7      'cd ~/gnu/exiv2/buildserver ; rm -rf exiv2 ; git clone http://github.com/exiv2/exiv2.git ; cd exiv2/ ; env PLATFORM=msvc             contrib/buildserver/dailyCMake.sh'
 # ssh rmills@rmillsmm-w7      'cd ~/gnu/exiv2/buildserver ; rm -rf exiv2 ; git clone http://github.com/Exiv2/exiv2.git ; cd exiv2/ ; env PLATFORM=mingw win32=true contrib/buildserver/dailyCMake.sh'
 
 ##
diff --git a/contrib/buildserver/dailyCMake.sh b/contrib/buildserver/dailyCMake.sh
index cd0c595c..38079064 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/dist/)
+     dist=$(cygpath -au ./build/contrib/cmake/msvc/dist/)
      msvc=$(cygpath -au ./contrib/cmake/msvc)
 else
     exiv2=$PWD
@@ -93,7 +93,7 @@ testBuild()
                 PATH="$msvc:/cygdrive/c/Windows/System32:/cygdrive/c/Program Files/csvn/bin:/cygdrive/c/Program Files (x86)/WANdisco/Subversion/csvn/bin:/cygdrive/c/Program Files/7-zip:/cygdrive/c/Program Files/CMake/bin:/cygdrive/c/Program Files/cmake/bin:/cygdrive/c/Program Files (x86)/cmake/bin"
                 # cmd.exe /c "cd $build && vcvars $vs $arch && cmakeBuild --samples --build --exiv2 $exiv2 $*"
                 for ARCH in 64 32; do
-                    for VS in 2005 2008 2010 2012 2013 2015 2017; do
+                    for VS in 2005 2017; do
                         echo -=-=-=-=-=-=-=-=-=-=-=-
                         echo cmd.exe /c "cd $build && vcvars $VS $ARCH && cmakeBuild --build --samples --exiv2 $exiv2 $*"
                         echo -=-=-=-=-=-=-=-=-=-=-=-