diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-11-23 11:11:19 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-11-24 09:36:56 +0000 |
| commit | 07128078b9a61e709ecf20c4345b0a655a58fcd8 (patch) | |
| tree | c7d55af3a372f328ab7df863b8dad56b2d67a4a8 /scripts/build.py | |
| parent | 1c244bd6231d09d0f79c7e59cf389d27563d2307 (diff) | |
Integrate deployqtHelp_mac.sh into deployqt.py
For now this is a dummy integration by just calling the former from
the latter, which has the advantage that
- only one script needs to be used for all platforms
- passing just qmake instead of individual install paths is enough
also on macOS
Change-Id: Ie05077ada950addd287b87d88045605d3bddb48f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'scripts/build.py')
| -rwxr-xr-x | scripts/build.py | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/scripts/build.py b/scripts/build.py index 5a0ad996078..c9a6a2ce1b1 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -216,30 +216,15 @@ def build_qtcreatorcdbext(args, paths): paths.build) def deploy_qt(args, paths): - if common.is_mac_platform(): - script = os.path.join(paths.src, 'scripts', 'deployqtHelper_mac.sh') - app = os.path.join(paths.install, args.app_target) - # TODO this is wrong if Qt is set up non-standard - # TODO integrate deployqtHelper_mac.sh into deployqt.py, finally - qt_bins = os.path.join(paths.qt, 'bin') - qt_translations = os.path.join(paths.qt, 'translations') - qt_plugins = os.path.join(paths.qt, 'plugins') - qt_qml = os.path.join(paths.qt, 'qml') - env = dict(os.environ) - if paths.llvm: - env['LLVM_INSTALL_DIR'] = paths.llvm - common.check_print_call([script, app, qt_bins, qt_translations, qt_plugins, qt_qml], - paths.build, - env=env) - else: - cmd_args = ['python', '-u', os.path.join(paths.src, 'scripts', 'deployqt.py'), '-i'] - if paths.elfutils: - cmd_args.extend(['--elfutils-path', paths.elfutils]) - if paths.llvm: - cmd_args.extend(['--llvm-path', paths.llvm]) - exe = os.path.join(paths.install, 'bin', args.app_target) - common.check_print_call(cmd_args + [exe, os.path.join(paths.qt, 'bin', 'qmake')], - paths.build) + cmd_args = ['python', '-u', os.path.join(paths.src, 'scripts', 'deployqt.py'), '-i'] + if paths.elfutils: + cmd_args.extend(['--elfutils-path', paths.elfutils]) + if paths.llvm: + cmd_args.extend(['--llvm-path', paths.llvm]) + app = (os.path.join(paths.install, args.app_target) if common.is_mac_platform() + else os.path.join(paths.install, 'bin', args.app_target)) + common.check_print_call(cmd_args + [app, os.path.join(paths.qt, 'bin', 'qmake')], + paths.build) def package_qtcreator(args, paths): if not args.no_zip: |