feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qds: add Qt Shade Baker binary

Browse Source 
Task-number: QDS-11387
Change-Id: Ibea4c241fcaaecffc7f3a29b8fc68fda442c5104
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tim Jenssen
2023-11-24 15:43:30 +01:00
parent e16a302a43
commit 49d3e6fddc
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/deploy.py
View File

@@ -147,20 +147,20 @@ def copy_qt_libs(target_qt_prefix_path, qt_bin_dir, qt_libs_dir):
shutil.copy(library, lib_dest) shutil.copy(library, lib_dest)
def deploy_qtdiag(qtc_binary_path, qt_install): def deploy_binary(binary_name, qtc_binary_path, qt_install):
print("Copying qtdiag") print(f"Copying {binary_name}")
qtdiag_src = os.path.join(qt_install.bin, with_exe_ext('qtdiag')) binary_src = os.path.join(qt_install.bin, with_exe_ext(binary_name))
destdir = (qtc_binary_path if common.is_windows_platform() destdir = (qtc_binary_path if common.is_windows_platform()
else os.path.join(qtc_binary_path, 'Contents', 'MacOS') if common.is_mac_platform() else os.path.join(qtc_binary_path, 'Contents', 'MacOS') if common.is_mac_platform()
else os.path.join(qtc_binary_path, '..', 'lib', 'Qt', 'bin')) else os.path.join(qtc_binary_path, '..', 'lib', 'Qt', 'bin'))
if not os.path.exists(destdir): if not os.path.exists(destdir):
os.makedirs(destdir) os.makedirs(destdir)
shutil.copy(qtdiag_src, destdir) shutil.copy(binary_src, destdir)
if common.is_mac_platform(): if common.is_mac_platform():
# fix RPATHs # fix RPATHs
qtdiag_dest = os.path.join(destdir, 'qtdiag') binary_dest = os.path.join(destdir, binary_name)
subprocess.check_call(['xcrun', 'install_name_tool', '-add_rpath', '@loader_path/../Frameworks', qtdiag_dest]) subprocess.check_call(['xcrun', 'install_name_tool', '-add_rpath', '@loader_path/../Frameworks', binary_dest])
subprocess.check_call(['xcrun', 'install_name_tool', '-delete_rpath', '@loader_path/../lib', qtdiag_dest]) subprocess.check_call(['xcrun', 'install_name_tool', '-delete_rpath', '@loader_path/../lib', binary_dest])
def deploy_plugins(qtc_binary_path, qt_install): def deploy_plugins(qtc_binary_path, qt_install):
@@ -469,7 +469,8 @@ def main():
qtcreator_binary_path = (args.qtcreator_binary if common.is_mac_platform() qtcreator_binary_path = (args.qtcreator_binary if common.is_mac_platform()
else os.path.dirname(args.qtcreator_binary)) else os.path.dirname(args.qtcreator_binary))
deploy_qtdiag(qtcreator_binary_path, qt_install) deploy_binary('qtdiag', qt_install)
deploy_binary('qsb', qt_install)
deploy_plugins(qtcreator_binary_path, qt_install) deploy_plugins(qtcreator_binary_path, qt_install)
deploy_imports(qtcreator_binary_path, qt_install) deploy_imports(qtcreator_binary_path, qt_install)
deploy_translations(qtcreator_binary_path, qt_install) deploy_translations(qtcreator_binary_path, qt_install)