Skip to content
Snippets Groups Projects
Commit 21a8d1f6 authored by Christian Goetze's avatar Christian Goetze
Browse files

Make develop.py work on eniacs the same way it works on stations

parent 0f4bd162
No related branches found
No related tags found
No related merge requests found
......@@ -370,22 +370,27 @@ def count_distcc_hosts():
cpus += m and int(m.group(1)) or 1
return hosts, cpus
def mk_distcc_hosts():
def mk_distcc_hosts(basename, range):
'''Generate a list of LL-internal machines to build on.'''
loc_entry, cpus = localhost()
hosts = [loc_entry]
dead = []
stations = [s for s in xrange(36) if s not in dead]
stations = [s for s in xrange(range) if s not in dead]
random.shuffle(stations)
hosts += ['station%d.lindenlab.com/2,lzo' % s for s in stations]
hosts += ['%s%d.lindenlab.com/2,lzo' % (basename, s) for s in stations]
cpus += 2 * len(stations)
return ' '.join(hosts), cpus
if job_count is None:
hosts, job_count = count_distcc_hosts()
if hosts == 1 and socket.gethostname().startswith('station'):
hosts, job_count = mk_distcc_hosts()
os.putenv('DISTCC_HOSTS', hosts)
if hosts == 1:
hostname = socket.gethostname()
if hostname.startswith('station'):
hosts, job_count = mk_distcc_hosts('station', 36)
os.putenv('DISTCC_HOSTS', hosts)
if hostname.startswith('eniac'):
hosts, job_count = mk_distcc_hosts('eniac', 64)
os.putenv('DISTCC_HOSTS', hosts)
opts.extend(['-j', str(job_count)])
if targets:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment