1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: Fix duplication of .so files in preload_qml_imports.py

Browse Source 
The naive approach of "find_dependencies()" function, sometimes finds a
given plugin itself as its own dependency, which results in duplication
and wrong paths.
Remove the plugin from its own dependencies list if needed.

Task-number: QTBUG-121833
Change-Id: I4cf30233cfc291d360f69158bd12bd36024832be
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
This commit is contained in:
Piotr Wierciński 2024-02-07 17:02:13 +01:00
parent fb29033565
commit d21bfee667
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
util/wasm/preload/preload_qml_imports.py
View File

@ -44,25 +44,27 @@ def find_dependencies(filepath):
def extract_preload_files_from_imports(imports): def extract_preload_files_from_imports(imports):
libraries = [] libraries = []
files = []
for qml_import in imports: for qml_import in imports:
try: try:
relative_path = qml_import["relativePath"] relative_path = qml_import["relativePath"]
plugin = qml_import["plugin"] plugin = qml_import["plugin"]
# plugin .so # plugin .so
plugin_filename = "lib" + plugin + ".so"
so_plugin_source_path = os.path.join( so_plugin_source_path = os.path.join(
qt_qml_path, relative_path, "lib" + plugin + ".so" qt_qml_path, relative_path, plugin_filename
) )
so_plugin_destination_path = os.path.join( so_plugin_destination_path = os.path.join(
qt_deploy_qml_path, relative_path, "lib" + plugin + ".so" qt_deploy_qml_path, relative_path, plugin_filename
) )
preload_file(so_plugin_source_path, so_plugin_destination_path) preload_file(so_plugin_source_path, so_plugin_destination_path)
so_plugin_qt_install_path = os.path.join( so_plugin_qt_install_path = os.path.join(
qt_wasm_path, "qml", relative_path, "lib" + plugin + ".so" qt_wasm_path, "qml", relative_path, plugin_filename
) )
deps = find_dependencies(so_plugin_qt_install_path) deps = find_dependencies(so_plugin_qt_install_path)
if plugin_filename in deps: # sometimes plugin file itself is found as its dependency
deps.remove(plugin_filename)
libraries.extend(deps) libraries.extend(deps)
# qmldir file # qmldir file
@ -74,7 +76,7 @@ def extract_preload_files_from_imports(imports):
except Exception as e: except Exception as e:
eprint(e) eprint(e)
continue continue
return files, libraries return libraries
if __name__ == "__main__": if __name__ == "__main__":
@ -96,8 +98,7 @@ if __name__ == "__main__":
imports = json.loads(result.stdout) imports = json.loads(result.stdout)
preload_files = [] preload_files = []
libraries = [] libraries = extract_preload_files_from_imports(imports)
files, libraries = extract_preload_files_from_imports(imports)
# Deploy plugin dependencies, that is, shared libraries used by the plugins. # Deploy plugin dependencies, that is, shared libraries used by the plugins.
# Skip some of the obvious libraries which will be # Skip some of the obvious libraries which will be