Merge revision 13627 to trunk.

dart/editor/build/build.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import glob
 import optparse
 import os
 import re
 import shutil
 import subprocess
 import sys
 import tempfile
 import gsutil
 import ziputils
 import hashlib
 
 from os.path import join
 
 BUILD_OS = None
 DART_PATH = None
 TOOLS_PATH = None
+
 GSU_PATH_REV = None
+GSU_PATH_LATEST = None
 GSU_API_DOCS_PATH = None
 GSU_API_DOCS_BUCKET = 'gs://dartlang-api-docs'
-GSU_PATH_LATEST = None
+
 REVISION = None
+TRUNK_BUILD = None
+PLUGINS_BUILD = None
 
 utils = None
 
 class AntWrapper(object):
   """A wrapper for ant build invocations"""
 
   _antpath = None
   _bzippath = None
   _propertyfile = None
 
@@ skipping 146 matching lines @@
 
 def main():
   """Main entry point for the build program."""
   global BUILD_OS
   global DART_PATH
   global TOOLS_PATH
   global GSU_PATH_REV
   global GSU_API_DOCS_PATH
   global GSU_PATH_LATEST
   global REVISION
+  global TRUNK_BUILD
+  global PLUGINS_BUILD
   global utils
   
   if not sys.argv:
     print 'Script pathname not known, giving up.'
     return 1
 
   scriptdir = os.path.abspath(os.path.dirname(sys.argv[0]))
   editorpath = os.path.abspath(os.path.join(scriptdir, '..'))
   thirdpartypath = os.path.abspath(os.path.join(scriptdir, '..', '..',
                                                 'third_party'))
@@ skipping 93 matching lines @@
     # so the environemnt variables 'USER' Linux and Mac and
     # 'USERNAME' Windows were used.
     username = os.environ.get('USER')
     if username is None:
       username = os.environ.get('USERNAME')
 
     if username is None:
       PrintError('Could not find username')
       return 6
     
+    # dart-editor[-trunk], dart-editor-(win/mac/linux)[-trunk]
+    builder_name = str(options.name)
+
+    TRUNK_BUILD = builder_name.endswith("-trunk")
+    PLUGINS_BUILD = (builder_name == 'dart-editor' or
+                     builder_name == 'dart-editor-trunk')
+
     build_skip_tests = os.environ.get('DART_SKIP_RUNNING_TESTS')
     sdk_environment = os.environ
     if username.startswith('chrome'):
-      to_bucket = 'gs://dart-editor-archive-continuous'
+      if TRUNK_BUILD:
+        to_bucket = 'gs://dart-editor-archive-trunk'
+      else:
+        to_bucket = 'gs://dart-editor-archive-continuous'  
       running_on_buildbot = True
     else:
       to_bucket = 'gs://dart-editor-archive-testing'
       running_on_buildbot = False
       sdk_environment['DART_LOCAL_BUILD'] = 'dart-editor-archive-testing'
 
     REVISION = options.revision
     GSU_PATH_REV = '%s/%s' % (to_bucket, options.revision)
     GSU_PATH_LATEST = '%s/%s' % (to_bucket, 'latest')
     GSU_API_DOCS_PATH = '%s/%s' % (GSU_API_DOCS_BUCKET, options.revision)
 
     homegsutil = join(DART_PATH, 'third_party', 'gsutil', 'gsutil')
     gsu = gsutil.GsUtil(False, homegsutil, running_on_buildbot=running_on_buildbot)
 
     print '@@@BUILD_STEP dart-ide dart clients: %s@@@' % options.name
     if sdk_environment.has_key('JAVA_HOME'):
       print 'JAVA_HOME = {0}'.format(str(sdk_environment['JAVA_HOME']))
-    builder_name = str(options.name)
 
-    if (builder_name != 'dart-editor'):
+    if not PLUGINS_BUILD:
       PrintSeparator('running the build of the Dart SDK')
       
       EnsureDirectoryExists(buildout)
       sdk_zip = CreateSDK(buildout)
 
-    if (BUILD_OS == 'linux' and builder_name != 'dart-editor'):
+    if builder_name.startswith('dart-editor-linux'):
       CreateApiDocs(buildout)
 
-    if builder_name == 'dart-editor':
+    if PLUGINS_BUILD:
       BuildUpdateSite(ant, revision, options.name, buildroot, buildout,
               editorpath, buildos)
       return 0
 
     PrintSeparator('running the build to produce the Zipped RCP''s')
     #tell the ant script where to write the sdk zip file so it can
     #be expanded later
     status = ant.RunAnt('.', 'build_rcp.xml', revision, options.name,
                         buildroot, buildout, editorpath, buildos,
                         sdk_zip=sdk_zip,
@@ skipping 13 matching lines @@
     #For the dart-editor build, return at this point.
     #We don't need to install the sdk+dartium, run tests, or copy to google
     #storage.
     if not buildos:
       print 'skipping sdk and dartium steps for dart-editor build'
       return 0
 
     #This is an override for local testing
     force_run_install = os.environ.get('FORCE_RUN_INSTALL')
 
-    if (force_run_install or (builder_name != 'dart-editor')):
+    if force_run_install or (not PLUGINS_BUILD):
       InstallSdk(buildroot, buildout, buildos, buildout)
       InstallDartium(buildroot, buildout, buildos, gsu)
 
     if status:
       return status
 
     if not build_skip_tests:
       PrintSeparator('Running the tests')
       junit_status = ant.RunAnt('../com.google.dart.tools.tests.feature_releng',
                               'buildTests.xml',
@@ skipping 681 matching lines @@
   """delete the given file - do not re-throw any exceptions that occur"""
   if os.path.exists(f):
     try:
       os.remove(f)
     except:
       print 'error deleting %s' % f
 
 
 if __name__ == '__main__':
   sys.exit(main())