From 993b685676de7bd63c7e45d7b119acc2da9b2fc3 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 12 Nov 2013 15:56:36 -0500 Subject: [PATCH] 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. --- Copyright.txt | 3 ++- bootstrap | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Copyright.txt b/Copyright.txt index 83a2482c0..f78bf570f 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 2d44d6765..89d68d9ae 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