diff options
Diffstat (limited to 'build_scripts/platforms')
| -rw-r--r-- | build_scripts/platforms/linux.py | 47 | ||||
| -rw-r--r-- | build_scripts/platforms/macos.py | 79 | ||||
| -rw-r--r-- | build_scripts/platforms/unix.py | 11 | ||||
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 84 |
4 files changed, 106 insertions, 115 deletions
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py index 067179cdc..e1c2dd5a1 100644 --- a/build_scripts/platforms/linux.py +++ b/build_scripts/platforms/linux.py @@ -75,8 +75,7 @@ def prepare_standalone_package_linux(self, vars): # Check if ICU libraries were copied over to the destination # Qt libdir. resolved_destination_lib_dir = destination_lib_dir.format(**vars) - maybe_icu_libs = find_files_using_glob(resolved_destination_lib_dir, - "libicu*") + maybe_icu_libs = find_files_using_glob(resolved_destination_lib_dir, "libicu*") # If no ICU libraries are present in the Qt libdir (like when # Qt is built against system ICU, or in the Coin CI where ICU @@ -90,43 +89,43 @@ def prepare_standalone_package_linux(self, vars): if self.is_webengine_built(built_modules): copydir("{qt_lib_execs_dir}", - "{st_build_dir}/{st_package_name}/Qt/libexec", - filter=None, - recursive=False, - vars=vars) + "{st_build_dir}/{st_package_name}/Qt/libexec", + filter=None, + recursive=False, + vars=vars) copydir("{qt_prefix_dir}/resources", - "{st_build_dir}/{st_package_name}/Qt/resources", - filter=None, - recursive=False, - vars=vars) + "{st_build_dir}/{st_package_name}/Qt/resources", + filter=None, + recursive=False, + vars=vars) if copy_plugins: # <qt>/plugins/* -> <setup>/{st_package_name}/Qt/plugins copydir("{qt_plugins_dir}", - "{st_build_dir}/{st_package_name}/Qt/plugins", - filter=["*.so"], - recursive=True, - vars=vars) + "{st_build_dir}/{st_package_name}/Qt/plugins", + filter=["*.so"], + recursive=True, + vars=vars) if copy_qml: # <qt>/qml/* -> <setup>/{st_package_name}/Qt/qml copydir("{qt_qml_dir}", - "{st_build_dir}/{st_package_name}/Qt/qml", - filter=None, - force=False, - recursive=True, - ignore=["*.so.debug"], - vars=vars) + "{st_build_dir}/{st_package_name}/Qt/qml", + filter=None, + force=False, + recursive=True, + ignore=["*.so.debug"], + vars=vars) if copy_translations: # <qt>/translations/* -> # <setup>/{st_package_name}/Qt/translations copydir("{qt_translations_dir}", - "{st_build_dir}/{st_package_name}/Qt/translations", - filter=["*.qm", "*.pak"], - force=False, - vars=vars) + "{st_build_dir}/{st_package_name}/Qt/translations", + filter=["*.qm", "*.pak"], + force=False, + vars=vars) if copy_qt_conf: # Copy the qt.conf file to libexec. diff --git a/build_scripts/platforms/macos.py b/build_scripts/platforms/macos.py index 49f02754d..159364d9a 100644 --- a/build_scripts/platforms/macos.py +++ b/build_scripts/platforms/macos.py @@ -81,8 +81,8 @@ def prepare_standalone_package_macos(self, vars): if self.qt_is_framework_build(): def framework_dir_filter(dir_name, parent_full_path, dir_full_path): if '.framework' in dir_name: - if (dir_name.startswith('QtWebEngine') and - not self.is_webengine_built(built_modules)): + if (dir_name.startswith('QtWebEngine') + and not self.is_webengine_built(built_modules)): return False if constrain_modules and dir_name not in constrain_frameworks: return False @@ -95,8 +95,7 @@ def prepare_standalone_package_macos(self, vars): return False if dir_full_path.endswith('Versions/5/Helpers'): return False - return general_dir_filter(dir_name, parent_full_path, - dir_full_path) + return general_dir_filter(dir_name, parent_full_path, dir_full_path) # Filter out debug frameworks in the # debug_and_release config. @@ -112,18 +111,17 @@ def prepare_standalone_package_macos(self, vars): return True copydir("{qt_lib_dir}", "{st_build_dir}/{st_package_name}/Qt/lib", - recursive=True, vars=vars, - ignore=["*.la", "*.a", "*.cmake", "*.pc", "*.prl"], - dir_filter_function=framework_dir_filter, - file_filter_function=framework_variant_filter) + recursive=True, vars=vars, + ignore=["*.la", "*.a", "*.cmake", "*.pc", "*.prl"], + dir_filter_function=framework_dir_filter, + file_filter_function=framework_variant_filter) # Fix rpath for WebEngine process executable. The already # present rpath does not work because it assumes a symlink # from Versions/5/Helpers, thus adding two more levels of # directory hierarchy. if self.is_webengine_built(built_modules): - qt_lib_path = "{st_build_dir}/{st_package_name}/Qt/lib".format( - **vars) + qt_lib_path = "{st_build_dir}/{st_package_name}/Qt/lib".format(**vars) bundle = "QtWebEngineCore.framework/Helpers/" bundle += "QtWebEngineProcess.app" binary = "Contents/MacOS/QtWebEngineProcess" @@ -142,24 +140,24 @@ def prepare_standalone_package_macos(self, vars): accepted_modules = ["libQt5" + module + "*.5.dylib" for module in constrain_modules] copydir("{qt_lib_dir}", - "{st_build_dir}/{st_package_name}/Qt/lib", - filter=accepted_modules, - ignore=ignored_modules, - file_filter_function=file_variant_filter, - recursive=True, vars=vars, force_copy_symlinks=True) + "{st_build_dir}/{st_package_name}/Qt/lib", + filter=accepted_modules, + ignore=ignored_modules, + file_filter_function=file_variant_filter, + recursive=True, vars=vars, force_copy_symlinks=True) if self.is_webengine_built(built_modules): copydir("{qt_lib_execs_dir}", - "{st_build_dir}/{st_package_name}/Qt/libexec", - filter=None, - recursive=False, - vars=vars) + "{st_build_dir}/{st_package_name}/Qt/libexec", + filter=None, + recursive=False, + vars=vars) copydir("{qt_prefix_dir}/resources", - "{st_build_dir}/{st_package_name}/Qt/resources", - filter=None, - recursive=False, - vars=vars) + "{st_build_dir}/{st_package_name}/Qt/resources", + filter=None, + recursive=False, + vars=vars) # Fix rpath for WebEngine process executable. qt_libexec_path = "{st_build_dir}/{st_package_name}/Qt/libexec".format(**vars) @@ -178,30 +176,29 @@ def prepare_standalone_package_macos(self, vars): if copy_plugins: # <qt>/plugins/* -> <setup>/{st_package_name}/Qt/plugins copydir("{qt_plugins_dir}", - "{st_build_dir}/{st_package_name}/Qt/plugins", - filter=["*.dylib"], - recursive=True, - dir_filter_function=general_dir_filter, - file_filter_function=file_variant_filter, - vars=vars) - + "{st_build_dir}/{st_package_name}/Qt/plugins", + filter=["*.dylib"], + recursive=True, + dir_filter_function=general_dir_filter, + file_filter_function=file_variant_filter, + vars=vars) if copy_qml: # <qt>/qml/* -> <setup>/{st_package_name}/Qt/qml copydir("{qt_qml_dir}", - "{st_build_dir}/{st_package_name}/Qt/qml", - filter=None, - recursive=True, - force=False, - dir_filter_function=general_dir_filter, - file_filter_function=file_variant_filter, - vars=vars) + "{st_build_dir}/{st_package_name}/Qt/qml", + filter=None, + recursive=True, + force=False, + dir_filter_function=general_dir_filter, + file_filter_function=file_variant_filter, + vars=vars) if copy_translations: # <qt>/translations/* -> # <setup>/{st_package_name}/Qt/translations copydir("{qt_translations_dir}", - "{st_build_dir}/{st_package_name}/Qt/translations", - filter=["*.qm", "*.pak"], - force=False, - vars=vars) + "{st_build_dir}/{st_package_name}/Qt/translations", + filter=["*.qm", "*.pak"], + force=False, + vars=vars) diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 9327e8bd7..7f9a6ba94 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -45,7 +45,7 @@ from .macos import prepare_standalone_package_macos from ..config import config from ..options import * -from ..utils import copydir, copyfile, rmtree, makefile +from ..utils import copydir, copyfile, makefile from ..utils import regenerate_qt_resources @@ -203,13 +203,10 @@ def prepare_packages_posix(self, vars): # Re-generate examples Qt resource files for Python 3 # compatibility if sys.version_info[0] == 3: - examples_path = "{st_build_dir}/{st_package_name}/examples".format( - **vars) - pyside_rcc_path = "{install_dir}/bin/rcc".format( - **vars) + examples_path = "{st_build_dir}/{st_package_name}/examples".format(**vars) + pyside_rcc_path = "{install_dir}/bin/rcc".format(**vars) pyside_rcc_options = ['-g', 'python'] - regenerate_qt_resources(examples_path, pyside_rcc_path, - pyside_rcc_options) + 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 a5a5b8fd2..0e7dd766f 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 * -from ..utils import copydir, copyfile, rmtree, makefile +from ..utils import copydir, copyfile, makefile from ..utils import regenerate_qt_resources, filter_match from ..utils import download_and_extract_7z @@ -223,16 +223,15 @@ def prepare_packages_win32(self, vars): pyside_rcc_path = "{install_dir}/bin/rcc.exe".format( **vars) pyside_rcc_options = ['-g', 'python'] - regenerate_qt_resources(examples_path, pyside_rcc_path, - pyside_rcc_options) + regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) if vars['ssl_libs_dir']: # <ssl_libs>/* -> <setup>/{st_package_name}/openssl copydir("{ssl_libs_dir}", "{st_build_dir}/{st_package_name}/openssl", - filter=[ - "libeay32.dll", - "ssleay32.dll"], - force=False, vars=vars) + filter=[ + "libeay32.dll", + "ssleay32.dll"], + force=False, vars=vars) if config.is_internal_shiboken_module_build(): # The C++ std library dlls need to be packaged with the @@ -382,19 +381,21 @@ def copy_qt_artifacts(self, copy_pdbs, vars): # e.g. "/home/work/qt/qtbase/bin" file_path_dir_name = os.path.dirname(file_full_path) # e.g. "Qt5Coredd" - maybe_debug_name = file_base_name + 'd' + maybe_debug_name = "{}d".format(file_base_name) if self.debug: filter = debug - def predicate(path): return not os.path.exists(path) + + def predicate(path): + return not os.path.exists(path) else: filter = release - def predicate(path): return os.path.exists(path) + + def predicate(path): + return os.path.exists(path) # e.g. "/home/work/qt/qtbase/bin/Qt5Coredd.dll" - other_config_path = os.path.join(file_path_dir_name, - maybe_debug_name + file_ext) + other_config_path = os.path.join(file_path_dir_name, maybe_debug_name + file_ext) - if (filter_match(file_name, filter) and - predicate(other_config_path)): + if (filter_match(file_name, filter) and predicate(other_config_path)): return True return False @@ -411,19 +412,18 @@ def copy_qt_artifacts(self, copy_pdbs, vars): pdb_pattern = "*{}.pdb" if copy_pdbs: plugin_dll_patterns += [pdb_pattern] - plugin_dll_filter = functools.partial(qt_build_config_filter, - plugin_dll_patterns) + plugin_dll_filter = functools.partial(qt_build_config_filter, plugin_dll_patterns) copydir("{qt_plugins_dir}", "{st_build_dir}/{st_package_name}/plugins", - file_filter_function=plugin_dll_filter, - vars=vars) + file_filter_function=plugin_dll_filter, + vars=vars) if copy_translations: # <qt>/translations/* -> <setup>/{st_package_name}/translations copydir("{qt_translations_dir}", - "{st_build_dir}/{st_package_name}/translations", - filter=["*.qm", "*.pak"], - force=False, - vars=vars) + "{st_build_dir}/{st_package_name}/translations", + filter=["*.qm", "*.pak"], + force=False, + vars=vars) if copy_qml: # <qt>/qml/* -> <setup>/{st_package_name}/qml @@ -433,43 +433,41 @@ def copy_qt_artifacts(self, copy_pdbs, vars): # Copy all files that are not dlls and pdbs (.qml, qmldir). copydir("{qt_qml_dir}", "{st_build_dir}/{st_package_name}/qml", - ignore=qml_ignore, - force=False, - recursive=True, - vars=vars) + ignore=qml_ignore, + force=False, + recursive=True, + vars=vars) if copy_pdbs: qml_dll_patterns += [pdb_pattern] - qml_dll_filter = functools.partial(qt_build_config_filter, - qml_dll_patterns) + qml_dll_filter = functools.partial(qt_build_config_filter, qml_dll_patterns) # Copy all dlls (and possibly pdbs). copydir("{qt_qml_dir}", "{st_build_dir}/{st_package_name}/qml", - file_filter_function=qml_dll_filter, - force=False, - recursive=True, - vars=vars) + file_filter_function=qml_dll_filter, + force=False, + recursive=True, + vars=vars) if self.is_webengine_built(built_modules): copydir("{qt_prefix_dir}/resources", - "{st_build_dir}/{st_package_name}/resources", - filter=None, - recursive=False, - vars=vars) + "{st_build_dir}/{st_package_name}/resources", + filter=None, + recursive=False, + vars=vars) filter = 'QtWebEngineProcess{}.exe'.format( 'd' if self.debug else '') copydir("{qt_bin_dir}", - "{st_build_dir}/{st_package_name}", - filter=[filter], - recursive=False, vars=vars) + "{st_build_dir}/{st_package_name}", + filter=[filter], + recursive=False, vars=vars) if copy_qt_conf: # Copy the qt.conf file to prefix dir. - copyfile( - "{build_dir}/pyside2/{st_package_name}/qt.conf", - "{st_build_dir}/{st_package_name}", - vars=vars) + copyfile("{build_dir}/pyside2/{st_package_name}/qt.conf", + "{st_build_dir}/{st_package_name}", + vars=vars) if copy_clang: self.prepare_standalone_clang(is_win=True) |