diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-11-23 14:36:16 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-11-24 14:10:07 +0000 |
| commit | d04355dfb0aa444f5f6352d1b7126a0278807b78 (patch) | |
| tree | 104af6b1ed6685eb1c11e99d0f66eab45eaf7417 /scripts | |
| parent | 5cd057d9fe28a94b8d1aec1592c9c7d5ba7288f5 (diff) | |
| download | qt-creator-d04355dfb0aa444f5f6352d1b7126a0278807b78.tar.gz | |
cmake build: Re-add a "Dependencies" component that runs deploy script
And use that from the build script.
Change-Id: I97d5b593cf703bb8e51556240f37c80aad654732
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/scripts/build.py b/scripts/build.py index c9a6a2ce1b..c4b2e36cc7 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -174,6 +174,9 @@ def build_qtcreator(args, paths): common.check_print_call(['cmake', '--install', '.', '--prefix', paths.install, '--strip'], paths.build) + common.check_print_call(['cmake', '--install', '.', '--prefix', paths.install, + '--component', 'Dependencies'], + paths.build) common.check_print_call(['cmake', '--install', '.', '--prefix', paths.dev_install, '--component', 'Devel'], paths.build) @@ -215,17 +218,6 @@ def build_qtcreatorcdbext(args, paths): '--component', 'qtcreatorcdbext'], paths.build) -def deploy_qt(args, paths): - 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: common.check_print_call(['7z', 'a', '-mmt2', @@ -291,7 +283,6 @@ def main(): build_qtcreator(args, paths) build_wininterrupt(args, paths) build_qtcreatorcdbext(args, paths) - deploy_qt(args, paths) package_qtcreator(args, paths) if __name__ == '__main__': |