[Cmake-commits] CMake branch, next, updated. v2.8.12-4971-g8125449

Brad King brad.king at kitware.com
Wed Nov 6 09:51:46 EST 2013


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  812544900eb401e5b5b6d366baaeec2b75418c20 (commit)
       via  a023a26cada4005fd57e5da9d9c132650594c594 (commit)
       via  fb332197bfabe5eb3b8dbd83d3d5c0d9032d71ca (commit)
       via  e1f819664b7d2c2a26342a2d277e95f194ed71d7 (commit)
       via  edc7cc967dbec540bdb333a00e62581e010882c3 (commit)
      from  61c1981667d1140d94e4205e2beeb30de50850c4 (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=812544900eb401e5b5b6d366baaeec2b75418c20
commit 812544900eb401e5b5b6d366baaeec2b75418c20
Merge: 61c1981 a023a26
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 6 09:51:44 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 6 09:51:44 2013 -0500

    Merge topic 'doc-html-page-layout' into next
    
    a023a26 Help: Configure html favicon
    fb33219 Help: Configure html page navigation bars
    e1f8196 Help: Configure |version| replacement correctly
    edc7cc9 Help: Configure copyright year automatically


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a023a26cada4005fd57e5da9d9c132650594c594
commit a023a26cada4005fd57e5da9d9c132650594c594
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 15:33:20 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 5 08:59:02 2013 -0500

    Help: Configure html favicon

diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
index e8f5d8a..52f4a31 100644
--- a/Utilities/Sphinx/conf.py.in
+++ b/Utilities/Sphinx/conf.py.in
@@ -61,3 +61,4 @@ html_style = 'cmake.css'
 html_theme = 'default'
 html_title = 'CMake %s Documentation' % release
 html_short_title = '%s Documentation' % release
+html_favicon = 'cmake-favicon.ico'
diff --git a/Utilities/Sphinx/static/cmake-favicon.ico b/Utilities/Sphinx/static/cmake-favicon.ico
new file mode 100644
index 0000000..fce8f92
Binary files /dev/null and b/Utilities/Sphinx/static/cmake-favicon.ico differ

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb332197bfabe5eb3b8dbd83d3d5c0d9032d71ca
commit fb332197bfabe5eb3b8dbd83d3d5c0d9032d71ca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 14:17:43 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 5 08:58:56 2013 -0500

    Help: Configure html page navigation bars
    
    Add a small CMake logo to the left side of the header and footer
    navigation bars.  Set the html theme, title, and short title explicitly.

diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
index d8daee4..e8f5d8a 100644
--- a/Utilities/Sphinx/conf.py.in
+++ b/Utilities/Sphinx/conf.py.in
@@ -30,6 +30,7 @@ primary_domain = 'cmake'
 exclude_patterns = []
 
 extensions = ['cmake']
+templates_path = ['@conf_path@/templates']
 
 cmake_manuals = sorted(glob.glob(r'@conf_docs@/manual/*.rst'))
 cmake_manual_description = re.compile('^\.\. cmake-manual-description:(.*)$')
@@ -57,3 +58,6 @@ man_show_urls = False
 html_show_sourcelink = True
 html_static_path = ['@conf_path@/static']
 html_style = 'cmake.css'
+html_theme = 'default'
+html_title = 'CMake %s Documentation' % release
+html_short_title = '%s Documentation' % release
diff --git a/Utilities/Sphinx/static/cmake-logo-16.png b/Utilities/Sphinx/static/cmake-logo-16.png
new file mode 100644
index 0000000..2039c25
Binary files /dev/null and b/Utilities/Sphinx/static/cmake-logo-16.png differ
diff --git a/Utilities/Sphinx/templates/layout.html b/Utilities/Sphinx/templates/layout.html
new file mode 100644
index 0000000..635ace3
--- /dev/null
+++ b/Utilities/Sphinx/templates/layout.html
@@ -0,0 +1,13 @@
+{% extends "!layout.html" %}
+{% block rootrellink %}
+  <li>
+    <img src="{{ pathto('_static/cmake-logo-16.png', 1) }}" alt=""
+         style="vertical-align: middle; margin-top: -2px" />
+  </li>
+  <li>
+    <a href="http://www.cmake.org/">CMake</a>{{ reldelim1 }}
+  </li>
+  <li>
+    <a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>{{ reldelim1 }}
+  </li>
+{% endblock %}

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1f819664b7d2c2a26342a2d277e95f194ed71d7
commit e1f819664b7d2c2a26342a2d277e95f194ed71d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 14:14:29 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 4 14:22:27 2013 -0500

    Help: Configure |version| replacement correctly
    
    Fix our configuration of the Sphinx conf.py 'version' entry to refer
    to the correctly-spelled CMake_VERSION_(MAJOR|MINOR|PATCH) variables.

diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index ca1defc..3b0b335 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -38,7 +38,7 @@ endif()
 
 set(conf_docs "${CMake_SOURCE_DIR}/Help")
 set(conf_path "${CMAKE_CURRENT_SOURCE_DIR}")
-set(conf_version "${CMake_MAJOR_VERSION}.${CMake_MINOR_VERSION}.${CMake_PATCH_VERSION}")
+set(conf_version "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
 set(conf_release "${CMake_VERSION}")
 configure_file(conf.py.in conf.py @ONLY)
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=edc7cc967dbec540bdb333a00e62581e010882c3
commit edc7cc967dbec540bdb333a00e62581e010882c3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 13:36:41 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 4 14:22:23 2013 -0500

    Help: Configure copyright year automatically
    
    Teach our Sphinx conf.py to compute the copyright end year
    automatically.  Drop our hard-coded configuration for it.

diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index 35c62fb..ca1defc 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -38,7 +38,6 @@ endif()
 
 set(conf_docs "${CMake_SOURCE_DIR}/Help")
 set(conf_path "${CMAKE_CURRENT_SOURCE_DIR}")
-set(conf_copyright "2000-2013 Kitware, Inc.")
 set(conf_version "${CMake_MAJOR_VERSION}.${CMake_MINOR_VERSION}.${CMake_PATCH_VERSION}")
 set(conf_release "${CMake_VERSION}")
 configure_file(conf.py.in conf.py @ONLY)
diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
index ea00b78..d8daee4 100644
--- a/Utilities/Sphinx/conf.py.in
+++ b/Utilities/Sphinx/conf.py.in
@@ -13,14 +13,15 @@ import sys
 import os
 import re
 import glob
+import time
 
 sys.path.insert(0, r'@conf_path@')
 
 source_suffix = '.rst'
 master_doc = 'index'
-project = 'CMake'
-copyright = '@conf_copyright@'
 
+project = 'CMake'
+copyright = '2000-%s Kitware, Inc.' % time.strftime('%Y')
 version = '@conf_version@' # feature version
 release = '@conf_release@' # full version string
 

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

Summary of changes:
 Utilities/Sphinx/CMakeLists.txt           |    3 +--
 Utilities/Sphinx/conf.py.in               |   10 ++++++++--
 Utilities/Sphinx/static/cmake-favicon.ico |  Bin 0 -> 1150 bytes
 Utilities/Sphinx/static/cmake-logo-16.png |  Bin 0 -> 761 bytes
 Utilities/Sphinx/templates/layout.html    |   13 +++++++++++++
 5 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 Utilities/Sphinx/static/cmake-favicon.ico
 create mode 100644 Utilities/Sphinx/static/cmake-logo-16.png
 create mode 100644 Utilities/Sphinx/templates/layout.html


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list