diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-25 09:45:11 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-25 13:05:48 +0100 |
commit | 190e263a013fd3df551233fa83c391dd4506ff88 (patch) | |
tree | c614b1b200023dbfdc9b8afeaa3c68e8a3fb74d8 /build_scripts | |
parent | 5d34d60418b15d4d6837d0a1333f2b57631309eb (diff) |
qp5_tool: Add option to run "build" only
This is useful for mimicking the COIN test environment.
Change-Id: I9a4567be171d940d6574c4135fabb2a8721bbd79
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'build_scripts')
-rw-r--r-- | build_scripts/qp5_tool.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/build_scripts/qp5_tool.py b/build_scripts/qp5_tool.py index 13e54e7de..9fc37a99b 100644 --- a/build_scripts/qp5_tool.py +++ b/build_scripts/qp5_tool.py @@ -293,7 +293,7 @@ def get_config_file(base_name): return config_file -def build(): +def build(target): """Run configure and build steps""" start_time = time.time() @@ -302,7 +302,7 @@ def build(): if not IS_WINDOWS and acceleration == Acceleration.INCREDIBUILD: arguments.append(INCREDIBUILD_CONSOLE) arguments.append('--avoid') # caching, v0.96.74 - arguments.extend([read_config_python_binary(), 'setup.py', 'install']) + arguments.extend([read_config_python_binary(), 'setup.py', target]) arguments.extend(read_config_build_arguments()) jobs = read_int_config(JOBS_KEY) if jobs > 1: @@ -352,6 +352,8 @@ def create_argument_parser(desc): parser.add_argument('--build', '-b', action='store_true', help='Build (configure + build)') parser.add_argument('--make', '-m', action='store_true', help='Make') + parser.add_argument('--no-install', '-n', action='store_true', + help='Run --build only, do not install') parser.add_argument('--Make', '-M', action='store_true', help='cmake + Make (continue broken build)') parser.add_argument('--test', '-t', action='store_true', @@ -415,7 +417,8 @@ if __name__ == '__main__': run_git(['pull', '--rebase']) if build_mode != BuildMode.NONE: - build() + target = 'build' if options.no_install else 'install' + build(target) if options.test: sys.exit(run_tests()) |