Move Googlers to gs:// based toolchain pull

win_toolchain/toolchain2013.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 """Extracts a Windows VS2013 toolchain from various downloadable pieces."""
 
 
 import ctypes
 import json
@@ skipping 88 matching lines @@
     sys.stdout.write('Cleaning up temporaries...\n')
   for temp in g_temp_dirs:
     # shutil.rmtree errors out on read only attributes.
     RunOrDie('rmdir /s/q "%s"' % temp)
   g_temp_dirs = []
 
 
 def GetMainIsoUrl(pro):
   """Gets the main .iso URL.
 
-  If |pro| is False, downloads the Express edition. If |CHROME_HEADLESS| is
-  set in the environment, then we assume we're on an internal bot, and download
-  from internal google storage instead.
+  If |pro| is False, downloads the Express edition.
   """
   prefix = 'http://download.microsoft.com/download/'
   if pro:
     return (prefix +
         'A/F/1/AF128362-A6A8-4DB3-A39A-C348086472CC/VS2013_RTM_PRO_ENU.iso')
   else:
     return (prefix +
         '7/2/E/72E0F986-D247-4289-B9DC-C4FB07374894/VS2013_RTM_DskExp_ENU.iso')
 
 
@@ skipping 127 matching lines @@
     self.wdk_path = wdk_path
 
 
 def GetSourceImages(local_dir, pro):
   """Downloads the various sources that we need.
 
   Of note: Because Express does not include ATL, there's an additional download
   of the 7.1 WDK which is the latest publically accessible source for ATL. When
   |pro| this is not necessary (and CHROME_HEADLESS always implies Pro).
   """
+  if pro and not local_dir:
+    sys.exit('Non-Express must be used with --local')
   url = GetMainIsoUrl(pro)
   if local_dir:
     wdk_path = (os.path.join(local_dir, os.path.basename(WDK_ISO_URL))
                 if not pro else None)
     return SourceImages(os.path.join(local_dir, os.path.basename(url)),
                         os.path.join(local_dir, 'Standalone'),
                         wdk_path=wdk_path)
   else:
     # Note that we do the SDK first, as it might cause an elevation prompt.
     sdk8_path = DownloadSDK8()
@@ skipping 172 matching lines @@
                     default=os.path.join(BASEDIR, 'win_toolchain_2013'))
   parser.add_option('--noclean', action='store_false', dest='clean',
                     help='do not remove temp files',
                     default=True)
   parser.add_option('--local', metavar='DIR',
                     help='use downloaded files from DIR')
   parser.add_option('--express',
                     help='use VS Express instead of Pro', action='store_true')
   parser.add_option('--sha1',
                     help='tree sha1 that can be used to mirror an internal '
-                         'copy (used if --bot-mode)')
-  parser.add_option('--bot-mode',
+                         'copy (used if --use-gs)')
+  parser.add_option('--use-gs',
                     help='Use internal servers to pull isos',
                     default=bool(int(os.environ.get('CHROME_HEADLESS', 0))),
                     action='store_true')
   options, _ = parser.parse_args()
   try:
     target_dir = os.path.abspath(options.targetdir)
     if os.path.exists(target_dir):
       parser.error('%s already exists. Please [re]move it or use '
                   '--targetdir to select a different target.\n' %
                   target_dir)
     # Set the working directory to 7z subdirectory. 7-zip doesn't find its
     # codec dll very well, so this is the simplest way to make sure it runs
     # correctly, as we don't otherwise care about working directory.
     os.chdir(os.path.join(BASEDIR, '7z'))
-    if options.bot_mode and options.sha1:
+    if options.use_gs and options.sha1:
       options.express = False
       DoTreeMirror(target_dir, options.sha1)
     else:
       images = GetSourceImages(options.local, not options.express)
       extracted = ExtractComponents(images)
       CopyToFinalLocation(extracted, target_dir)
       GenerateSetEnvCmd(target_dir, not options.express)
 
     data = {
         'path': target_dir,
         'version': '2013e' if options.express else '2013',
         'win8sdk': os.path.join(target_dir, 'win8sdk'),
         'wdk': os.path.join(target_dir, 'wdk'),
         'runtime_dirs': [
           os.path.join(target_dir, 'sys64'),
           os.path.join(target_dir, 'sys32'),
         ],
     }
     with open(os.path.join(target_dir, '..', 'data.json'), 'w') as f:
       json.dump(data, f)
   finally:
     if options.clean:
       DeleteAllTempDirs()
 
 
 if __name__ == '__main__':
   sys.exit(main())