Fix virtualenv activation on Windows.

bootstrap/bootstrap.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 import contextlib
 import logging
 import os
 import shutil
@@ skipping 127 matching lines @@
 
   if cur_deps is None:
     print '  Building new environment'
     # Add in bundled virtualenv lib
     sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'virtualenv'))
     import virtualenv  # pylint: disable=F0401
     virtualenv.create_environment(
         env, search_dirs=virtualenv.file_search_dirs())
 
   print '  Activating environment'
-  activate_this = os.path.join(env, 'bin', 'activate_this.py')
+  if not virtualenv.is_win:
+    activate_this = os.path.join(env, 'bin', 'activate_this.py')
+  else:
+    activate_this = os.path.join(env, 'Scripts', 'activate_this.py')

[iannucci, 2014/08/15 17:38:40]

thanks, I was meaning to do this but never got around to it.

could we do:

bin_dir = 'Scripts' if virtualenv.is_win else 'bin
...

?

[anatoly techtonik, 2014/08/15 19:36:11]

Done.

   execfile(activate_this, dict(__file__=activate_this))
 
   if cur_deps is None:
     print '  Installing deps'
     print_deps(deps, indent=2, with_implicit=False)
     install(deps)
     with open(manifest_path, 'wb') as f:
       f.write(repr(deps) + '\n')
 
   print 'Done creating environment'
 
 
 def main(args):
   parser = argparse.ArgumentParser()
   parser.add_argument('--deps_file', action='append',
                       help='Path to deps.pyl file (may be used multiple times)')
   parser.add_argument('env_path',
                       help='Path to place environment (default: %(default)s)',
                       default='ENV')
   opts = parser.parse_args(args)
 
   deps = merge_deps(opts.deps_file)
   activate_env(opts.env_path, deps)
 
 
 if __name__ == '__main__':
   logging.basicConfig()
   LOGGER.setLevel(logging.DEBUG)
   sys.exit(main(sys.argv[1:]))