[debhelper-devel] [debhelper] 01/01: cmake.pm: Dump CMakeOutput and CMakeError on cmake errors

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 5da8359b52c6670afa525c4272972cbad374e38d
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Oct 1 16:49:07 2016 +0000

    cmake.pm: Dump CMakeOutput and CMakeError on cmake errors
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Buildsystem/cmake.pm | 6 ++++++
 debian/changelog                      | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index cce9e35..338f65e 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -92,6 +92,12 @@ sub configure {
 		if (-e $this->get_buildpath("CMakeCache.txt")) {
 			$this->doit_in_builddir("tail -v -n +0 CMakeCache.txt");
 		}
+		if (-e $this->get_buildpath('CMakeFiles/CMakeOutput.log')) {
+			$this->doit_in_builddir('tail -v -n +0 CMakeFiles/CMakeOutput.log');
+		}
+		if (-e $this->get_buildpath('CMakeFiles/CMakeError.log')) {
+			$this->doit_in_builddir('tail -v -n +0 CMakeFiles/CMakeError.log');
+		}
 		die $err;
 	}
 }
diff --git a/debian/changelog b/debian/changelog
index 868aa34..c2705b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ debhelper (10+unreleased) UNRELEASED; urgency=medium
     options.  The old variants are accepted for compatibility.
     Thanks to Raphaël Hertzog for the suggestion.
     (Closes: #838446)
+  * cmake.pm: If cmake fails, also down CMakeFiles/CMakeOutput.log
+    and CMakeFiles/CMakeError.log if they are present.  Thanks to
+    Michael Banck for the suggestion.  (Closes: #839389)
 
  -- Niels Thykier <niels at thykier.net>  Wed, 14 Sep 2016 06:07:02 +0000
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git