From af0407e8e7b17e75d20592ea959bc614023d25a5 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 19 Dec 2015 21:49:23 +0000 Subject: [PATCH] #1109 and #1041. Correction to r4130 --- contrib/buildserver/cmake_daily.sh | 2 +- contrib/buildserver/jenkins_build.sh | 2 +- contrib/buildserver/test_daily.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/buildserver/cmake_daily.sh b/contrib/buildserver/cmake_daily.sh index 4a49dca6..8c76c939 100755 --- a/contrib/buildserver/cmake_daily.sh +++ b/contrib/buildserver/cmake_daily.sh @@ -12,7 +12,7 @@ config=Release vs=2013 result=0 -source functions.so +source $(find . -name functions.so) ## # determine location of the build and source directories diff --git a/contrib/buildserver/jenkins_build.sh b/contrib/buildserver/jenkins_build.sh index f07f92ae..249872be 100755 --- a/contrib/buildserver/jenkins_build.sh +++ b/contrib/buildserver/jenkins_build.sh @@ -11,7 +11,7 @@ # status : filter last build with grep # ## -source functions.so +source $(find . -name functions.so) base=$(basename $0) if [ -z "$base" ]; then base=jenkins_build ; fi diff --git a/contrib/buildserver/test_daily.sh b/contrib/buildserver/test_daily.sh index b2ff56f3..fdb9092d 100755 --- a/contrib/buildserver/test_daily.sh +++ b/contrib/buildserver/test_daily.sh @@ -1,6 +1,6 @@ #!/bin/bash -source functions.source +source $(find . -name functions.so) ## # figure out today's build