[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3496-ged1d4c8

[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  ed1d4c8b03234fe6433a5e106d1e81397178f54a (commit)
       via  f85f6a5e795e7c552944a885a1f5f978fa847433 (commit)
       via  351fd63ef5d8f24955b3e061fd43c1c9f1aa570d (commit)
      from  8867761fd70f7b0cc214561c18d40c47e561525d (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=ed1d4c8b03234fe6433a5e106d1e81397178f54a
commit ed1d4c8b03234fe6433a5e106d1e81397178f54a
Merge: 8867761 f85f6a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 30 09:23:15 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 30 09:23:15 2013 -0400

    Merge topic 'bash-completion-updates' into next
    
    f85f6a5 bash-completion: Fix/improve generator names extraction
    351fd63 bash-completion: Add -S,-SP options arguments completion


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f85f6a5e795e7c552944a885a1f5f978fa847433
commit f85f6a5e795e7c552944a885a1f5f978fa847433
Author:     Igor Murzov <e-mail at date.by>
AuthorDate: Tue Jul 30 02:39:53 2013 +0400
Commit:     Igor Murzov <e-mail at date.by>
CommitDate: Tue Jul 30 03:13:08 2013 +0400

    bash-completion: Fix/improve generator names extraction

diff --git a/Docs/bash-completion/cmake b/Docs/bash-completion/cmake
index 59b565a..5f33c09 100644
--- a/Docs/bash-completion/cmake
+++ b/Docs/bash-completion/cmake
@@ -100,11 +100,13 @@ _cmake()
             return
             ;;
         -G)
-            # FIXME: doesn't work properly
             local IFS=$'\n'
+            local quoted
+            printf -v quoted %q "$cur"
             COMPREPLY=( $( compgen -W '$( cmake --help 2>/dev/null | sed -n \
-                "/^.*[^ ].*= Generates/{s|^ *\(.*[^ ]\) *= Generates.*$|\1|;s| |\\\\ |g;p}" \
-                2>/dev/null )' -- "$cur" ) )
+                -e "1,/^Generators/d" \
+                -e "/^  *[^ =]/{s|^ *\([^=]*[^ =]\).*$|\1|;s| |\\\\ |g;p}" \
+                2>/dev/null )' -- "$quoted" ) )
             return
             ;;
         --help-command)
diff --git a/Docs/bash-completion/cpack b/Docs/bash-completion/cpack
index a0c1f83..51638c5 100644
--- a/Docs/bash-completion/cpack
+++ b/Docs/bash-completion/cpack
@@ -8,8 +8,8 @@ _cpack()
     case "$prev" in
         -G)
             COMPREPLY=( $( compgen -W '$( cpack --help 2>/dev/null |
-                grep "^  .*= .*" 2> /dev/null | grep -v "^  -" 2>/dev/null |
-                cut -d" " -f 3 )' -- "$cur" ) )
+                sed -e "1,/^Generators/d" -e "s|^ *\([^ ]*\) .*$|\1|" \
+                2>/dev/null )' -- "$cur" ) )
             return
             ;;
         -C)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=351fd63ef5d8f24955b3e061fd43c1c9f1aa570d
commit 351fd63ef5d8f24955b3e061fd43c1c9f1aa570d
Author:     Igor Murzov <e-mail at date.by>
AuthorDate: Tue Jul 30 02:32:17 2013 +0400
Commit:     Igor Murzov <e-mail at date.by>
CommitDate: Tue Jul 30 02:32:17 2013 +0400

    bash-completion: Add -S,-SP options arguments completion

diff --git a/Docs/bash-completion/ctest b/Docs/bash-completion/ctest
index 9707f62..7433d3d 100644
--- a/Docs/bash-completion/ctest
+++ b/Docs/bash-completion/ctest
@@ -54,7 +54,7 @@ _ctest()
             return
             ;;
         -S|--script|-SP|--script-new-process)
-            # FIXME ?
+            _filedir '@(cmake|ctest)'
             return
             ;;
         --interactive-debug-mode)

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

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


hooks/post-receive
-- 
CMake