Update automate.py - fix ninja jobs and add option to force Chromium update.

The --ninja-jobs flag wasn't applied.

Sometimes Chromium gclient sync may fail, some files are missing and must
re-run. Add new flag --force-chromium-update to do this.

Author: cztomczak

tools/automate-git.py

@@ -539,9 +539,14 @@ def onerror(func, path, exc_info):
    (options.nocefupdate and options.forceupdate) or \
    (options.nobuild and options.forcebuild) or \
    (options.nodistrib and options.forcedistrib):
-  print "Invalid combination of options."
-  parser.print_help(sys.stderr)
-  sys.exit()
+  # -- CEF Python modification below
+  if (options.nocefupdate and options.forceupdate):
+    pass
+  else:
+    print "Invalid combination of options."
+    parser.print_help(sys.stderr)
+    sys.exit()
+  # --
 
 if (options.noreleasebuild and \
      (options.minimaldistrib or options.minimaldistribonly or \

tools/automate-git.py.patch

@@ -1,5 +1,5 @@
 diff --git automate-git.py automate-git.py
-index 5c67e17..b7a59d9 100644
+index 1f0be0b..a6abb94 100644
 --- automate-git.py
 +++ automate-git.py
 @@ -1,3 +1,91 @@
@@ -94,7 +94,57 @@ index 5c67e17..b7a59d9 100644
  # Copyright (c) 2014 The Chromium Embedded Framework Authors. All rights
  # reserved. Use of this source code is governed by a BSD-style license that
  # can be found in the LICENSE file.
-@@ -789,7 +877,7 @@ else:
+@@ -451,9 +539,14 @@ if (options.nochromiumupdate and options.forceupdate) or \
+    (options.nocefupdate and options.forceupdate) or \
+    (options.nobuild and options.forcebuild) or \
+    (options.nodistrib and options.forcedistrib):
+-  print "Invalid combination of options."
+-  parser.print_help(sys.stderr)
+-  sys.exit()
++  # -- CEF Python modification below
++  if (options.nocefupdate and options.forceupdate):
++    pass
++  else:
++    print "Invalid combination of options."
++    parser.print_help(sys.stderr)
++    sys.exit()
++  # --
+ 
+ if (options.noreleasebuild and \
+      (options.minimaldistrib or options.minimaldistribonly or \
+@@ -463,13 +556,6 @@ if (options.noreleasebuild and \
+   parser.print_help(sys.stderr)
+   sys.exit()
+ 
+-if (options.clientdistrib or options.clientdistribonly) and \
+-   options.buildtarget.find('cefclient') == -1:
+-  print "A client distribution cannot be generated if --build-target "+\
+-        "excludes cefclient."
+-  parser.print_help(sys.stderr)
+-  sys.exit()
+-
+ # Operating system.
+ if options.dryrun and options.dryrunplatform is not None:
+   platform = options.dryrunplatform
+@@ -492,6 +578,17 @@ if platform == 'windows':
+ else:
+   script_ext = '.sh'
+ 
++if options.clientdistrib or options.clientdistribonly:
++  if platform == 'linux':
++    client_app = 'cefsimple'
++  else:
++    client_app = 'cefclient'
++  if options.buildtarget.find(client_app) == -1:
++    print 'A client distribution cannot be generated if --build-target '+\
++          'excludes %s.' % client_app
++    parser.print_help(sys.stderr)
++    sys.exit()
++
+ if options.x64build and platform != 'windows' and platform != 'macosx':
+   print 'The x64 build option is only used on Windows and Mac OS X.'
+   sys.exit()
+@@ -785,7 +882,7 @@ else:
  # Delete the existing src/cef directory. It will be re-copied from the download
  # directory later.
  if cef_checkout_changed and os.path.exists(cef_src_dir):
@@ -103,7 +153,7 @@ index 5c67e17..b7a59d9 100644
 
  # Delete the existing src/out directory if requested.
  if options.forceclean and os.path.exists(out_src_dir):
-@@ -892,6 +980,12 @@ if not options.nobuild and (chromium_checkout_changed or \
+@@ -888,6 +985,12 @@ if not options.nobuild and (chromium_checkout_changed or \
    command = 'ninja -C '
    if options.verbosebuild:
      command = 'ninja -v -C'

tools/automate.py

@@ -6,30 +6,32 @@
 
 Usage:
     automate.py (--prebuilt-cef | --build-cef)
+                [--force-chromium-update FORCECHROMIUMUPDATE]
                 [--cef-branch BRANCH] [--cef-commit COMMIT]
                 [--build-dir BUILDDIR] [--cef-build-dir CEFBUILDDIR]
                 [--ninja-jobs JOBS] [--gyp-generators GENERATORS]
                 [--gyp-msvs-version MSVS]
     automate.py (-h | --help) [type -h to show full description for options]
 
 Options:
-    -h --help               Show this help message.
-    --prebuilt-cef          Whether to use prebuilt CEF binaries. Prebuilt
-                            binaries for Linux are built on Ubuntu.
-    --build-cef             Whether to build CEF from sources with the cefpython
-                            patches applied.
-    --cef-branch=<b>        CEF branch. Defaults to CHROME_VERSION_BUILD from
-                            "src/version/cef_version_{platform}.h" (TODO).
-    --cef-commit=<c>        CEF revision. Defaults to CEF_COMMIT_HASH from
-                            "src/version/cef_version_{platform}.h" (TODO).
-    --build-dir=<dir1>      Build directory.
-    --cef-build-dir=<dir2>  CEF build directory. By default same
-                            as --build-dir.
-    --ninja-jobs=<jobs>     How many CEF jobs to run in parallel. To speed up
-                            building set it to number of cores in your CPU.
-                            By default set to cpu_count / 2.
-    --gyp-generators=<gen>  Set GYP_GENERATORS [default: ninja].
-    --gyp-msvs-version=<v>  Set GYP_MSVS_VERSION.
+    -h --help                Show this help message.
+    --prebuilt-cef           Whether to use prebuilt CEF binaries. Prebuilt
+                             binaries for Linux are built on Ubuntu.
+    --build-cef              Whether to build CEF from sources with the
+                             cefpython patches applied.
+    --force-chromium-update  Force Chromium update (gclient sync etc).
+    --cef-branch=<b>         CEF branch. Defaults to CHROME_VERSION_BUILD from
+                             "src/version/cef_version_{platform}.h" (TODO).
+    --cef-commit=<c>         CEF revision. Defaults to CEF_COMMIT_HASH from
+                             "src/version/cef_version_{platform}.h" (TODO).
+    --build-dir=<dir1>       Build directory.
+    --cef-build-dir=<dir2>   CEF build directory. By default same
+                             as --build-dir.
+    --ninja-jobs=<jobs>      How many CEF jobs to run in parallel. To speed up
+                             building set it to number of cores in your CPU.
+                             By default set to cpu_count / 2.
+    --gyp-generators=<gen>   Set GYP_GENERATORS [default: ninja].
+    --gyp-msvs-version=<v>   Set GYP_MSVS_VERSION.
 
 """
 
@@ -87,6 +89,7 @@ class Options(object):
     # From command-line
     prebuilt_cef = False
     build_cef = False
+    force_chromium_update = False
     cef_branch = ""
     cef_commit = ""
     build_dir = ""
@@ -179,9 +182,10 @@ def setup_options(docopt_args):
     # cpu_count() returns number of CPU threads, not CPU cores.
     # On i5 with 2 cores and 4 cpu threads the default of 4 ninja
     # jobs slows down computer significantly.
-    Options.ninja_jobs = int(multiprocessing.cpu_count() / 2)
-    if Options.ninja_jobs < 1:
-        Options.ninja_jobs = 1
+    if not Options.ninja_jobs:
+        Options.ninja_jobs = int(multiprocessing.cpu_count() / 2)
+        if Options.ninja_jobs < 1:
+            Options.ninja_jobs = 1
 
 
 def build_cef():
@@ -515,6 +519,10 @@ def run_automate_git():
     # We clone cef repository ourselves and update cef patches with ours,
     # so don't fetch/update CEF repo.
     args.append("--no-cef-update")
+    # Force Chromium update so that gclient sync is called. It may fail
+    # sometimes with files missing and must re-run to fix.
+    if Options.force_chromium_update:
+        args.append("--force-update")
     args.append("--no-distrib-archive")
     if platform.system() == "Linux":
         # Building cefclient target isn't supported on Linux when