[Cmake-commits] CMake branch, next, updated. v2.8.4-1129-gf127de6

[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  f127de664fc3b96f3669ce165e86631239b9e3fd (commit)
       via  564b7311f41aad0aa26a463b546bcd742aecec85 (commit)
       via  8def3f59495208b44ae2b94d177c9cccd5bb1cca (commit)
      from  3fed422ac5dd3b3b1f60a7afe24638b038a817e4 (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=f127de664fc3b96f3669ce165e86631239b9e3fd
commit f127de664fc3b96f3669ce165e86631239b9e3fd
Merge: 3fed422 564b731
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Thu Mar 10 03:49:56 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 10 03:49:56 2011 -0500

    Merge topic 'CPackRPM-TestWithMoreTraces' into next
    
    564b731 CPackRPM  add more trace output in order to help failing diagnostics
    8def3f5 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=564b7311f41aad0aa26a463b546bcd742aecec85
commit 564b7311f41aad0aa26a463b546bcd742aecec85
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Thu Mar 10 09:48:46 2011 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Thu Mar 10 09:48:46 2011 +0100

    CPackRPM  add more trace output in order to help failing diagnostics

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 026c45a..5ec7349 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -194,6 +194,25 @@ IF(NOT RPMBUILD_EXECUTABLE)
   MESSAGE(FATAL_ERROR "RPM package requires rpmbuild executable")
 ENDIF(NOT RPMBUILD_EXECUTABLE)
 
+# Display lsb_release output if DEBUG mode enable
+# This will help to diagnose problem with CPackRPM
+# because we will know on which kind of Linux we are
+IF(CPACK_RPM_PACKAGE_DEBUG)
+  find_program(LSB_RELEASE_EXECUTABLE lsb_release)
+  if(LSB_RELEASE_EXECUTABLE)
+    execute_process(COMMAND ${LSB_RELEASE_EXECUTABLE} -a
+                    OUTPUT_VARIABLE _TMP_LSB_RELEASE_OUTPUT
+                    ERROR_QUIET
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+    string(REGEX REPLACE "\n" ", "
+           LSB_RELEASE_OUTPUT
+           ${_TMP_LSB_RELEASE_OUTPUT})
+  else (LSB_RELEASE_EXECUTABLE)
+    set(LSB_RELEASE_OUTPUT "lsb_release not installed/found!")
+  endif(LSB_RELEASE_EXECUTABLE)
+  MESSAGE("CPackRPM:Debug: LSB_RELEASE  = ${LSB_RELEASE_OUTPUT}")
+ENDIF(CPACK_RPM_PACKAGE_DEBUG)
+
 # We may use RPM version in the future in order
 # to shut down warning about space in buildtree
 # some recent RPM version should support space in different places.
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 1fac232..ae0ee1a 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -30,8 +30,8 @@ set(config_type $ENV{CMAKE_CONFIG_TYPE})
 set(config_args )
 if(config_type)
   set(config_args -C ${config_type})
-endif()
-message(" ${config_args}")
+endif(config_type)
+set(config_verbose )
 
 if(CPackGen MATCHES "ZIP")
     set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.zip")
@@ -51,10 +51,11 @@ if(CPackGen MATCHES "ZIP")
         set(expected_count 1)
     endif (${CPackComponentWay} STREQUAL "AllGroupsInOne")
 elseif (CPackGen MATCHES "RPM")
+    set(config_verbose -D "CPACK_RPM_PACKAGE_DEBUG=1")
     set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.rpm")
     if (${CPackComponentWay} STREQUAL "default")
         set(expected_count 1)
-    endif(${CPackComponentWay} STREQUAL "default")
+    endif (${CPackComponentWay} STREQUAL "default")
     if (${CPackComponentWay} STREQUAL "OnePackPerGroup")
         set(expected_count 2)
     endif (${CPackComponentWay} STREQUAL "OnePackPerGroup")
@@ -77,7 +78,9 @@ if(expected_file_mask)
   endif(expected_file)
 endif(expected_file_mask)
 
-execute_process(COMMAND ${CPackCommand} -G ${CPackGen} ${config_args}
+message("config_args = ${config_args}")
+message("config_verbose = ${config_verbose}")
+execute_process(COMMAND ${CPackCommand} ${config_verbose} -G ${CPackGen} ${config_args}
     RESULT_VARIABLE CPack_result
     OUTPUT_VARIABLE CPack_output
     ERROR_VARIABLE CPack_error

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

Summary of changes:
 Modules/CPackRPM.cmake                             |   19 +++++++++++++++++++
 Source/kwsys/kwsysDateStamp.cmake                  |    2 +-
 .../RunCPackVerifyResult.cmake                     |   11 +++++++----
 3 files changed, 27 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake