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, 17 insertions, 14 deletions

diff --git a/gears/SConscript.browser b/gears/SConscript.browser
index 6e963a8..cb853d7 100644
--- a/gears/SConscript.browser
+++ b/gears/SConscript.browser
@@ -384,8 +384,7 @@ if env['OS'] == 'win32':
 def PatternRule(t, s): return utils.PatternRule(t, s, env)
 def GetInputs(var): return utils.GetInputs(var, env)
 
-# Include the common targets generated by SConscript.common.
-Import('common_targets')
+outputs = {}
 
 # genfiles/%: %.m4
 m4s = [env.M4(*PatternRule('$GENFILES_DIR/${SOURCE.filebase}', src))
@@ -427,7 +426,7 @@ for src in GetInputs('$BROWSER_IDLSRCS'):
     xptsrcs += [x for x in idl if str(x).endswith('.xpt')]
 
 if env['BROWSER'] in ['FF2', 'FF3']:
-  env.XptLink('gears.xpt', xptsrcs)
+  outputs['MODULE_TYPELIB'] = env.XptLink('gears.xpt', xptsrcs)
 
 # genfiles/%.res: %.rc
 env.Append(BROWSER_LINKSRCS = [
@@ -436,9 +435,6 @@ env.Append(BROWSER_LINKSRCS = [
      for src in GetInputs('$BROWSER_RESSRCS')]
 ])
 
-# Add common sources.
-env.Append(BROWSER_LINKSRCS = common_targets['link'])
-
 # TODO: figure out why the .rc scanner doesn't notice these dependencies.
 if env['OS'] in ['win32', 'wince'] and env['BROWSER'] in ['NPAPI', 'IE']:
   env.Depends('$GENFILES_DIR/ui_resources.rc', html_m4s)
@@ -488,17 +484,19 @@ if env['BROWSER'] == 'SF':
 module = env.ChromeSharedLibrary('gears-$OS-$ARCH-$MODE-${BROWSER}',
     env.SharedObject(GetInputs('$BROWSER_CPPSRCS')) +
     GetInputs('$BROWSER_LINKSRCS'))
-module = env.InstallAs('${SHLIBPREFIX}gears${SHLIBSUFFIX}', module)
+outputs['MODULE'] = env.InstallAs('${SHLIBPREFIX}gears${SHLIBSUFFIX}', module)
 if env['OS'] in ['win32', 'wince'] and env['MODE'] == 'dbg':
-  module += env.InstallAs('gears.pdb', 'gears-$OS-$ARCH-$MODE-${BROWSER}.pdb')
-env.Alias('gears', module)
+  outputs['MODULE_PDB'] = env.InstallAs('gears.pdb',
+      'gears-$OS-$ARCH-$MODE-${BROWSER}.pdb')
+  env.Alias('gears', outputs['MODULE_PDB'])
+env.Alias('gears', outputs['MODULE'])
 
 if env['OS'] == 'wince':
   env.Append(WINCE_SETUP_LINKSRCS = [
       [env_res.RES(*PatternRule('$GENFILES_DIR/${SOURCE.filebase}.res', src))
        for src in GetInputs('$WINCE_SETUP_RESSRCS')]
   ])
-  wince_setup = env.ChromeSharedLibrary('setup',
+  outputs['WINCE_SETUP_DLL'] = env.ChromeSharedLibrary('setup',
       env.SharedObject(GetInputs('$WINCE_SETUP_CPPSRCS')) +
       GetInputs('$WINCE_SETUP_LINKSRCS'))
 
@@ -513,12 +511,17 @@ if env['OS'] == 'win32' and env['BROWSER'] == 'IE':
            env_res.File(src), EXTRA_DEFINES = 'VISTA_BROKER=1')
        for src in GetInputs('$VISTA_BROKER_RESSRCS')]
   ])
-  vista_broker = env.ChromeProgram('vista_broker',
+  outputs['VISTA_BROKER_EXE'] = env.ChromeProgram('vista_broker',
       env.SharedObject(GetInputs('$VISTA_BROKER_CPPSRCS')) +
       GetInputs('$VISTA_BROKER_LINKSRCS'))
-  env.Alias('gears', vista_broker)
+  env.Alias('gears', outputs['VISTA_BROKER_EXE'])
 
 if env['BROWSER'] == 'SF':
-  env.ChromeSharedLibrary('gears_proxy', GetInputs('$SF_PROXY_DLL_CPPSRCS'))
-  env.ChromeProgram('GearsEnabler', GetInputs('$SF_INPUTMANAGER_CPPSRCS'),
+  outputs['PROXY_DLL'] = env.ChromeSharedLibrary('gears_proxy',
+      GetInputs('$SF_PROXY_DLL_CPPSRCS'))
+  outputs['INPUTMANAGER_EXE'] = env.ChromeProgram('GearsEnabler',
+      GetInputs('$SF_INPUTMANAGER_CPPSRCS'),
       FRAMEWORKS = env['FRAMEWORKS'] + Split('Foundation AppKit'))
+
+# See main SConscript for how 'outputs' is used.
+Return('outputs')