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 4f961c752d9e4ee67cec0ce41e1f7ebd7d84f828 (commit)
via 2bbf6bd7f880ee618dd1260d784ba88b042dbf89 (commit)
via 3ee67d0df93a37c3026e857be48b9dfdd580062f (commit)
via 621ba1fd04bae0a450da91887308a5647f071892 (commit)
via 993b685676de7bd63c7e45d7b119acc2da9b2fc3 (commit)
from ab729468f655c94b6471cc9c0fd69ebf6babdf2b (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=4f961c752d9e4ee67cec0ce41e1f7ebd7d84f828
commit 4f961c752d9e4ee67cec0ce41e1f7ebd7d84f828
Merge: ab72946 2bbf6bd
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 12 16:39:33 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Nov 12 16:39:33 2013 -0500
Merge topic 'cmake-copyright-year' into next
2bbf6bd Copyright.txt: Add test to check year range
3ee67d0 Copyright.txt: Update year range to end in 2013
621ba1f cmake-gui: Parse Copyright.txt instead of duplicating notice
993b685 bootstrap: Parse Copyright.txt instead of duplicating notice
diff --cc Source/QtDialog/CMakeLists.txt
index b17e212,ee0b831..f1f4649
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@@ -111,8 -111,11 +111,11 @@@ if(Qt_BIN_DIR
endif()
if(APPLE)
+ file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
+ LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
+
set_target_properties(cmake-gui PROPERTIES
- OUTPUT_NAME ${CMAKE_BUNDLE_NAME}
+ OUTPUT_NAME CMake
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in"
MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_BUNDLE_VERSION}"
# TBD: MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_BUNDLE_VERSION}"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bbf6bd7f880ee618dd1260d784ba88b042dbf89
commit 2bbf6bd7f880ee618dd1260d784ba88b042dbf89
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 12 16:13:02 2013 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 12 16:35:26 2013 -0500
Copyright.txt: Add test to check year range
Add a CMake.Copyright test that, when the CMake version number knows the
year (as it does in development versions), checks that Copyright.txt has
been updated with the current version year.
diff --git a/Tests/CMakeCopyright.cmake b/Tests/CMakeCopyright.cmake
new file mode 100644
index 0000000..a7201e9
--- /dev/null
+++ b/Tests/CMakeCopyright.cmake
@@ -0,0 +1,22 @@
+if(CMAKE_VERSION MATCHES "\\.(20[0-9][0-9])[0-9][0-9][0-9][0-9](-|$)")
+ set(version_year "${CMAKE_MATCH_1}")
+ set(copyright_line_regex "^Copyright 2000-(20[0-9][0-9]) Kitware")
+ file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../Copyright.txt" copyright_line
+ LIMIT_COUNT 1 REGEX "${copyright_line_regex}")
+ if(copyright_line MATCHES "${copyright_line_regex}")
+ set(copyright_year "${CMAKE_MATCH_1}")
+ if(copyright_year LESS version_year)
+ message(FATAL_ERROR "Copyright.txt contains\n"
+ " ${copyright_line}\n"
+ "but the current version year is ${version_year}.")
+ else()
+ message(STATUS "PASSED: Copyright.txt contains\n"
+ " ${copyright_line}\n"
+ "and the current version year is ${version_year}.")
+ endif()
+ else()
+ message(FATAL_ERROR "Copyright.txt has no Copyright line of expected
format!")
+ endif()
+else()
+ message(STATUS "SKIPPED: CMAKE_VERSION does not know the year:
${CMAKE_VERSION}")
+endif()
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d4a55fc..063ad11 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -161,6 +161,9 @@ if(BUILD_TESTING)
set(CMAKE_LONG_TEST_TIMEOUT 1500)
endif()
+ add_test(NAME CMake.Copyright
+ COMMAND cmake -P ${CMAKE_CURRENT_SOURCE_DIR}/CMakeCopyright.cmake)
+
# add a bunch of standard build-and-test style tests
ADD_TEST_MACRO(CommandLineTest CommandLineTest)
ADD_TEST_MACRO(FindPackageTest FindPackageTest)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ee67d0df93a37c3026e857be48b9dfdd580062f
commit 3ee67d0df93a37c3026e857be48b9dfdd580062f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 12 14:51:20 2013 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 12 16:35:26 2013 -0500
Copyright.txt: Update year range to end in 2013
diff --git a/Copyright.txt b/Copyright.txt
index f78bf57..9342249 100644
--- a/Copyright.txt
+++ b/Copyright.txt
@@ -1,5 +1,5 @@
CMake - Cross Platform Makefile Generator
-Copyright 2000-2011 Kitware, Inc.
+Copyright 2000-2013 Kitware, Inc.
Copyright 2000-2011 Insight Software Consortium
All rights reserved.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=621ba1fd04bae0a450da91887308a5647f071892
commit 621ba1fd04bae0a450da91887308a5647f071892
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 12 16:32:14 2013 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 12 16:35:17 2013 -0500
cmake-gui: Parse Copyright.txt instead of duplicating notice
Set the cmake-gui MACOSX_BUNDLE_COPYRIGHT property by parsing the
copyright notice line out of Copyright.txt instead of duplicating it.
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 88a9fc9..ee0b831 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -111,12 +111,15 @@ if(Qt_BIN_DIR)
endif()
if(APPLE)
+ file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
+ LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
+
set_target_properties(cmake-gui PROPERTIES
OUTPUT_NAME ${CMAKE_BUNDLE_NAME}
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in"
MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_BUNDLE_VERSION}"
# TBD: MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_BUNDLE_VERSION}"
- MACOSX_BUNDLE_COPYRIGHT "Copyright 2000-2013 Kitware, Inc."
+ MACOSX_BUNDLE_COPYRIGHT "${copyright_line}"
)
# Create a symlink in the build tree to provide a "cmake-gui" next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=993b685676de7bd63c7e45d7b119acc2da9b2fc3
commit 993b685676de7bd63c7e45d7b119acc2da9b2fc3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 12 15:56:36 2013 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 12 16:22:52 2013 -0500
bootstrap: Parse Copyright.txt instead of duplicating notice
Use 'grep' to extract the copyright notice from Copyright.txt instead of
duplicating it in the bootstrap script.
diff --git a/Copyright.txt b/Copyright.txt
index 83a2482..f78bf57 100644
--- a/Copyright.txt
+++ b/Copyright.txt
@@ -1,5 +1,6 @@
CMake - Cross Platform Makefile Generator
-Copyright 2000-2011 Kitware, Inc., Insight Software Consortium
+Copyright 2000-2011 Kitware, Inc.
+Copyright 2000-2011 Insight Software Consortium
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/bootstrap b/bootstrap
index 2d44d67..89d68d9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -62,6 +62,8 @@ if [ "$cmake_version_rc" != "" ]; then
cmake_version="${cmake_version}-rc${cmake_version_rc}"
fi
+cmake_copyright="`grep '^Copyright .* Kitware'
"${cmake_source_dir}/Copyright.txt"`"
+
cmake_data_dir_keyword="OTHER"
cmake_doc_dir_keyword="OTHER"
cmake_man_dir_keyword="OTHER"
@@ -402,7 +404,7 @@ Directory and file names:
# Display CMake bootstrap usage
cmake_version_display()
{
- echo "CMake ${cmake_version}, Copyright 2000-2012 Kitware, Inc."
+ echo "CMake ${cmake_version}, ${cmake_copyright}"
}
# Display CMake bootstrap error, display the log file and exit
-----------------------------------------------------------------------
Summary of changes:
Copyright.txt | 3 ++-
Source/QtDialog/CMakeLists.txt | 5 ++++-
Tests/CMakeCopyright.cmake | 22 ++++++++++++++++++++++
Tests/CMakeLists.txt | 3 +++
bootstrap | 4 +++-
5 files changed, 34 insertions(+), 3 deletions(-)
create mode 100644 Tests/CMakeCopyright.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
