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

cmake build: Re-add a "Dependencies" component that runs deploy script

Browse Source 
And use that from the build script.

Change-Id: I97d5b593cf703bb8e51556240f37c80aad654732
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2020-11-23 14:36:16 +01:00
parent 5cd057d9fe
commit d04355dfb0
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build.py
+3 -12
View File
@@ -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__':