Merge branch 'master' into yaml

This commit is contained in:
Radovan Bast 2016-04-18 17:00:50 +02:00
commit 950ff76bd5
4 changed files with 7 additions and 10 deletions

View File

@ -1,4 +1,4 @@
Copyright (c) 2015-2016, Jonas Juselius and Radovan Bast Copyright (c) 2015-2016 by Radovan Bast, Jonas Juselius, and contributors.
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without

View File

@ -52,8 +52,8 @@ master_doc = 'index'
# General information about the project. # General information about the project.
project = u'Autocmake' project = u'Autocmake'
copyright = u'2015, Radovan Bast and Jonas Juselius' copyright = u'2015-2016, Radovan Bast, Jonas Juselius, and contributors'
author = u'Radovan Bast and Jonas Juselius' author = u'Radovan Bast, Jonas Juselius, and contributors'
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the

View File

@ -1,8 +1,3 @@
# Copyright (c) 2015 by Radovan Bast and Jonas Juselius
# See https://github.com/scisoft/autocmake/blob/master/LICENSE
import os import os
import sys import sys

View File

@ -6,6 +6,8 @@ import datetime
import ast import ast
import collections import collections
__version__ = 'X.Y.Z'
# we do not use the nicer sys.version_info.major # we do not use the nicer sys.version_info.major
# for compatibility with Python < 2.7 # for compatibility with Python < 2.7
if sys.version_info[0] > 2: if sys.version_info[0] > 2:
@ -179,8 +181,8 @@ def autogenerated_notice():
current_year = datetime.date.today().year current_year = datetime.date.today().year
year_range = '2015-{0}'.format(current_year) year_range = '2015-{0}'.format(current_year)
s = [] s = []
s.append('# This file is autogenerated by Autocmake http://autocmake.org') s.append('# This file is autogenerated by Autocmake v{0} http://autocmake.org'.format(__version__))
s.append('# Copyright (c) {0} by Radovan Bast and Jonas Juselius'.format(year_range)) s.append('# Copyright (c) {0} by Radovan Bast, Jonas Juselius, and contributors.'.format(year_range))
return '\n'.join(s) return '\n'.join(s)
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------