@@ -94,9 +94,9 @@ pip install --upgrade -r ../tools/requirements.txt
 
 8) Extract the archive in the "build/" directory.
 
-9) Build cefpython and run examples (xx.x is version number):
+9) Build cefpython and run examples:
 ```
-python ../tools/build.py xx.x
+python ../tools/build.py
 ```
 
 
@@ -143,9 +143,9 @@ sudo pip install --upgrade -r ../tools/requirements.txt
 
 7) Extract the archive in the "build/" directory.
 
-8) Build cefpython and run examples (xx.x is version number):
+8) Build cefpython and run examples:
 ```
-python ../tools/build.py xx.x
+python ../tools/build.py
 ```
 
 
@@ -260,9 +260,9 @@ cd build/
 3) Extract the downloaded archive eg. "cef55_3.2883.1553.g80bd606_win32.zip"
    in the "build/" directory (using "extract here" option)
 
-4) Run the build.py tool (xx.x is version number):
+4) Run the build.py tool:
 ```
-python ../tools/build.py xx.x
+python ../tools/build.py
 ```
 
 
@@ -281,22 +281,36 @@ mkdir build/
 cd build/
 ```
 
-2) Download CEF binaries from [Spotify Automated Builds](https://cef-builds.spotifycdn.com/index.html).
-   The version of the binaries must match exactly the CEF version
-   from the "cefpython/src/version/" directory (look for CEF_VERSION
-   constant in .h file).
+2) Download and extract CEF binaries automatically using the
+   download_cef.py tool. It reads the required CEF version from
+   "cefpython/src/version/", queries the Spotify CDN index, downloads
+   the standard distribution, verifies the SHA1 checksum, and extracts
+   it to the build/ directory:
+```
+python ../tools/download_cef.py
+```
 
-3) Extract the downloaded archive eg.
-   "cef_binary_3.2883.1553.g80bd606_windows32.tar.bz2"
-   in the build/ directory (using "extract here" option)
+   Alternatively, download manually from
+   [Spotify Automated Builds](https://cef-builds.spotifycdn.com/index.html).
+   The version must match exactly the CEF version from
+   "cefpython/src/version/" (look for CEF_VERSION constant in .h file).
+   Extract the archive eg. "cef_binary_3.2883.1553.g80bd606_windows32.tar.bz2"
+   in the build/ directory (using "extract here" option).
 
-4) Run the automate.py tool. After it completes you should see a new
-   directory eg. "cef55_3.2883.1553.g80bd606_win32/".
+3) Build libcef_dll_wrapper and prepare the CEF binaries directory using
+   the automate.py tool. This processes the downloaded "cef_binary_*"
+   directory and creates a new directory eg. "cef55_3.2883.1553.g80bd606_win32/"
+   that build.py requires. Note: this step requires cmake and ninja on PATH.
 ```
 python ../tools/automate.py --prebuilt-cef
 ```
 
-5) Run the build.py tool (xx.x is version number):
+4) Run the build.py tool. The version number is optional and defaults to
+   {CHROME_VERSION_MAJOR}.0 read from "cefpython/src/version/":
+```
+python ../tools/build.py
+```
+   To override the patch version (eg. for a second release off the same CEF):
 ```
 python ../tools/build.py xx.x
 ```
 
@@ -368,8 +368,6 @@ def build_cef_projects():
     if WINDOWS:
         fix_cmake_variables_permanently_windows()
 
-    fix_cef_include_files()
-
     # Find cef_binary directory.
     # Might already be set if --prebuilt-cef flag was passed.
     if not Options.cef_binary:
@@ -476,7 +474,7 @@ def build_wrapper_library_windows(runtime_library, msvs, vcvars):
     fix_cmake_variables_for_MD_library(try_undo=True)
 
     # Command to build libcef_dll_wrapper
-    cmake_wrapper = prepare_build_command(build_lib=True, vcvars=vcvars)
+    cmake_wrapper = prepare_build_command()
     cmake_wrapper.extend(["cmake", "-G", "Ninja",
                          "-DCMAKE_BUILD_TYPE="+Options.build_type, ".."])
 
@@ -515,27 +513,14 @@ def build_wrapper_library_windows(runtime_library, msvs, vcvars):
         Options.gyp_msvs_version = msvs
         if runtime_library == RUNTIME_MD:
             fix_cmake_variables_for_MD_library()
-        env = getenv()
-        if msvs == "2010":
-            # When Using WinSDK 7.1 vcvarsall.bat doesn't work. Use
-            # setuptools.msvc.msvc9_query_vcvarsall to query env vars.
-            from setuptools.msvc import msvc9_query_vcvarsall
-            env.update(msvc9_query_vcvarsall(10.0, arch=VS_PLATFORM_ARG))
-            # On Python 2.7 env values returned by both distutils
-            # and setuptools are unicode, but Python expects env
-            # dict values as strings.
-            for env_key in env:
-                env_value = env[env_key]
-                if type(env_value) != str:
-                    env[env_key] = env_value.encode("utf-8")
-        run_command(cmake_wrapper, working_dir=build_wrapper_dir, env=env)
+        run_command(cmake_wrapper, working_dir=build_wrapper_dir)
         Options.gyp_msvs_version = old_gyp_msvs_version
         if runtime_library == RUNTIME_MD:
             fix_cmake_variables_for_MD_library(undo=True)
         print("[automate.py] cmake OK")
 
         # Run ninja
-        ninja_wrapper = prepare_build_command(build_lib=True, vcvars=vcvars)
+        ninja_wrapper = prepare_build_command()
         ninja_wrapper.extend(["ninja", "-j", Options.ninja_jobs,
                               "libcef_dll_wrapper"])
         run_command(ninja_wrapper, working_dir=build_wrapper_dir)
@@ -581,7 +566,6 @@ def fix_cmake_variables_for_MD_library(undo=False, try_undo=False):
     # Warnings are treated as errors so this needs to be ignored:
     # >> warning C4275: non dll-interface class 'stdext::exception'
     # >> used as base for dll-interface class 'std::bad_cast'
-    # This warning occurs only in VS2008, in VS2013 not.
     # This replacements must be unique for the undo operation
     # to be reliable.
 
@@ -632,7 +616,7 @@ def build_wrapper_library_mac():
     # On Mac it is required to link libcef_dll_wrapper against
     # libc++ library, so must build this library separately
     # from cefclient.
-    cmake_wrapper = prepare_build_command(build_lib=True)
+    cmake_wrapper = prepare_build_command()
     cmake_wrapper.extend(["cmake", "-G", "Ninja",
                           "-DPROJECT_ARCH=x86_64",
                           "-DCMAKE_CXX_FLAGS=-stdlib=libc++",
@@ -664,56 +648,22 @@ def build_wrapper_library_mac():
         run_command(cmake_wrapper, build_wrapper_dir)
         print("[automate.py] cmake OK")
         # Ninja
-        ninja_wrapper = prepare_build_command(build_lib=True)
+        ninja_wrapper = prepare_build_command()
         ninja_wrapper.extend(["ninja", "-j", Options.ninja_jobs,
                               "libcef_dll_wrapper"])
         run_command(ninja_wrapper, build_wrapper_dir)
         print("[automate.py] ninja OK")
         assert os.path.exists(wrapper_lib)
 
 
-def prepare_build_command(build_lib=False, vcvars=None):
-    """On Windows VS env variables must be set up by calling vcvarsall.bat"""
-    command = list()
+def prepare_build_command():
+    """On Windows VS env variables must be set up by calling vcvarsall.bat."""
+    command = []
     if platform.system() == "Windows":
-        if build_lib:
-            if vcvars == VS2010_VCVARS:
-                # When using WinSDK 7.1 vcvarsall.bat is broken. Instead
-                # env variables are queried using setuptools.msvc.
-                return command
-            if vcvars:
-                command.append(vcvars)
-            else:
-                command.append(get_vcvars_for_python())
-            command.append(VS_PLATFORM_ARG)
-        else:
-            if int(Options.cef_branch) >= 2704:
-                command.append(VS2015_VCVARS)
-            else:
-                command.append(VS2013_VCVARS)
-            command.append(VS_PLATFORM_ARG)
-        command.append("&&")
+        command.extend([VCVARS, VS_PLATFORM_ARG, "&&"])
     return command
 
 
-def fix_cef_include_files():
-    """Fixes to CEF include header files for eg. VS2008 on Windows."""
-    # TODO: This was fixed in upstream CEF, remove this code during
-    #       next CEF update on Windows.
-    if platform.system() == "Windows" and get_msvs_for_python() == "2008":
-        print("[automate.py] Fixing CEF include/ files")
-        # cef_types_wrappers.h
-        cef_types_wrappers = os.path.join(Options.cef_binary, "include",
-                                          "internal", "cef_types_wrappers.h")
-        with open(cef_types_wrappers, "rb") as fp:
-            contents = fp.read().decode("utf-8")
-        # error C2059: syntax error : '{'
-        contents = contents.replace("s->range = {0, 0};",
-                                    "s->range.from = 0; s->range.to = 0;")
-        with open(cef_types_wrappers, "wb") as fp:
-            fp.write(contents.encode("utf-8"))
-
-
 def create_prebuilt_binaries():
     """After building copy binaries/libs to build/cef_xxxx/.
     Not all projects may have been built on all platforms."""
@@ -866,25 +816,10 @@ def copy_app(app):
 
 
 def get_available_python_compilers():
-    all_python_compilers = OrderedDict([
-        ("2008", VS2008_VCVARS),
-        ("2010", VS2010_VCVARS),
-        ("2015", VS2015_VCVARS),
-    ])
-    ret_compilers = OrderedDict()
-    for msvs in all_python_compilers:
-        vcvars = all_python_compilers[msvs]
-        if os.path.exists(vcvars):
-            ret_compilers[msvs] = vcvars
-        else:
-            print("[automate.py] INFO: Visual Studio compiler not found:"
-                  " {vcvars}".format(vcvars=vcvars))
-    return ret_compilers
-
-
-def get_vcvars_for_python():
-    msvs = get_msvs_for_python()
-    return globals()["VS"+msvs+"_VCVARS"]
+    if not os.path.exists(VCVARS):
+        print("[automate.py] ERROR: vcvarsall.bat not found: {}".format(VCVARS))
+        return OrderedDict()
+    return OrderedDict([("2015", VCVARS)])
 
 
 def getenv():
 
@@ -18,12 +18,13 @@
 from sources or use ready binaries from Spotify Automated Builds.
 
 Usage:
-    build.py VERSION [--rebuild-cpp] [--unittests] [--fast] [--clean] [--kivy]
-                     [--hello-world] [--enable-profiling]
-                     [--enable-line-tracing]
+    build.py [VERSION] [--rebuild-cpp] [--unittests] [--fast] [--clean] [--kivy]
+                       [--hello-world] [--enable-profiling]
+                       [--enable-line-tracing]
 
 Options:
-    VERSION                Version number eg. 50.0
+    VERSION                Version number eg. 50.0. Optional: defaults to
+                           {CHROME_VERSION_MAJOR}.0 read from src/version/.
     --unittests            Run only unit tests. Do not run examples while
                            building cefpython modules. Examples require
                            interaction such as closing window before proceeding.
@@ -131,12 +132,14 @@ def command_line_args():
            REBUILD_CPP, VERSION, UNITTESTS
 
     VERSION = get_version_from_command_line_args(__file__)
-    # Other scripts called by this script expect that version number
-    # is available in sys.argv, so don't remove it like it's done
-    # for all other args starting with "--".
     if not VERSION:
-        print(__doc__)
-        sys.exit(1)
+        cef_ver = get_cefpython_version()
+        VERSION = "{major}.0".format(major=cef_ver["CHROME_VERSION_MAJOR"])
+        # Inject into sys.argv so child scripts that call
+        # get_version_from_command_line_args() can find it.
+        sys.argv.insert(1, VERSION)
+        print("[build.py] No version specified, defaulting to {v}"
+              .format(v=VERSION))
 
     print("[build.py] Parse command line arguments")
 
@@ -415,97 +418,6 @@ def compile_cpp_projects_with_setuptools():
     shutil.copy(SUBPROCESS_EXE, CEFPYTHON_BINARY)
 
 
-def compile_cpp_projects_windows_DEPRECATED():
-    """DEPRECATED. Not used currently.
-    Build C++ projects using .vcproj files."""
-
-    # TODO: Remove code after setuptools compilation was tested for some time
-
-    print("[build.py] Compile C++ projects")
-
-    print("[build.py] ~~ Build CLIENT_HANDLER vcproj")
-    vcproj = ("client_handler_py{pyver}_{os}.vcproj"
-              .format(pyver=PYVERSION, os=OS_POSTFIX2))
-    vcproj = os.path.join(SRC_DIR, "client_handler", vcproj)
-    build_vcproj_DEPRECATED(vcproj)
-
-    print("[build.py] ~~ Build LIBCEFPYTHONAPP vcproj")
-    vcproj = ("libcefpythonapp_py{pyver}_{os}.vcproj"
-              .format(pyver=PYVERSION, os=OS_POSTFIX2))
-    vcproj = os.path.join(SRC_DIR, "subprocess", vcproj)
-    build_vcproj_DEPRECATED(vcproj)
-
-    print("[build.py] ~~ Build SUBPROCESS vcproj")
-    vcproj = ("subprocess_{os}.vcproj"
-              .format(os=OS_POSTFIX2))
-    vcproj = os.path.join(SRC_DIR, "subprocess", vcproj)
-    ret = build_vcproj_DEPRECATED(vcproj)
-
-    # Copy subprocess executable
-    subprocess_from = os.path.join(
-            SUBPROCESS_DIR,
-            "Release_{os}".format(os=OS_POSTFIX2),
-            "subprocess_{os}.exe".format(os=OS_POSTFIX2))
-    subprocess_to = os.path.join(CEFPYTHON_BINARY, "subprocess.exe")
-    if os.path.exists(subprocess_to):
-        os.remove(subprocess_to)
-    if ret == 0:
-        print("[build.py] Copy subprocess executable")
-        # shutil.copy() will also copy Permission bits
-        shutil.copy(subprocess_from, subprocess_to)
-
-    print("[build.py] ~~ Build CPP_UTILS vcproj")
-    vcproj = ("cpp_utils_{os}.vcproj"
-              .format(os=OS_POSTFIX2))
-    vcproj = os.path.join(SRC_DIR, "cpp_utils", vcproj)
-    build_vcproj_DEPRECATED(vcproj)
-
-
-def build_vcproj_DEPRECATED(vcproj):
-    """DEPRECATED. Not used currently."""
-
-    # TODO: Remove code after setuptools compilation was tested for some time
-
-    # In VS2010 vcbuild.exe was replaced by msbuild.exe.
-    # Ufortunately WinSDK 7.1 does not come with msbuild.exe,
-    # so it would be required to install Visual Studio 2010,
-    # and to support both 32-bit ad 64-bit compilations it
-    # a non-express version would have to be installed, which
-    # is not free. So to make it free open-source it was
-    # required migrate to a new compilation system that uses
-    # distutils/setuptools packages.
-
-    # msbuild.exe flags:
-    # /clp:disableconsolecolor
-    # msbuild /p:BuildProjectReferences=false project.proj
-    # MSBuild.exe MyProject.proj /t:build
-
-    VS2008_BUILD = ("%LocalAppData%\\Programs\\Common\\"
-                    "Microsoft\\Visual C++ for Python\\9.0\\"
-                    "VC\\bin\\amd64\\vcbuild.exe")
-    VS2008_BUILD = VS2008_BUILD.replace("%LocalAppData%",
-                                        os.environ["LOCALAPPDATA"])
-
-    if PYVERSION == "27":
-        args = list()
-        args.append(VS2008_VCVARS)
-        args.append(VS_PLATFORM_ARG)
-        args.append("&&")
-        args.append(VS2008_BUILD)
-        args.append("/nocolor")
-        args.append("/nologo")
-        args.append("/nohtmllog")
-        if REBUILD_CPP:
-            args.append("/rebuild")
-        args.append(vcproj)
-        ret = subprocess.call(args, shell=True)
-        if ret != 0:
-            compile_ask_to_continue()
-        return ret
-    else:
-        raise Exception("Only Python 2.7 32-bit is currently supported")
-
-
 def compile_ask_to_continue():
     # noinspection PyUnboundLocalVariable
     what = input("[build.py] make failed, 'y' to continue, Enter to stop: ")
 
@@ -110,8 +110,6 @@ def print_compiler_options():
 
 
 def get_compiler(static=False):
-    # NOTES:
-    # - VS2008 and VS2010 are both using distutils/msvc9compiler.py
     compiler = new_compiler()
     # Must initialize so that "compile_options" and others are available
     compiler.initialize()