1 files changed, 26 insertions, 9 deletions

diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index e804374..a705719 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -77,7 +77,7 @@ class PlatformSetup(object):
     standalone = 'OFF'
     unattended = 'OFF'
     universal = 'OFF'
-    project_name = 'Imprudence'
+    project_name = 'meta-impy'
     distcc = True
     cmake_opts = []
 
@@ -367,24 +367,32 @@ class LinuxSetup(UnixSetup):
                 cpus += m and int(m.group(1)) or 1
             return hosts, cpus
 
-        def mk_distcc_hosts():
+        def mk_distcc_hosts(basename, range, num_cpus):
             '''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/%d,lzo' % (basename, s, num_cpus) 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, 2)
+                    os.environ['DISTCC_HOSTS'] = hosts
+                if hostname.startswith('eniac'):
+                    hosts, job_count = mk_distcc_hosts('eniac', 71, 2)
+                    os.environ['DISTCC_HOSTS'] = hosts
             opts.extend(['-j', str(job_count)])
 
+            '''opts.extend(['-j', str(2)])'''
+
         if targets:
             targets = ' '.join(targets)
         else:
@@ -632,9 +640,9 @@ class WindowsSetup(PlatformSetup):
                 continue
             vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') +
                           ' --solution ' +
-                          os.path.join(build_dir,'Imprudence.sln') +
+                          os.path.join(build_dir,'meta-impy.sln') +
                           ' --config ' + self.build_type +
-                          ' --startup imprudence-bin')
+                          ' --startup meta-impy-bin')
             print 'Running %r in %r' % (vstool_cmd, getcwd())
             self.run(vstool_cmd)        
             print >> open(stamp, 'w'), self.build_type
@@ -694,7 +702,7 @@ Usage:   develop.py [options] [command [command-options]]
 
 Options:
   -h | --help           print this help message
-       --standalone     build standalone, without Linden prebuild libraries
+       --standalone     build standalone, without prebuild libraries
        --unattended     build unattended, do not invoke any tools requiring
                         a human response
        --universal      build a universal binary on Mac OS X (unsupported)
@@ -729,6 +737,15 @@ Examples:
 '''
 
 def main(arguments):
+    if os.getenv('DISTCC_DIR') is None:
+        distcc_dir = os.path.join(getcwd(), '.distcc')
+        if not os.path.exists(distcc_dir):
+            os.mkdir(distcc_dir)
+        print "setting DISTCC_DIR to %s" % distcc_dir
+        os.environ['DISTCC_DIR'] = distcc_dir
+    else:
+        print "DISTCC_DIR is set to %s" % os.getenv('DISTCC_DIR')
+
     setup = setup_platform[sys.platform]()
     try:
         opts, args = getopt.getopt(