Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / native_client / toolchain_build / command.py

diff --git a/src/native_client/toolchain_build/command.py b/src/native_client/toolchain_build/command.py
index 0c2c209..c39f28f 100755 (executable)
--- a/src/native_client/toolchain_build/command.py
+++ b/src/native_client/toolchain_build/command.py
@@ -127,7 +127,7 @@ class Runnable(object):
     if not found_match:
       print 'Function', self._func.func_name, 'in', sourcefile
       raise Exception('Python Runnable objects must be implemented in one of' +
-                      'the following files: ' + str(COMMAND_CODE_FILES))
+                      ' the following files: ' + str(COMMAND_CODE_FILES))
 
     # Like repr(datum), but do something stable for dictionaries.
     # This only properly handles dictionaries that use simple types
@@ -225,10 +225,12 @@ def SkipForIncrementalCommand(command, run_cond=None, **kwargs):
     if run_cond and not run_cond(cmd_opts):
       return False
 
+    dir_list = os.listdir(cmd_opts.GetWorkDir())
     # Only run when clobbering working directory or working directory is empty.
     return (cmd_opts.IsClobberWorking() or
             not os.path.isdir(cmd_opts.GetWorkDir()) or
-            len(os.listdir(cmd_opts.GetWorkDir())) == 0)
+            len(dir_list) == 0 or
+            (len(dir_list) == 1 and dir_list[0].endswith('.log')))
 
   return Command(command, run_cond=SkipForIncrementalCondition, **kwargs)
 
@@ -346,8 +348,8 @@ def WriteData(data, dst, run_cond=None):
 
 
 def SyncGitRepoCmds(url, destination, revision, clobber_invalid_repo=False,
-                    reclone=False, clean=False, pathspec=None, git_cache=None,
-                    push_url=None, known_mirrors=[], push_mirrors=[],
+                    reclone=False, pathspec=None, git_cache=None, push_url=None,
+                    known_mirrors=[], push_mirrors=[],
                     run_cond=None):
   """Returns a list of commands to sync and validate a git repo.
 
@@ -357,8 +359,6 @@ def SyncGitRepoCmds(url, destination, revision, clobber_invalid_repo=False,
     revision: If not None, will sync the git repository to this revision.
     clobber_invalid_repo: Always True for bots, but can be forced for users.
     reclone: If True, delete the destination directory and re-clone the repo.
-    clean: If True, discard local changes and untracked files.
-           Otherwise the checkout will fail if there are uncommitted changes.
     pathspec: If not None, add the path to the git checkout command, which
               causes it to just update the working tree without switching
               branches.
@@ -435,8 +435,8 @@ def SyncGitRepoCmds(url, destination, revision, clobber_invalid_repo=False,
                                       clobber_mismatch=True,
                                       logger=logger)
 
-  def sync(logger, subst, url, dest, revision, reclone, clean, pathspec,
-           git_cache, push_url):
+  def sync(logger, subst, url, dest, revision, reclone, pathspec, git_cache,
+           push_url):
     abs_dest = subst.SubstituteAbsPaths(dest)
     if git_cache:
       git_cache = subst.SubstituteAbsPaths(git_cache)
@@ -444,7 +444,7 @@ def SyncGitRepoCmds(url, destination, revision, clobber_invalid_repo=False,
     logger.debug('Syncing Git Repo: %s [%s]', abs_dest, url)
     try:
       pynacl.repo_tools.SyncGitRepo(url, abs_dest, revision,
-                                    reclone=reclone, clean=clean,
+                                    reclone=reclone,
                                     pathspec=pathspec, git_cache=git_cache,
                                     push_url=push_url, logger=logger)
     except pynacl.repo_tools.InvalidRepoException, e:
@@ -471,7 +471,14 @@ def SyncGitRepoCmds(url, destination, revision, clobber_invalid_repo=False,
       return True
     return cmd_opts.IsBot()
 
-  commands = []
+  def CleanOnBotCondition(cmd_opts):
+    # Check if caller passed their own run_cond
+    if run_cond and not run_cond(cmd_opts):
+      return False
+    return cmd_opts.IsBot()
+
+  commands = [CleanGitWorkingDir(destination, reset=True, path=None,
+                                 run_cond=CleanOnBotCondition)]
   if git_cache:
     commands.append(Runnable(run_cond, populate_cache, git_cache, url))
 
@@ -480,18 +487,18 @@ def SyncGitRepoCmds(url, destination, revision, clobber_invalid_repo=False,
                    Runnable(ClobberInvalidRepoCondition, validate, url,
                             destination),
                    Runnable(run_cond, sync, url, destination, revision, reclone,
-                            clean, pathspec, git_cache, push_url)])
+                            pathspec, git_cache, push_url)])
   return commands
 
 
-def CleanGitWorkingDir(directory, path, run_cond=None):
+def CleanGitWorkingDir(directory, reset=False, path=None, run_cond=None):
   """Clean a path in a git checkout, if the checkout directory exists."""
-  def clean(logger, subst, directory, path):
+  def clean(logger, subst, directory, reset, path):
     directory = subst.SubstituteAbsPaths(directory)
     logger.debug('Cleaning Git Working Directory: %s', directory)
     if os.path.exists(directory) and len(os.listdir(directory)) > 0:
-      pynacl.repo_tools.CleanGitWorkingDir(directory, path, logger=logger)
-  return Runnable(run_cond, clean, directory, path)
+      pynacl.repo_tools.CleanGitWorkingDir(directory, reset, path,logger=logger)
+  return Runnable(run_cond, clean, directory, reset, path)
 
 
 def GenerateGitPatches(git_dir, info, run_cond=None):