Update Clang build script and gyp file for 3.8.0 version bump

tools/clang/scripts/update.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Windows can't run .sh files, so this is a Python implementation of
 update.sh. This script should replace update.sh on all platforms eventually."""
 
 import argparse
 import contextlib
@@ skipping 42 matching lines @@
 COMPILER_RT_BUILD_DIR = os.path.join(LLVM_BUILD_DIR, '32bit-compiler-rt')
 CLANG_DIR = os.path.join(LLVM_DIR, 'tools', 'clang')
 LLD_DIR = os.path.join(LLVM_DIR, 'tools', 'lld')
 COMPILER_RT_DIR = os.path.join(LLVM_DIR, 'projects', 'compiler-rt')
 LIBCXX_DIR = os.path.join(LLVM_DIR, 'projects', 'libcxx')
 LIBCXXABI_DIR = os.path.join(LLVM_DIR, 'projects', 'libcxxabi')
 LLVM_BUILD_TOOLS_DIR = os.path.abspath(
     os.path.join(LLVM_DIR, '..', 'llvm-build-tools'))
 STAMP_FILE = os.path.join(LLVM_DIR, '..', 'llvm-build', 'cr_build_revision')
 BINUTILS_DIR = os.path.join(THIRD_PARTY_DIR, 'binutils')
 VERSION = '3.7.0'

[Nico, 2015/07/16 17:50:00]

This needs to be bumped to 3.8.0 too, as I just learned while trying to build a
new package :-(

[hans, 2015/07/16 17:51:04]

Sorry, I should have put a TODO here too :(

[Nico, 2015/07/16 17:51:23]

(it's only used when building clang, so it can be 3.8.0 unconditionally, it
doesn't have to be dependent on use_head_revision)

[hans, 2015/07/16 17:59:47]

I'm not following. It's also used by --print-clang-version, which determines
where gyp looks for asan runtimes, etc. So it needs to be in sync with the
revision that's used, no?

[Nico, 2015/07/16 18:02:14]

Oh, right. It wasn't used before this CL though (I think). Nevermind then.

If I ever succeed in building a new clang/win package this can be 3.8.0
unconditionally anyways.

 
 # URL for pre-built binaries.
 CDS_URL = 'https://commondatastorage.googleapis.com/chromium-browser-clang'
 
 LLVM_REPO_URL='https://llvm.org/svn/llvm-project'
 if 'LLVM_REPO_URL' in os.environ:
   LLVM_REPO_URL = os.environ['LLVM_REPO_URL']
 
 
 def DownloadUrl(url, output_file):
@@ skipping 616 matching lines @@
 
   parser = argparse.ArgumentParser(description='Build Clang.')
   parser.add_argument('--bootstrap', action='store_true',
                       help='first build clang with CC, then with itself.')
   parser.add_argument('--if-needed', action='store_true',
                       help="run only if the script thinks clang is needed")
   parser.add_argument('--force-local-build', action='store_true',
                       help="don't try to download prebuild binaries")
   parser.add_argument('--print-revision', action='store_true',
                       help='print current clang revision and exit.')
+  parser.add_argument('--print-clang-version', action='store_true',
+                      help='print current clang version (e.g. x.y.z) and exit.')
   parser.add_argument('--run-tests', action='store_true',
                       help='run tests after building; only for local builds')
   parser.add_argument('--tools', nargs='*',
                       help='select which chrome tools to build',
                       default=['plugins', 'blink_gc_plugin'])
   parser.add_argument('--without-patches', action='store_false',
                       help="don't apply patches (default)", dest='with_patches',
                       default=True)
 
   # For now, these flags are only used for the non-Windows flow, but argparser
@@ skipping 11 matching lines @@
     if re.search(r'\b(clang|asan|lsan|msan|tsan)=1',
                  os.environ.get('GYP_DEFINES', '')):
       is_clang_required = True
     # clang previously downloaded, keep it up-to-date.
     # If you don't want this, delete third_party/llvm-build on your machine.
     if os.path.isdir(LLVM_BUILD_DIR):
       is_clang_required = True
     if not is_clang_required:
       return 0
 
+  if use_head_revision:
+    # TODO(hans): Remove after the next roll.
+    global VERSION
+    VERSION = '3.8.0'
+
   global LLVM_WIN_REVISION, PACKAGE_VERSION
   if args.print_revision:
     if use_head_revision:
       print GetSvnRevision(LLVM_DIR)
     else:
       print PACKAGE_VERSION
     return 0
 
+  if args.print_clang_version:
+    sys.stdout.write(VERSION)
+    return 0
+
   if re.search(r'\b(make_clang_dir)=', os.environ.get('GYP_DEFINES', '')):
     print 'Skipping Clang update (make_clang_dir= was set in GYP_DEFINES).'
     return 0
 
   # Don't buffer stdout, so that print statements are immediately flushed.
   # Do this only after --print-revision has been handled, else we'll get
   # an error message when this script is run from gn for some reason.
   sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
 
   if use_head_revision:
     # Use a real revision number rather than HEAD to make sure that the stamp
     # file logic works.
     LLVM_WIN_REVISION = GetSvnRevision(LLVM_REPO_URL)
     PACKAGE_VERSION = LLVM_WIN_REVISION + '-0'
 
     args.force_local_build = True
     # Skip local patches when using HEAD: they probably don't apply anymore.
     args.with_patches = False
 
   return UpdateClang(args)
 
 
 if __name__ == '__main__':
   sys.exit(main())