Clean up how we feed various outputs into the installer builders. Instead of

referencing them by name, we put them into toplevel environment variables and
reference them by the variable.

Also made DirBuilder more flexible in accepting SCons Nodes as inputs.
Review URL: http://codereview.chromium.org/12705

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6154 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 14 deletions

diff --git a/gears/SConscript.common b/gears/SConscript.common
index 205392f1..47ad2bd 100644
--- a/gears/SConscript.common
+++ b/gears/SConscript.common
@@ -45,13 +45,13 @@ if env['OS'] == 'osx':
 #-----------------------------------------------------------------------------
 # Generate the dependency tree.
 
-common_targets = {}
-
 def PatternRule(t, s): return utils.PatternRule(t, s, env)
 def GetInputs(var): return utils.GetInputs(var, env)
 
+outputs = {}
+
 # genfiles/%: %.m4
-common_targets['m4'] = \
+outputs['COMMON_M4S'] = \
     [env.M4(*PatternRule('$COMMON_GENFILES_DIR/${SOURCE.filebase}', src))
      for src in GetInputs('$COMMON_M4SRCS')]
 
@@ -60,19 +60,16 @@ if GetInputs('$COMMON_BINSRCS'):
   bins = [env.Bin2cpp(*PatternRule(
               '$COMMON_GENFILES_DIR/${SOURCE.file}.from_bin.cc', src))
          for src in GetInputs('$COMMON_BINSRCS')]
-  common_targets['link'] = [env.SharedObject(bin) for bin in bins]
-else:
-  common_targets['link'] = []
+  outputs['BROWSER_LINKSRCS'] = [env.SharedObject(bin) for bin in bins]
 
-Export('common_targets')
-
-env.ChromeProgram('ipc_test', GetInputs('$IPC_TEST_CPPSRCS'))
+outputs['IPC_TEST_EXE'] = env.ChromeProgram('ipc_test',
+    GetInputs('$IPC_TEST_CPPSRCS'))
 
 # Note: crash_sender.exe name needs to stay in sync with name used in
 # exception_handler_win32.cc and exception_handler_osx/google_breakpad.mm.
-crash_sender = None
+outputs['CRASH_SENDER_EXE'] = None
 if env['OS'] == 'win32':
-  crash_sender = env.ChromeProgram('crash_sender',
+  outputs['CRASH_SENDER_EXE'] = env.ChromeProgram('crash_sender',
       GetInputs('$CRASH_SENDER_CPPSRCS'),
       LIBS = Split('advapi32.lib shell32.lib wininet.lib'))
 elif env['OS'] == 'osx':
@@ -80,10 +77,12 @@ elif env['OS'] == 'osx':
   # crash_sender = env.Program('crash_sender', crash_sender_srcs,
   #     FRAMEWORKS = Split('Carbon Cocoa Foundation IOKit SystemConfiguration'),
   #     LIBS='stdc++')
-env.Alias('gears', crash_sender)
+env.Alias('gears', outputs['CRASH_SENDER_EXE'])
 
 if env['OS'] == 'osx':
-  # SF_INSTALLER_PLUGIN_EXE
-  env.ChromeSharedLibrary('stats_pane',
+  outputs['SF_INSTALLER_PLUGIN_EXE'] = env.ChromeSharedLibrary('stats_pane',
       GetInputs('$SF_INSTALLER_PLUGIN_CPPSRCS'),
       FRAMEWORKS = env['FRAMEWORKS'] + Split('Cocoa InstallerPlugins'))
+
+# See main SConscript for how 'outputs' is used.
+Return('outputs')