[Cmake-commits] CMake branch, next, updated. v2.8.4-1131-g19b6961

[Eric Noulard]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  19b6961b88c7be34061ed206615cfb1c6177af69 (commit)
       via  0e07b425cad4b608e44846a08ba9ee4ae05828d5 (commit)
      from  f127de664fc3b96f3669ce165e86631239b9e3fd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19b6961b88c7be34061ed206615cfb1c6177af69
commit 19b6961b88c7be34061ed206615cfb1c6177af69
Merge: f127de6 0e07b42
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Thu Mar 10 12:21:04 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 10 12:21:04 2011 -0500

    Merge topic 'CPackRPM-TestWithMoreTraces' into next
    
    0e07b42 CPackRPM even more trace in debug mode or in case of failure


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e07b425cad4b608e44846a08ba9ee4ae05828d5
commit 0e07b425cad4b608e44846a08ba9ee4ae05828d5
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Thu Mar 10 18:20:16 2011 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Thu Mar 10 18:20:16 2011 +0100

    CPackRPM even more trace in debug mode or in case of failure

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 5ec7349..255ad9a 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -640,12 +640,17 @@ IF(RPMBUILD_EXECUTABLE)
             --buildroot "${CPACK_RPM_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"
             "${CPACK_RPM_BINARY_SPECFILE}"
     WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"
+    RESULT_VARIABLE CPACK_RPMBUILD_EXEC_RESULT
     ERROR_FILE "${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild${CPACK_RPM_PACKAGE_COMPONENT_PART_NAME}.err"
     OUTPUT_FILE "${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild${CPACK_RPM_PACKAGE_COMPONENT_PART_NAME}.out")
-  IF(CPACK_RPM_PACKAGE_DEBUG)
+  IF(CPACK_RPM_PACKAGE_DEBUG OR CPACK_RPMBUILD_EXEC_RESULT)
+    FILE(READ ${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild${CPACK_RPM_PACKAGE_COMPONENT_PART_NAME}.err RPMBUILDERR)
+    FILE(READ ${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild${CPACK_RPM_PACKAGE_COMPONENT_PART_NAME}.out RPMBUILDOUT)
     MESSAGE("CPackRPM:Debug: You may consult rpmbuild logs in: ")
     MESSAGE("CPackRPM:Debug:    - ${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild${CPACK_RPM_PACKAGE_COMPONENT_PART_NAME}.err")
+    MESSAGE("CPackRPM:Debug: *** ${RPMBUILDERR} ***")
     MESSAGE("CPackRPM:Debug:    - ${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild${CPACK_RPM_PACKAGE_COMPONENT_PART_NAME}.out")
+    MESSAGE("CPackRPM:Debug: *** ${RPMBUILDERR} ***")
   ENDIF(CPACK_RPM_PACKAGE_DEBUG)
 ELSE(RPMBUILD_EXECUTABLE)
   IF(ALIEN_EXECUTABLE)

-----------------------------------------------------------------------

Summary of changes:
 Modules/CPackRPM.cmake |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake