diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2024-01-18 12:12:51 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2024-01-18 11:15:29 +0000 |
| commit | 399f7a1968c7d64580bdd209c4747a6979e07c93 (patch) | |
| tree | 482d789a18f1f5394f19fc6aca912b76ca415844 /scripts | |
| parent | 1cb58e80d82310994cabadb95d4637569092ae4e (diff) | |
| parent | 4e16d1a07d5c58d45ef1fb55c4a7d98cfcfb6c9f (diff) | |
Merge remote-tracking branch 'origin/qds/dev'
Change-Id: I5d593fc74785958886453dc0b452c25356a8c65f
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.py | 7 | ||||
| -rwxr-xr-x | scripts/build_plugin.py | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/scripts/build.py b/scripts/build.py index 6cd795a744..66d5d25d43 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -60,7 +60,8 @@ def get_arguments(): parser.add_argument('--no-cdb', help='Skip cdbextension and the python dependency packaging step (Windows)', action='store_true', default=(not common.is_windows_platform())) - parser.add_argument('--no-qbs', help='Skip building Qbs as part of Qt Creator', action='store_true', default=False); + parser.add_argument('--no-qbs', help='Skip building Qbs as part of Qt Creator', + action='store_true', default=False); parser.add_argument('--no-docs', help='Skip documentation generation', action='store_true', default=False) parser.add_argument('--no-build-date', help='Does not show build date in about dialog, for reproducible builds', @@ -75,6 +76,8 @@ def get_arguments(): action='store_true', default=False) parser.add_argument('--with-cpack', help='Create packages with cpack', action='store_true', default=False) + parser.add_argument('--with-sdk-tool', help='Builds a internal sdk-tool (not standalone) which is used in Qt Design Studio builds', + action='store_true', default=False) parser.add_argument('--add-path', help='Prepends a CMAKE_PREFIX_PATH to the build', action='append', dest='prefix_paths', default=[]) parser.add_argument('--add-module-path', help='Prepends a CMAKE_MODULE_PATH to the build', @@ -171,7 +174,7 @@ def build_qtcreator(args, paths): '-DWITH_DOCS=' + cmake_option(not args.no_docs), '-DBUILD_QBS=' + cmake_option(build_qbs), '-DBUILD_DEVELOPER_DOCS=' + cmake_option(not args.no_docs), - '-DBUILD_EXECUTABLE_SDKTOOL=OFF', + '-DBUILD_EXECUTABLE_SDKTOOL=' + cmake_option(args.with_sdk_tool), '-DQTC_FORCE_XCB=ON', '-DWITH_TESTS=' + cmake_option(args.with_tests)] cmake_args += common_cmake_arguments(args) diff --git a/scripts/build_plugin.py b/scripts/build_plugin.py index 4f4ddfdcb0..9469fc5dfe 100755 --- a/scripts/build_plugin.py +++ b/scripts/build_plugin.py @@ -147,15 +147,15 @@ def package(args, paths): if common.is_windows_platform() and args.sign_command: command = shlex.split(args.sign_command) common.check_print_call(command + [paths.install]) - common.check_print_call(['7z', 'a', '-mmt2', os.path.join(paths.result, args.name + '.7z'), '*'], + common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, os.path.join(paths.result, args.name + '.7z'), '*'], paths.install) if os.path.exists(paths.dev_install): # some plugins might not provide anything in Devel - common.check_print_call(['7z', 'a', '-mmt2', + common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, os.path.join(paths.result, args.name + '_dev.7z'), '*'], paths.dev_install) # check for existence - the DebugInfo install target doesn't work for telemetry plugin if args.with_debug_info and os.path.exists(paths.debug_install): - common.check_print_call(['7z', 'a', '-mmt2', + common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, os.path.join(paths.result, args.name + '-debug.7z'), '*'], paths.debug_install) if common.is_mac_platform() and common.codesign_call(): |