[NaCl SDK] Refactor sdk_update*.

native_client_sdk/src/build_tools/build_updater.py

Index: native_client_sdk/src/build_tools/build_updater.py
diff --git a/native_client_sdk/src/build_tools/build_updater.py b/native_client_sdk/src/build_tools/build_updater.py
index f454c86e4946f9f44c29586c26d206bc475ab1a2..09ff7854a6264f4491f181ecb97f32bf563afb58 100755
--- a/native_client_sdk/src/build_tools/build_updater.py
+++ b/native_client_sdk/src/build_tools/build_updater.py
@@ -11,6 +11,7 @@ tool users run to download new bundles, update existing bundles, etc.
 
 import buildbot_common
 import build_utils
+import glob
 import optparse
 import os
 import sys
@@ -38,18 +39,14 @@ UPDATER_FILES = [
 
   # SDK tools
   ('build_tools/sdk_tools/cacerts.txt', 'nacl_sdk/sdk_tools/cacerts.txt'),
-  ('build_tools/sdk_tools/sdk_update.py', 'nacl_sdk/sdk_tools/sdk_update.py'),
-  ('build_tools/sdk_tools/sdk_update_common.py',
-      'nacl_sdk/sdk_tools/sdk_update_common.py'),
-  ('build_tools/sdk_tools/sdk_update_main.py',
-      'nacl_sdk/sdk_tools/sdk_update_main.py'),
-  ('build_tools/manifest_util.py', 'nacl_sdk/sdk_tools/manifest_util.py'),
-  ('build_tools/sdk_tools/third_party/__init__.py',
-      'nacl_sdk/sdk_tools/third_party/__init__.py'),
-  ('build_tools/sdk_tools/third_party/fancy_urllib/__init__.py',
-      'nacl_sdk/sdk_tools/third_party/fancy_urllib/__init__.py'),
+  ('build_tools/sdk_tools/*.py', 'nacl_sdk/sdk_tools/'),
+  ('build_tools/sdk_tools/commands/*.py', 'nacl_sdk/sdk_tools/commands/'),
+  ('build_tools/sdk_tools/third_party/*.py', 'nacl_sdk/sdk_tools/third_party/'),
+  ('build_tools/sdk_tools/third_party/fancy_urllib/*.py',

[Sam Clegg, 2012/10/22 22:55:30]

I guess there is a tradeoff here between listing explicitly
exactly what goes in the package, and the cost of maintaining the list.

I guess the risk to random other .py files being here at
package build time is close to zero?

[binji, 2012/10/23 00:14:09]

Yes, I think this is clearer as well -- and less tedious to modify. Ultimately,
most of the stuff comes from the sdk_tools/ directory -- we should try to keep
cruft out of it.

+      'nacl_sdk/sdk_tools/third_party/fancy_urllib/'),
   ('build_tools/sdk_tools/third_party/fancy_urllib/README',
       'nacl_sdk/sdk_tools/third_party/fancy_urllib/README'),
+  ('build_tools/manifest_util.py', 'nacl_sdk/sdk_tools/manifest_util.py'),
   ('LICENSE', 'nacl_sdk/sdk_tools/LICENSE'),
   (CYGTAR, 'nacl_sdk/sdk_tools/cygtar.py'),
 ]
@@ -76,6 +73,30 @@ def MakeUpdaterFilesAbsolute(out_dir):
   return result
 
 
+def GlobFiles(files):
+  """Expand wildcards for 2-tuples of sources/destinations.
+
+  This function also will convert destinations from directories into filenames.
+  For example:
+    ('foo/*.py', 'bar/') => [('foo/a.py', 'bar/a.py'), ('foo/b.py', 'bar/b.py')]
+
+  Args:
+    files: A list of 2-tuples of (source, dest) paths.
+  Returns:
+    A new list of 2-tuples, after the sources have been wildcard-expanded, and
+    the destinations have been changed from directories to filenames.
+  """
+  result = []
+  for in_file_glob, out_file in files:
+    if out_file.endswith('/'):
+      for in_file in glob.glob(in_file_glob):
+        result.append((in_file,
+                      os.path.join(out_file, os.path.basename(in_file))))
+    else:
+      result.append((in_file_glob, out_file))
+  return result
+
+
 def CopyFiles(files):
   """Given a list of 2-tuples (source, dest), copy each source file to a dest
   file.
@@ -129,6 +150,7 @@ def BuildUpdater(out_dir, revision_number=None):
   buildbot_common.RemoveDir(os.path.join(out_dir, 'nacl_sdk'))
 
   updater_files = MakeUpdaterFilesAbsolute(out_dir)
+  updater_files = GlobFiles(updater_files)
 
   CopyFiles(updater_files)
   UpdateRevisionNumber(out_dir, revision_number)