aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Kokko <antti.kokko@qt.io>2021-12-17 08:39:23 +0000
committerAntti Kokko <antti.kokko@qt.io>2021-12-17 08:39:47 +0000
commitbbf5847973ed0a3abac612264cd16e230da89bfc (patch)
treea0076bd7c1b657f648f4e0a5c8955d03a827a0cc
parentf21670e66deca92d21ceed33857033b6a4bd3191 (diff)
Revert "Add support for creating translation .qm files for component"v5.15.8-lts-packaging
This reverts commit f21670e66deca92d21ceed33857033b6a4bd3191. Reason for revert: causes problems, reverting. Change-Id: Ia492d6890852acaab70d3448e3551362d82352c0 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
-rw-r--r--packaging-tools/create_installer.py9
-rw-r--r--[-rwxr-xr-x]packaging-tools/update_component_translations.sh0
2 files changed, 1 insertions, 8 deletions
diff --git a/packaging-tools/create_installer.py b/packaging-tools/create_installer.py
index 15b016fc6..9c57d1d7f 100644
--- a/packaging-tools/create_installer.py
+++ b/packaging-tools/create_installer.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
#############################################################################
##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the release tools of the Qt Toolkit.
@@ -966,10 +966,6 @@ def create_target_components(target_config):
print '= Creating SDK components'
print '================================================================='
print ''
- # download and extract lrelease binary for creating translation binaries
- if not os.path.isfile(os.path.join(SCRIPT_ROOT_DIR, "lrelease")) and bldinstallercommon.is_linux_platform():
- bld_utils.download(os.environ.get("LRELEASE_TOOL"), SCRIPT_ROOT_DIR)
- bldinstallercommon.extract_file(os.path.basename(os.environ.get("LRELEASE_TOOL")), SCRIPT_ROOT_DIR)
getComponentDataWork = ThreadedWork("get components data")
for sdk_component in SDK_COMPONENT_LIST:
# check first for top level component
@@ -989,9 +985,6 @@ def create_target_components(target_config):
# Copy Meta data
metadata_content_source_root = os.path.normpath(sdk_component.pkg_template_dir + os.sep + 'meta')
bldinstallercommon.copy_tree(metadata_content_source_root, meta_dir_dest)
- if CREATE_REPOSITORY and os.path.isfile(os.path.join(SCRIPT_ROOT_DIR, "lrelease")):
- # create translation binaries, files are created if translation source files exist for component
- subprocess.check_call([os.path.join(SCRIPT_ROOT_DIR, "update_component_translations.sh"), "-r", os.path.join(SCRIPT_ROOT_DIR, "lrelease"), dest_base])
# add files into tag substitution
GENERAL_TAG_SUBST_LIST.append(meta_dir_dest)
# handle archives
diff --git a/packaging-tools/update_component_translations.sh b/packaging-tools/update_component_translations.sh
index 970aa69aa..970aa69aa 100755..100644
--- a/packaging-tools/update_component_translations.sh
+++ b/packaging-tools/update_component_translations.sh