From d5fef7b428e9e2fba2743d7936a24c4e7881d832 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Mon, 19 Sep 2016 08:24:24 +0000 Subject: [PATCH] #1109 Work in Progress on MinGW/32 daily build. --- contrib/buildserver/cmake_daily.sh | 5 ++--- contrib/buildserver/test_daily.sh | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/buildserver/cmake_daily.sh b/contrib/buildserver/cmake_daily.sh index e472f3ba..3928b473 100755 --- a/contrib/buildserver/cmake_daily.sh +++ b/contrib/buildserver/cmake_daily.sh @@ -170,7 +170,6 @@ testBuild() cp -R /usr/local/lib/pkgconfig/* "$dist/lib/pkgconfig" mkdir -p "$dist/share/man/man1/" cp -R /usr/local/share/man/man1/*exiv2* "$dist/share/man/man1/" - mkdir -p "$dist/samples" # run the test suite make tests | tee "$dist/logs/test.log" @@ -253,8 +252,8 @@ if [ "$result" == "0" ]; then # add documentation and samples to dist cat contrib/buildserver/dailyReadMe.txt | sed -E -e "s/__BUILD__/$zip/" > "$build/dist/ReadMe.txt" - mkdir -p "$build/dist/samples/" - cp samples/* "$build/dist/samples/" + mkdir -p "$build/dist/samples/" + cp samples/*.cpp samples/*.hpp "$build/dist/samples/" # create the bundle pushd "$build" > /dev/null diff --git a/contrib/buildserver/test_daily.sh b/contrib/buildserver/test_daily.sh index abc95071..6f9ddb58 100755 --- a/contrib/buildserver/test_daily.sh +++ b/contrib/buildserver/test_daily.sh @@ -3,7 +3,7 @@ source $(find . -name buildserver.library 2>/dev/null) echo ------------------------------- -echo PLATFORM = $PLATFORM +echo PLATFORM = $PLATFORM PWD = $PWD echo ------------------------------- ## # figure out today's build @@ -126,6 +126,7 @@ case $PLATFORM in mingw) if [ ! -z "$RECURSIVE" ]; then + svn update . # test the delivered exiv2 PATH="$PWD/$PLATFORM/bin:$PATH" echo ''