[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4327-g18b0f44

[Brad King]

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  18b0f44dbdd0fdd07aa9ddcd0d0e72bc55e81c64 (commit)
       via  c5ee80b693f899e1595011c98b4550810f027712 (commit)
      from  8a5a07b0d82aeb95b6f5623b9528efeec11017ca (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=18b0f44dbdd0fdd07aa9ddcd0d0e72bc55e81c64
commit 18b0f44dbdd0fdd07aa9ddcd0d0e72bc55e81c64
Merge: 8a5a07b c5ee80b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 25 11:39:59 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 25 11:39:59 2013 -0400

    Merge topic 'bash-completion-future-filter' into next
    
    c5ee80b bash-completion: Future-proof --help-*-list "cmake version" filtering

diff --cc Docs/bash-completion/cmake
index b90cce5,59e0298..abc5de5
--- a/Docs/bash-completion/cmake
+++ b/Docs/bash-completion/cmake
@@@ -131,14 -131,9 +131,14 @@@ _cmake(
              ;;
           --help-variable)
              COMPREPLY=( $( compgen -W '$( cmake --help-variable-list \
-                 2>/dev/null | tail -n +2 )' -- "$cur" ) )
+                 2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) )
              return
              ;;
 +         --help-concept)
 +            COMPREPLY=( $( compgen -W '$( cmake --help-concept-list \
 +                2>/dev/null | tail -n +2 )' -- "$cur" ) )
 +            return
 +            ;;
      esac
  
      $split && return

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5ee80b693f899e1595011c98b4550810f027712
commit c5ee80b693f899e1595011c98b4550810f027712
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 23 13:31:03 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 25 11:35:12 2013 -0400

    bash-completion: Future-proof --help-*-list "cmake version" filtering
    
    A future version of CMake may not print the "cmake version" line at the
    beginning of the --help-*-list output.  Filter out the line with 'grep'
    instead of 'tail' to tolerate output from versions of CMake with and
    without the version line.

diff --git a/Docs/bash-completion/cmake b/Docs/bash-completion/cmake
index 5f33c09..59e0298 100644
--- a/Docs/bash-completion/cmake
+++ b/Docs/bash-completion/cmake
@@ -111,12 +111,12 @@ _cmake()
             ;;
         --help-command)
             COMPREPLY=( $( compgen -W '$( cmake --help-command-list 2>/dev/null|
-                tail -n +2 )' -- "$cur" ) )
+                grep -v "^cmake version " )' -- "$cur" ) )
             return
             ;;
         --help-module)
             COMPREPLY=( $( compgen -W '$( cmake --help-module-list 2>/dev/null|
-                tail -n +2 )' -- "$cur" ) )
+                grep -v "^cmake version " )' -- "$cur" ) )
             return
             ;;
          --help-policy)
@@ -126,12 +126,12 @@ _cmake()
             ;;
          --help-property)
             COMPREPLY=( $( compgen -W '$( cmake --help-property-list \
-                2>/dev/null | tail -n +2 )' -- "$cur" ) )
+                2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) )
             return
             ;;
          --help-variable)
             COMPREPLY=( $( compgen -W '$( cmake --help-variable-list \
-                2>/dev/null | tail -n +2 )' -- "$cur" ) )
+                2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) )
             return
             ;;
     esac
diff --git a/Docs/bash-completion/cpack b/Docs/bash-completion/cpack
index 51638c5..e3f611e 100644
--- a/Docs/bash-completion/cpack
+++ b/Docs/bash-completion/cpack
@@ -20,7 +20,7 @@ _cpack()
         -D)
             [[ $cur == *=* ]] && return # no completion for values
             COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \
-                2>/dev/null | tail -n +2 )' -S = -- "$cur" ) )
+                2>/dev/null | grep -v "^cmake version " )' -S = -- "$cur" ) )
             compopt -o nospace
             return
             ;;
@@ -38,12 +38,12 @@ _cpack()
             ;;
         --help-command)
             COMPREPLY=( $( compgen -W '$( cpack --help-command-list 2>/dev/null|
-                tail -n +2 )' -- "$cur" ) )
+                grep -v "^cmake version " )' -- "$cur" ) )
             return
             ;;
         --help-variable)
             COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \
-                2>/dev/null | tail -n +2 )' -- "$cur" ) )
+                2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) )
             return
             ;;
     esac
diff --git a/Docs/bash-completion/ctest b/Docs/bash-completion/ctest
index 7433d3d..0158a54 100644
--- a/Docs/bash-completion/ctest
+++ b/Docs/bash-completion/ctest
@@ -63,7 +63,7 @@ _ctest()
             ;;
         --help-command)
             COMPREPLY=( $( compgen -W '$( ctest --help-command-list 2>/dev/null|
-                tail -n +2 )' -- "$cur" ) )
+                grep -v "^cmake version " )' -- "$cur" ) )
             return
             ;;
     esac

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

Summary of changes:
 Docs/bash-completion/cmake |    8 ++++----
 Docs/bash-completion/cpack |    6 +++---
 Docs/bash-completion/ctest |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake