aboutsummaryrefslogtreecommitdiffstats
path: root/build_scripts
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-12-15 10:04:28 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-12-15 19:02:06 +0000
commit97f4b12a521358ca5af4ac983f35c202ba4acf38 (patch)
treeaebae19cd139a0b2ece6c9eb62e53fc5718c1bc2 /build_scripts
parent3577886cc80ff3d2efcaa47eeb6e1d307d5d5621 (diff)
Build system: Remove regeneration of the example resources
With the growing nummber of examples, this started to slow down the build process and produced warnings about the linguist example. It has been replaced by the tools/regenerate_example_resources.py script. Change-Id: Ia00ad35d8b3c0ecea62a497e1665b5b7ceb25e7b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit fa7695ec63dd61a03fb491f80c3cf5dcb9f0dd76) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'build_scripts')
-rw-r--r--build_scripts/platforms/unix.py8
-rw-r--r--build_scripts/platforms/windows_desktop.py9
-rw-r--r--build_scripts/utils.py15
3 files changed, 1 insertions, 31 deletions
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
index 8e5a5d584..7b2b716ac 100644
--- a/build_scripts/platforms/unix.py
+++ b/build_scripts/platforms/unix.py
@@ -47,7 +47,6 @@ from ..config import config
from ..options import OPTION
from ..qtinfo import QtInfo
from ..utils import copydir, copyfile, makefile
-from ..utils import regenerate_qt_resources
from ..versions import PYSIDE, SHIBOKEN
@@ -234,13 +233,6 @@ def prepare_packages_posix(self, vars):
copydir(os.path.join(self.script_dir, "examples"),
"{st_build_dir}/{st_package_name}/examples",
force=False, vars=vars, dir_filter_function=pycache_dir_filter)
- # Re-generate examples Qt resource files for Python 3
- # compatibility
- examples_path = "{st_build_dir}/{st_package_name}/examples".format(**vars)
- lib_execs_dir = QtInfo().lib_execs_dir
- pyside_rcc_path = f"{lib_execs_dir}/rcc"
- pyside_rcc_options = ['-g', 'python']
- regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options)
# Copy Qt libs to package
if OPTION["STANDALONE"]:
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py
index b393afcfe..f5b7feff2 100644
--- a/build_scripts/platforms/windows_desktop.py
+++ b/build_scripts/platforms/windows_desktop.py
@@ -44,7 +44,7 @@ import fnmatch
from ..config import config
from ..options import OPTION
from ..utils import copydir, copyfile, makefile
-from ..utils import regenerate_qt_resources, filter_match
+from ..utils import filter_match
from ..utils import download_and_extract_7z
from ..versions import PYSIDE, SHIBOKEN
@@ -220,13 +220,6 @@ def prepare_packages_win32(self, vars):
copydir(os.path.join(self.script_dir, "examples"),
"{st_build_dir}/{st_package_name}/examples",
force=False, vars=vars, dir_filter_function=pycache_dir_filter)
- # Re-generate examples Qt resource files for Python 3
- # compatibility
- examples_path = "{st_build_dir}/{st_package_name}/examples".format(
- **vars)
- pyside_rcc_path = "rcc.exe"
- pyside_rcc_options = ['-g', 'python']
- regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options)
if vars['ssl_libs_dir']:
# <ssl_libs>/* -> <setup>/{st_package_name}/openssl
diff --git a/build_scripts/utils.py b/build_scripts/utils.py
index 45e7bdcd7..1aacf42d1 100644
--- a/build_scripts/utils.py
+++ b/build_scripts/utils.py
@@ -488,21 +488,6 @@ def get_environment_from_batch_command(env_cmd, initial=None):
return result
-def regenerate_qt_resources(src, pyside_rcc_path, pyside_rcc_options):
- names = os.listdir(src)
- for name in names:
- srcname = os.path.join(src, name)
- if os.path.isdir(srcname):
- regenerate_qt_resources(srcname, pyside_rcc_path, pyside_rcc_options)
- elif srcname.endswith('.qrc'):
- # Replace last occurence of '.qrc' in srcname
- srcname_split = srcname.rsplit('.qrc', 1)
- dstname = '_rc.py'.join(srcname_split)
- if os.path.exists(dstname):
- log.info(f"Regenerating {dstname} from {os.path.basename(srcname)}")
- run_process([pyside_rcc_path] + pyside_rcc_options + [srcname, '-o', dstname])
-
-
def back_tick(cmd, ret_err=False):
"""
Run command `cmd`, return stdout, or stdout, stderr,