From de0a46c7d9bf57e875220c8fb468ae7e036b8d12 Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Tue, 19 Sep 2017 13:22:56 +0100
Subject: [PATCH] buildserver maintenance

---
 contrib/buildserver/dailyBuild.sh | 10 ++++++----
 contrib/buildserver/dailyCMake.sh |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/contrib/buildserver/dailyBuild.sh b/contrib/buildserver/dailyBuild.sh
index 6755ff16..717cfae4 100755
--- a/contrib/buildserver/dailyBuild.sh
+++ b/contrib/buildserver/dailyBuild.sh
@@ -8,10 +8,12 @@
 # 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/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'
+source=http://github.com/Exiv2/exiv2.git
+
+ssh rmills@rmillsmm         'cd ~/gnu/exiv2/buildserver ; rm -rf exiv2 ; git clone $source ; cd exiv2/ ;                               contrib/buildserver/dailyCMake.sh'
+ssh rmills@rmillsmm-kubuntu 'cd ~/gnu/exiv2/buildserver ; rm -rf exiv2 ; git clone $source ; cd exiv2/ ;                               contrib/buildserver/dailyCMake.sh'
+ssh rmills@rmillsmm-w7      'cd ~/gnu/exiv2/buildserver ; rm -rf exiv2 ; git clone $source ; cd exiv2/ ;                               contrib/buildserver/dailyCMake.sh'
+ssh rmills@rmillsmm-w7      'cd ~/gnu/exiv2/buildserver ; rm -rf exiv2 ; git clone $source ; 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 a418c49f..cd0c595c 100755
--- a/contrib/buildserver/dailyCMake.sh
+++ b/contrib/buildserver/dailyCMake.sh
@@ -91,13 +91,13 @@ testBuild()
             # use a subshell to restore the path
             (
                 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 --rebuild --exiv2=$exiv2 $*"
+                # 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
                         echo -=-=-=-=-=-=-=-=-=-=-=-
-                        echo cmd.exe /c "cd $build && vcvars $VS $ARCH && cmakeBuild --rebuild --exiv2=$exiv2 $*"
+                        echo cmd.exe /c "cd $build && vcvars $VS $ARCH && cmakeBuild --build --samples --exiv2 $exiv2 $*"
                         echo -=-=-=-=-=-=-=-=-=-=-=-
-                             cmd.exe /c "cd $build && vcvars $VS $ARCH && cmakeBuild --rebuild --exiv2=$exiv2 $*"
+                             cmd.exe /c "cd $build && vcvars $VS $ARCH && cmakeBuild --build --samples --exiv2 $exiv2 $*"
                     done
                 done
                 # cmd.exe /c "cd $build && cmakeBuildAll --rebuild --exiv2=$exiv2 $*"