update Shell scripts and .cmake files copyright

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/scripts/updatecopyright.py b/scripts/updatecopyright.py
index d494316..3f3b8c8 100755 (executable)
--- a/scripts/updatecopyright.py
+++ b/scripts/updatecopyright.py
@@ -7,10 +7,10 @@ licenses = ['BSD', 'FDL', 'LGPL', 'LGPL3', 'LGPL21']
 lfiles = []
 for root, subdirs, files in os.walk(os.curdir):
     for sfile in files:
-        if sfile.endswith(('.cpp', '.h', '.js', '.qs', '.qml', '.ui', '.g')):
+        if sfile.endswith(('.cpp', '.h', '.js', '.qs', '.qml', '.ui', '.g', '.sh', '.cmake')):
             lfiles.append('%s/%s' % (root, sfile))
 
-def readlicense(sfile, replacestars):
+def readlicense(sfile, replacedashes, replacehashes):
     sheader = ''
     with open(sfile, 'r') as f:
         shouldappend = False
@@ -22,8 +22,10 @@ def readlicense(sfile, replacestars):
                 shouldappend = False
             if shouldappend:
                 sheader = '%s%s' % (sheader, sline)
-        if replacestars:
+        if replacedashes:
             sheader = sheader.replace('**', '--')
+        if replacehashes:
+            sheader = sheader.replace('**', '##')
     return sheader
 
 for sfile in lfiles:
@@ -31,8 +33,9 @@ for sfile in lfiles:
         scontent = f.read()
     for license in licenses:
         if ('$QT_BEGIN_LICENSE:%s$' % license) in scontent:
-            snewheader = readlicense('%s/header.%s' % (os.curdir, license), sfile.endswith('.g'))
-            soldheader = readlicense(sfile, False)
+            snewheader = readlicense('%s/header.%s' % (os.curdir, license),
+                sfile.endswith('.g'), sfile.endswith('.sh'))
+            soldheader = readlicense(sfile, False, False)
             snewcontent = scontent.replace(soldheader, snewheader)
             snewcontent = snewcontent.replace('2016-2019', '2016-2020')
             if not snewcontent == scontent:

diff --git a/src/core/global/qconfig.cpp.cmake b/src/core/global/qconfig.cpp.cmake
index 67c3965..f36b04b 100644 (file)
--- a/src/core/global/qconfig.cpp.cmake
+++ b/src/core/global/qconfig.cpp.cmake
@@ -1,27 +1,19 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2019 Ivailo Monev
+** Copyright (C) 2016-2020 Ivailo Monev
 **
 ** This file is part of the QtCore module of the Katie Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** This file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** As a special exception, The Qt Company gives you certain additional
 ** rights. These rights are described in The Qt Company LGPL Exception

diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake
index 97e92a6..7f0f27d 100644 (file)
--- a/src/core/global/qconfig.h.cmake
+++ b/src/core/global/qconfig.h.cmake
@@ -1,19 +1,19 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2019 Ivailo Monev
+** Copyright (C) 2016-2020 Ivailo Monev
 **
 ** This file is part of the QtCore module of the Katie Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
+**
 ** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** This file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** As a special exception, The Qt Company gives you certain additional
 ** rights. These rights are described in The Qt Company LGPL Exception

diff --git a/src/core/global/qglobal.h.cmake b/src/core/global/qglobal.h.cmake
index 14fc4b9..a1ee12f 100644 (file)
--- a/src/core/global/qglobal.h.cmake
+++ b/src/core/global/qglobal.h.cmake
@@ -1,19 +1,19 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2019 Ivailo Monev
+** Copyright (C) 2016-2020 Ivailo Monev
 **
 ** This file is part of the QtCore module of the Katie Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
+**
 ** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** This file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** As a special exception, The Qt Company gives you certain additional
 ** rights. These rights are described in The Qt Company LGPL Exception

diff --git a/src/declarative/qml/parser/make-parser.sh b/src/declarative/qml/parser/make-parser.sh
index b7031d2..3a2ed7d 100755 (executable)
--- a/src/declarative/qml/parser/make-parser.sh
+++ b/src/declarative/qml/parser/make-parser.sh
@@ -6,22 +6,14 @@
 ## This file is the build configuration utility of the Katie Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
 ##
 ## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+## This file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ##
 ## As a special exception, The Qt Company gives you certain additional
 ## rights. These rights are described in The Qt Company LGPL Exception

diff --git a/src/script/parser/make-parser.sh b/src/script/parser/make-parser.sh
index 2393ebc..2c175ab 100755 (executable)
--- a/src/script/parser/make-parser.sh
+++ b/src/script/parser/make-parser.sh
@@ -6,22 +6,14 @@
 ## This file is the build configuration utility of the Katie Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
 ##
 ## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+## This file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ##
 ## As a special exception, The Qt Company gives you certain additional
 ## rights. These rights are described in The Qt Company LGPL Exception

diff --git a/src/tools/lupdate/make-parser.sh b/src/tools/lupdate/make-parser.sh
index 225a82b..d07a062 100755 (executable)
--- a/src/tools/lupdate/make-parser.sh
+++ b/src/tools/lupdate/make-parser.sh
@@ -6,22 +6,14 @@
 ## This file is the build configuration utility of the Katie Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
 ##
 ## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+## This file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ##
 ## As a special exception, The Qt Company gives you certain additional
 ## rights. These rights are described in The Qt Company LGPL Exception

diff --git a/src/xml/kernel/make-parser.sh b/src/xml/kernel/make-parser.sh
index 22c630b..361f910 100755 (executable)
--- a/src/xml/kernel/make-parser.sh
+++ b/src/xml/kernel/make-parser.sh
@@ -6,22 +6,14 @@
 ## This file is the build configuration utility of the Katie Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
 ##
 ## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+## This file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ##
 ## As a special exception, The Qt Company gives you certain additional
 ## rights. These rights are described in The Qt Company LGPL Exception