diff options
author | Antti Kokko <antti.kokko@qt.io> | 2018-03-14 16:08:53 +0200 |
---|---|---|
committer | Antti Kokko <antti.kokko@qt.io> | 2018-05-23 05:51:29 +0000 |
commit | 3055eab4c65a45d292c76335a965777a019942bf (patch) | |
tree | a5cf31c0e8da31833a42b635a650e512f9de9abf /packaging-tools/sdkcomponent.py | |
parent | 98232f5c38c176394426221df01e10c99db2f852 (diff) |
Add support for unified packaging configuration
Add support to 'include_filter' parameter used in packaging
configuration to separate between commercial and lgpl build.
For example for license repository commercial and lgpl
licenses are marked 'include_filter: opensource' or
'include_filter: enterprise', components without the
include filter are always included.
Change-Id: I4ce81a79e7fdf2320eb4ae0f89dd950e84bd1f93
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'packaging-tools/sdkcomponent.py')
-rw-r--r-- | packaging-tools/sdkcomponent.py | 39 |
1 files changed, 14 insertions, 25 deletions
diff --git a/packaging-tools/sdkcomponent.py b/packaging-tools/sdkcomponent.py index b3fa22683..32510b35e 100644 --- a/packaging-tools/sdkcomponent.py +++ b/packaging-tools/sdkcomponent.py @@ -1,40 +1,27 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the release tools of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL$ +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ ## 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 Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/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 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. -## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. ## ## GNU General Public License Usage ## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3.0 as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU General Public License version 3.0 requirements will be -## met: http://www.gnu.org/copyleft/gpl.html. -## +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. ## ## $QT_END_LICENSE$ ## @@ -108,7 +95,8 @@ class SdkComponent: self.sorting_priority = bldinstallercommon.safe_config_key_fetch(target_config, section_name, 'sorting_priority') self.optional_for_offline = False self.key_value_substitution_list = key_value_substitution_list - self.archive_skip = False + self.archive_skip = False + self.include_filter = bldinstallercommon.safe_config_key_fetch(target_config, section_name, 'include_filter') if is_offline_build: tmp = bldinstallercommon.safe_config_key_fetch(target_config, section_name, 'optional_for_offline') for item in self.key_value_substitution_list: @@ -246,6 +234,7 @@ class SdkComponent: return if self.root_component: print ' Root component: ' + self.root_component + print ' Include filter: ' + self.include_filter print ' Target install base: ' + self.target_install_base print ' Version: ' + self.version print ' Version tag: ' + self.version_tag |