Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

merge from default

--HG--
branch : production-0.8
  • Loading branch information...
commit e1a4fe9c97cc893a307529e8fbd981a8b33d55f3 2 parents 1cdc256 + 2f1f662
Hal Wine authored December 21, 2012

Showing 1 changed file with 9 additions and 1 deletion. Show diff stats Hide diff stats

  1. 10  misc.py
10  misc.py
@@ -2465,13 +2465,21 @@ def generateSpiderMonkeyObjects(project, config, SLAVES):
2465 2465
             for a in factory_platform_args:
2466 2466
                 if a in pf:
2467 2467
                     factory_kwargs[a] = pf[a]
  2468
+            factory_kwargs['env'] = env
  2469
+
  2470
+            extra_args = [ '-r', WithProperties("%(revision)s") ]
  2471
+            for url in config['branchconfig']['base_mirror_urls']:
  2472
+                extra_args += [ '-m', "%s/%s" % (url, config['repo_path']) ]
  2473
+            for url in config['branchconfig']['base_bundle_urls']:
  2474
+                extra_args += [ '-b', "%s/%s.hg" % (url, config['repo_path']) ]
  2475
+            extra_args += [variant]
2468 2476
 
2469 2477
             f = ScriptFactory(
2470 2478
                     config['scripts_repo'],
2471 2479
                     'scripts/spidermonkey_builds/spidermonkey.sh',
2472 2480
                     interpreter=interpreter,
2473 2481
                     log_eval_func=rc_eval_func({1: WARNINGS}),
2474  
-                    extra_args=(variant,),
  2482
+                    extra_args=tuple(extra_args),
2475 2483
                     script_timeout=3600,
2476 2484
                     **factory_kwargs
2477 2485
                     )

0 notes on commit e1a4fe9

Please sign in to comment.
Something went wrong with that request. Please try again.