Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-23 09:08:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

sim_vehicle.py : change default number of jobs

Browse Source 
By default waf use the max num of proc available. So let it set jobs by
itself. On contrary, with make only use one job by default.
This commit is contained in:
Pierre Kancir 2016-05-11 18:15:30 +02:00 committed by Lucas De Marchi
parent aa974399d0
commit 03e565ee47
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tools/autotest/sim_vehicle.py
View File

@ -172,7 +172,7 @@ group_build = optparse.OptionGroup(parser, "Build options")
group_build.add_option("-N", "--no-rebuild", action='store_true', default=False, help="don't rebuild before starting ardupilot") group_build.add_option("-N", "--no-rebuild", action='store_true', default=False, help="don't rebuild before starting ardupilot")
group_build.add_option("-D", "--debug", action='store_true', default=False, help="build with debugging") group_build.add_option("-D", "--debug", action='store_true', default=False, help="build with debugging")
group_build.add_option("-c", "--clean", action='store_true', default=False, help='do a make clean before building') group_build.add_option("-c", "--clean", action='store_true', default=False, help='do a make clean before building')
group_build.add_option("-j", "--jobs", default=1, type='int', help='number of processors to use during build (default 1)') group_build.add_option("-j", "--jobs", default=None, type='int', help='number of processors to use during build (default for waf : number of processor, for make : 1)')
group_build.add_option("-b", "--build-target", default=None, type='string', help='override SITL build target') group_build.add_option("-b", "--build-target", default=None, type='string', help='override SITL build target')
group_build.add_option("-s", "--build-system", default="waf", type='choice', choices=["make", "waf"], help='build system to use') group_build.add_option("-s", "--build-system", default="waf", type='choice', choices=["make", "waf"], help='build system to use')
group_build.add_option("", "--no-rebuild-on-failure", dest="rebuild_on_failure", action='store_false', default=True, help='if build fails, do not clean and rebuild') group_build.add_option("", "--no-rebuild-on-failure", dest="rebuild_on_failure", action='store_false', default=True, help='if build fails, do not clean and rebuild')
@ -406,7 +406,10 @@ def do_build_waf(vehicledir, opts, frame_options):
if opts.clean: if opts.clean:
run_cmd_blocking("Building clean", [waf_light, "clean"]) run_cmd_blocking("Building clean", [waf_light, "clean"])
cmd_build = [waf_light, "-j", str(opts.jobs), "build", "--target", frame_options["waf_target"] ] cmd_build = [waf_light, "build", "--target", frame_options["waf_target"]]
if opts.jobs is not None:
cmd_build += ['-j', str(opts.jobs)]
progress_cmd("Building", cmd_build) progress_cmd("Building", cmd_build)
p = subprocess.Popen(cmd_build) p = subprocess.Popen(cmd_build)
pid, sts = os.waitpid(p.pid,0) pid, sts = os.waitpid(p.pid,0)
@ -446,7 +449,10 @@ def do_build(vehicledir, opts, frame_options):
if opts.debug: if opts.debug:
build_target += "-debug" build_target += "-debug"
build_cmd = ["make", "-j"+str(opts.jobs), build_target] build_cmd = ["make", build_target]
if opts.jobs is not None:
build_cmd += ['-j', str(opts.jobs)]
progress_cmd("Building %s" % (build_target), build_cmd) progress_cmd("Building %s" % (build_target), build_cmd)
p = subprocess.Popen(build_cmd) p = subprocess.Popen(build_cmd)