[Cmake-commits] CMake branch, next, updated. v2.8.7-1947-g0da55e0

[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  0da55e05a9e6aabcf806f2fb0c79465c5ffbf5e7 (commit)
       via  4d253d1a9d9ec3b3a1f38cb2a490da998f88482a (commit)
       via  df224727cfcc233fbe36417e48f2e5fee01c73ee (commit)
      from  835d6f3e2d8fea1d1c7f4179f362235d1e5d4d8d (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=0da55e05a9e6aabcf806f2fb0c79465c5ffbf5e7
commit 0da55e05a9e6aabcf806f2fb0c79465c5ffbf5e7
Merge: 835d6f3 4d253d1
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Tue Jan 3 12:15:46 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 3 12:15:46 2012 -0500

    Merge topic 'CMake-bash-completion-enhance' into next
    
    4d253d1 Enhance bash completion file for cmake and ctest
    df22472 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d253d1a9d9ec3b3a1f38cb2a490da998f88482a
commit 4d253d1a9d9ec3b3a1f38cb2a490da998f88482a
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Tue Jan 3 18:12:56 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Tue Jan 3 18:12:56 2012 +0100

    Enhance bash completion file for cmake and ctest
    
    - filter out cmake/ctest version line
    - provide -R as -E completion with ctest

diff --git a/Docs/cmake-completion b/Docs/cmake-completion
index 011f3fa..d82d608 100644
--- a/Docs/cmake-completion
+++ b/Docs/cmake-completion
@@ -51,13 +51,20 @@ _cmake()
             COMPREPLY=( $(compgen -W "${running}" -- ${cur}) )
             return 0
             ;;
+        # FIXME: don't know how to handle multi words completion
+        # or more precisely word that contains space in them like "Unix Makefiles"
+	# -G)
+        #     local running=$(for x in `cmake --help | grep "^  .*=\ .*" | grep -v "^  -" | cut -d"=" -f 1 | grep -v "^   "`; do echo \"${x}\" ; done )
+        #     COMPREPLY=( $(compgen -W "${running}" -- ${cur}) )
+        #     return 0
+        #     ;;
         --help-command)
-            local running=$(for x in `cmake --help-command-list`; do echo ${x} ; done )
+            local running=$(for x in `cmake --help-command-list | grep -v "cmake version"`; do echo ${x} ; done )
             COMPREPLY=( $(compgen -W "${running}" -- ${cur}) )
             return 0
             ;;
         --help-module)
-            local running=$(for x in `cmake --help-module-list`; do echo ${x} ; done )
+            local running=$(for x in `cmake --help-module-list | grep -v "cmake version"`; do echo ${x} ; done )
             COMPREPLY=( $(compgen -W "${running}" -- ${cur}) )
             return 0
             ;;
@@ -67,12 +74,12 @@ _cmake()
             return 0
             ;;
          --help-property)
-            local running=$(for x in `cmake --help-property-list`; do echo ${x} ; done )
+            local running=$(for x in `cmake --help-property-list | grep -v "cmake version"`; do echo ${x} ; done )
             COMPREPLY=( $(compgen -W "${running}" -- ${cur}) )
             return 0
             ;;
          --help-variable)
-            local running=$(for x in `cmake --help-variable-list`; do echo ${x} ; done )
+            local running=$(for x in `cmake --help-variable-list | grep -v "cmake version"`; do echo ${x} ; done )
             COMPREPLY=( $(compgen -W "${running}" -- ${cur}) )
             return 0
             ;;
@@ -128,14 +135,14 @@ _cpack()
     esac
 
     #
-    # Complete the option (Level 0 - right after cmake)
+    # Complete the option (Level 0 - right after cpack)
     #
     COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 } &&
 complete -F _cpack -o default cpack
 
 #
-# cmake command
+# ctest command
 #
 # have ctest &&
 _ctest()
@@ -156,11 +163,11 @@ _ctest()
     #
     case "${prev}" in
         --help-command)
-            local running=$(for x in `ctest --help-command-list`; do echo ${x} ; done )
+            local running=$(for x in `ctest --help-command-list | grep -v "ctest version" `; do echo ${x} ; done )
             COMPREPLY=( $(compgen -W "${running}" -- ${cur}) )
             return 0
             ;;
-        -R)
+        -R|-E)
             local running=$(for x in `ctest -N 2> /dev/null | grep "^  Test" | cut -d: -f 2`; do echo ${x} ; done )
             COMPREPLY=( $(compgen -W "${running}" -- ${cur}) )
             return 0
@@ -187,4 +194,4 @@ complete -F _ctest -o default ctest
 # sh-indent-comment: t
 # indent-tabs-mode: nil
 # End:
-# ex: ts=4 sw=4 et filetype=sh
\ No newline at end of file
+# ex: ts=4 sw=4 et filetype=sh

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

Summary of changes:
 Docs/cmake-completion             |   25 ++++++++++++++++---------
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake