[Cmake-commits] CMake branch, next, updated. v3.0.0-4340-g4d25272

[Stephen Kelly]

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  4d25272e7e1682b85164434e55fadf06e16e99f8 (commit)
       via  376ba93588e1dd24cb091c61f9fe635bceaf0a82 (commit)
      from  ae1c1cf713b58f9fc88fe4853c7fb8de2f8a8dfe (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=4d25272e7e1682b85164434e55fadf06e16e99f8
commit 4d25272e7e1682b85164434e55fadf06e16e99f8
Merge: ae1c1cf 376ba93
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 17 10:06:11 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 17 10:06:11 2014 -0400

    Merge topic 'identify-qthelp-artifacts' into next
    
    376ba935 Help: Identify more artifact types in QtHelp documentation.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=376ba93588e1dd24cb091c61f9fe635bceaf0a82
commit 376ba93588e1dd24cb091c61f9fe635bceaf0a82
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jun 18 17:12:53 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jul 17 16:05:10 2014 +0200

    Help: Identify more artifact types in QtHelp documentation.
    
    Add identifiers for variables, properties, policies and modules.
    This will allow QtCreator to show relevant documentation if it learns
    more about the context of the contents of cmake files.

diff --git a/Utilities/Sphinx/create_identifiers.py b/Utilities/Sphinx/create_identifiers.py
index 4db7a3f..7715e53 100755
--- a/Utilities/Sphinx/create_identifiers.py
+++ b/Utilities/Sphinx/create_identifiers.py
@@ -19,13 +19,27 @@ if not lines:
 newlines = []
 
 for line in lines:
-  if "<keyword name=\"command\"" in line:
-    if not "id=\"" in line:
-      prefix = "<keyword name=\"command\" "
-      part1, part2 = line.split(prefix)
-      head, tail = part2.split("#command:")
-      cmdname, rest = tail.split("\"")
-      line = part1 + prefix + "id=\"command/" + cmdname + "\" " + part2
+
+  mapping = (("command", "command"),
+             ("variable", "variable"),
+             ("target property", "prop_tgt"),
+             ("test property", "prop_test"),
+             ("source file property", "prop_sf"),
+             ("global property", "prop_gbl"),
+             ("module", "module"),
+             ("directory property", "prop_dir"),
+             ("cache property", "prop_cache"),
+             ("policy", "policy"),
+             ("installed file property", "prop_inst"))
+
+  for domain_object_string, domain_object_type in mapping:
+    if "<keyword name=\"" + domain_object_string + "\"" in line:
+      if not "id=\"" in line:
+        prefix = "<keyword name=\"" + domain_object_string + "\" "
+        part1, part2 = line.split(prefix)
+        head, tail = part2.split("#" + domain_object_type + ":")
+        domain_object, rest = tail.split("\"")
+        line = part1 + prefix + "id=\"" + domain_object_type + "/" + domain_object + "\" " + part2
   newlines.append(line + "\n")
 
 f = open(name, "w")

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

Summary of changes:
 Utilities/Sphinx/create_identifiers.py |   28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake