[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5112-g1a3f1f2

[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  1a3f1f2c42f2d9880a86ea00c9060ef8fda81dda (commit)
       via  3bade75b02cd4989d0be5efc6547439eade22be9 (commit)
      from  706145cad5370aeabed6b7a05b37d7f960f8f6a4 (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=1a3f1f2c42f2d9880a86ea00c9060ef8fda81dda
commit 1a3f1f2c42f2d9880a86ea00c9060ef8fda81dda
Merge: 706145c 3bade75
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 13 09:21:32 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 13 09:21:32 2013 -0500

    Merge topic 'cmake-copyright-year' into next
    
    3bade75 Help: Parse Copyright.txt instead of using current year


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bade75b02cd4989d0be5efc6547439eade22be9
commit 3bade75b02cd4989d0be5efc6547439eade22be9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 13 09:18:57 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 13 09:18:57 2013 -0500

    Help: Parse Copyright.txt instead of using current year
    
    Configure our Sphinx conf.py with a copyright line extracted from
    Copyright.txt instead of using the year in which the documentation is
    built.  This will future-proof the reported copyright year range when
    building documentation for old versions.

diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index 3b0b335..5e0ef87 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -36,6 +36,15 @@ elseif(NOT SPHINX_EXECUTABLE)
   message(FATAL_ERROR "SPHINX_EXECUTABLE (sphinx-build) is not found!")
 endif()
 
+set(copyright_line_regex "^Copyright (2000-20[0-9][0-9] Kitware.*)")
+file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
+  LIMIT_COUNT 1 REGEX "${copyright_line_regex}")
+if(copyright_line MATCHES "${copyright_line_regex}")
+  set(conf_copyright "${CMAKE_MATCH_1}")
+else()
+  set(conf_copyright "Kitware, Inc.")
+endif()
+
 set(conf_docs "${CMake_SOURCE_DIR}/Help")
 set(conf_path "${CMAKE_CURRENT_SOURCE_DIR}")
 set(conf_version "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
index 52f4a31..ef622fd 100644
--- a/Utilities/Sphinx/conf.py.in
+++ b/Utilities/Sphinx/conf.py.in
@@ -13,7 +13,6 @@ import sys
 import os
 import re
 import glob
-import time
 
 sys.path.insert(0, r'@conf_path@')
 
@@ -21,7 +20,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 project = 'CMake'
-copyright = '2000-%s Kitware, Inc.' % time.strftime('%Y')
+copyright = '@conf_copyright@'
 version = '@conf_version@' # feature version
 release = '@conf_release@' # full version string
 

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

Summary of changes:
 Utilities/Sphinx/CMakeLists.txt |    9 +++++++++
 Utilities/Sphinx/conf.py.in     |    3 +--
 2 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake