From f9b83fc7c6b8283a4d06e9c1f26c1128f9dd6e84 Mon Sep 17 00:00:00 2001 From: clanmills Date: Thu, 16 Apr 2020 16:25:04 +0100 Subject: [PATCH] put test log into the build log. --- cmake/packaging.cmake | 5 +---- releasenotes/CYGWIN/ReadMe.txt | 2 +- releasenotes/Darwin/ReadMe.txt | 2 +- releasenotes/Linux/ReadMe.txt | 2 +- releasenotes/MinGW/ReadMe.txt | 2 +- releasenotes/Unix/ReadMe.txt | 2 +- releasenotes/msvc/ReadMe.txt | 2 +- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake index 223fbcf9..4636419e 100644 --- a/cmake/packaging.cmake +++ b/cmake/packaging.cmake @@ -120,13 +120,10 @@ foreach(doc ${DOCS}) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${doc} DESTINATION .) endforeach() -# copy build/test logs which are only present on Jenkins builds +# copy build/log which which is present if built by build.sh if(EXISTS ${PROJECT_SOURCE_DIR}/build/logs/build.txt) install(FILES ${PROJECT_SOURCE_DIR}/build/logs/build.txt DESTINATION "logs") endif() -if(EXISTS ${PROJECT_SOURCE_DIR}/build/logs/test.txt) - install(FILES ${PROJECT_SOURCE_DIR}/build/logs/test.txt DESTINATION "logs") -endif() # Copy releasenotes.txt and appropriate ReadMe.txt (eg releasenotes/${PACKDIR}/ReadMe.txt) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/releasenotes/${PACKDIR}/ReadMe.txt ReadMe.txt @ONLY) diff --git a/releasenotes/CYGWIN/ReadMe.txt b/releasenotes/CYGWIN/ReadMe.txt index 2143c80c..30bf18cb 100644 --- a/releasenotes/CYGWIN/ReadMe.txt +++ b/releasenotes/CYGWIN/ReadMe.txt @@ -11,7 +11,7 @@ lib/pkgconfig/exiv2.pc pkg-config file share/man/ man pages share/locale/ localisation files samples/exifprint.cpp sample code -logs build and test logs +logs build/test log ReadMe.txt This file exiv2.png Exiv2 Logo diff --git a/releasenotes/Darwin/ReadMe.txt b/releasenotes/Darwin/ReadMe.txt index ced1530c..710b8fed 100644 --- a/releasenotes/Darwin/ReadMe.txt +++ b/releasenotes/Darwin/ReadMe.txt @@ -11,7 +11,7 @@ include/exiv2/ include files share/man/ man pages share/locale/ localisation files samples/exifprint.cpp sample code -logs/ build and test logs +logs build/test log ReadMe.txt This file exiv2.png Exiv2 Logo diff --git a/releasenotes/Linux/ReadMe.txt b/releasenotes/Linux/ReadMe.txt index ac6b5a95..cab81502 100644 --- a/releasenotes/Linux/ReadMe.txt +++ b/releasenotes/Linux/ReadMe.txt @@ -11,7 +11,7 @@ include/exiv2/ include files share/man/ man pages share/locale/ localisation files samples/exifprint.cpp sample code -logs/ build and test logs +logs build/test log ReadMe.txt This file license.txt GPLv2.0 Software License diff --git a/releasenotes/MinGW/ReadMe.txt b/releasenotes/MinGW/ReadMe.txt index 5d20b8e2..fedf3750 100644 --- a/releasenotes/MinGW/ReadMe.txt +++ b/releasenotes/MinGW/ReadMe.txt @@ -12,7 +12,7 @@ include/exiv2/ include files share/man/ man pages share/locale/ localisation files samples/exifprint.cpp sample code -logs build and test logs +logs build/test log ReadMe.txt This file exiv2.png Exiv2 Logo diff --git a/releasenotes/Unix/ReadMe.txt b/releasenotes/Unix/ReadMe.txt index 304f94a8..fdb21a98 100644 --- a/releasenotes/Unix/ReadMe.txt +++ b/releasenotes/Unix/ReadMe.txt @@ -11,7 +11,7 @@ include/exiv2/ include files share/man/ man pages share/locale/ localisation files samples/exifprint.cpp sample code -logs/ build and test logs +logs build/test log ReadMe.txt This file license.txt GPLv2.0 Software License diff --git a/releasenotes/msvc/ReadMe.txt b/releasenotes/msvc/ReadMe.txt index 1af668e8..a72f9da1 100644 --- a/releasenotes/msvc/ReadMe.txt +++ b/releasenotes/msvc/ReadMe.txt @@ -9,7 +9,7 @@ lib/exiv2.lib & exiv2-xmp.lib link libraries lib/cmake/exiv2 CMake support/consume files include/exiv2/ include files samples/exifprint.cpp sample code -logs/ build and test logs +logs build/test log ReadMe.txt This file license.txt GPLv2.0 Software License