[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4334-g2e1370e

[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  2e1370e4bedf26ddb7dbf7d8176de483f0f770db (commit)
       via  fdbaafce4fa3de7c0106a47bc5cfcf57cacd038c (commit)
       via  a8d7141d2b39caa5d98cd85c9c656e2a7ae948e5 (commit)
      from  64087d26d276fa5dac7e0c9ad98d1782a8fa5153 (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=2e1370e4bedf26ddb7dbf7d8176de483f0f770db
commit 2e1370e4bedf26ddb7dbf7d8176de483f0f770db
Merge: 64087d2 fdbaafc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 25 16:21:55 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 25 16:21:55 2013 -0400

    Merge topic 'concepts-help' into next
    
    fdbaafc Merge branch 'bash-completion-future-filter' into concepts-help
    a8d7141 bash-completion: Future-proof --help-*-list "cXXXX version" filtering


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fdbaafce4fa3de7c0106a47bc5cfcf57cacd038c
commit fdbaafce4fa3de7c0106a47bc5cfcf57cacd038c
Merge: 98caac2 a8d7141
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 25 16:18:02 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 25 16:18:17 2013 -0400

    Merge branch 'bash-completion-future-filter' into concepts-help
    
    Resolve a logical conflict in Docs/bash-completion/cmake by applying the
    change from 'bash-completion-future-filter' to the new hunk added by
    'concepts-help'.

diff --cc Docs/bash-completion/cmake
index b90cce5,59e0298..ca04b2e
--- 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" ) )
++                2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) )
 +            return
 +            ;;
      esac
  
      $split && return

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8d7141d2b39caa5d98cd85c9c656e2a7ae948e5
commit a8d7141d2b39caa5d98cd85c9c656e2a7ae948e5
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 16:16:54 2013 -0400

    bash-completion: Future-proof --help-*-list "cXXXX 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.  Match "cmake version", "cpack version", and
    "ctest version" in each corresponding completion script.

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..9ab6048 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 "^cpack 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 "^cpack version " )' -- "$cur" ) )
             return
             ;;
         --help-variable)
             COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \
-                2>/dev/null | tail -n +2 )' -- "$cur" ) )
+                2>/dev/null | grep -v "^cpack version " )' -- "$cur" ) )
             return
             ;;
     esac
diff --git a/Docs/bash-completion/ctest b/Docs/bash-completion/ctest
index 7433d3d..25cb998 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 "^ctest version " )' -- "$cur" ) )
             return
             ;;
     esac

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

Summary of changes:


hooks/post-receive
-- 
CMake