Use a variant_dir when building gears.dll so building the different ports...

gears/SConscript.dll

 # Copyright (c) 2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import re
 
 Import('env')
 
-env = env.Clone(
-    OPEN_DIR = "$GEARS_DIR/googleclient/gears/opensource/gears",
-    THIRD_PARTY_DIR = "$GEARS_DIR/googleclient/gears/opensource/third_party",
-    GENFILES_DIR = "$GEARS_DIR/genfiles",
-    PRIVATE_THIRD_PARTY_DIR = "$GEARS_DIR/googleclient/third_party",
-)
+env = env.Clone()
 
 # Notes:
 # This assumes you have a working gears checkout from p4 in the current dir.
 # Steps for this:
 # > echo %USER%-chromegears > p4config
 # > g4 client -p //depot/googleclient/gears/p4_depot_paths
 # > g4 sync
 #
 # This is a work-in-progress conversion of the current Gears set of Makefiles.
 # A lot of the stuff doesn't translate to SCons-land well, and I'm not sure
 # how faithful we want to be to the original.
 #
 # Questions:
 # Should we flatten the output directory into
 # Hammer/gears/platform/browser/*.obj like Gears does now?  If so, how?
-#
-# TODO: split into env_common, env_browser, etc?
-# common_* stuff will be built once, and object reused for all browser builds.
-# browser_* stuff will be rebuilt for each different type of BROWSER define.
-#   - How do we do this?  We want browser_ stuff under a different dir so
-#     BROWSER=NPAPI doesn't overwrite BROWSER=FF3's object files.
-#     Maybe put all the browser stuff in a separate .lib, and use variant_dir
-#     on a SConscript.browser?
 
-# Argument switches
-vars = Variables(None, ARGUMENTS)
-vars.AddVariables(
-  EnumVariable('BROWSER',
-      'Which browser we want to build the plugin for',
-      'NPAPI', ['IE', 'FF2', 'FF3', 'SF', 'NPAPI']),
-  EnumVariable('MODE',
-      'Type of binary to generate',
-      'dbg', ['dbg', 'opt']),
-  BoolVariable('OFFICIAL_BUILD',
-      'Create a binary suitable for public release', 0)
-)
-vars.Update(env)
-
-env.Prepend(
-    USING_CCTESTS = (env['MODE'] == 'dbg' or not env['OFFICIAL_BUILD'])
-)
-
-# Version
-env.Prepend(
-    MAJOR = '0',
-    MINOR = '4',
-    BUILD = '17',
-    PATCH = '0',
-    VERSION = '${MAJOR}.${MINOR}.${BUILD}.${PATCH}',
-
-    FRIENDLY_NAME = 'Gears',
-    SHORT_NAME = 'gears',
-)
-
-# Platform
-env.Prepend(
-    OS = '$PLATFORM',
-    ARCH = 'i386',
-)
-
-
+# TODO: move all these builders out to site_scons or somesuch.
 # Building M4 files
 
 env.Tool('m4')
 
 # Add GNU tools to the PATH.
 # TODO: Figure out the right way to do this.  On first invocation, PATH
 # is relative to '.'.  On repeated invocations (when Hammer/gears exists),
 # PATH is relative to './Hammer/gears'.
 # TODO: Also it would be nice to use $THIRD_PARTY_DIR instead of hardcoding
 # it here.
 env.PrependENVPath('PATH', os.path.abspath(
     'googleclient/third_party/gnu/files'))
 env.PrependENVPath('PATH', os.path.abspath(
-    '../../googleclient/third_party/gnu/files'))
+    '../../../../googleclient/third_party/gnu/files'))
 env.PrependENVPath('PATH', os.path.abspath(
     'googleclient/third_party/python_24'))
 env.PrependENVPath('PATH', os.path.abspath(
-    '../../googleclient/third_party/python_24'))
+    '../../../../googleclient/third_party/python_24'))
+
+print 'path=', env['ENV']['PATH']

[sgk, 2008/09/22 19:28:57]

leftover debug print?

 
 i18n_langs = [
     'en-US',
     'ar',
     'bg',
     'ca',
     'cs',
     'da',
     'de',
     'el',
@@ skipping 37 matching lines @@
     'ml',
     'te',
     'gu',
     'kn',
     'or',
     'bn',
     'ta',
     'mr',
 ]
 
-# TODO: switch over to Chrome's SDK.
-env.Replace(
-    CPPPATH = [
-        '$PRIVATE_THIRD_PARTY_DIR/platformsdk_vc80/files/include',
-        '$PRIVATE_THIRD_PARTY_DIR/atlmfc_vc80/files/include',
-    ],
-)
-
 # TODO: DEBUG, OFFICIAL_BUILD, CCTESTS, I18N_LANGUAGES
 env.Prepend(
     M4FLAGS = [
         '--prefix-builtins',
         '-DDEBUG=1',
         '-DPRODUCT_VERSION=$VERSION',
         '-DPRODUCT_VERSION_MAJOR=$MAJOR',
         '-DPRODUCT_VERSION_MINOR=$MINOR',
         '-DPRODUCT_VERSION_BUILD=$BUILD',
         '-DPRODUCT_VERSION_PATCH=$PATCH',
@@ skipping 95 matching lines @@
   # Install()).
   t = [os.path.join(str(env.Dir('$IDLOUTPUTDIR')), os.path.basename(x))
        for x in t]
   return (t, source)
 b = env['BUILDERS']['TypeLibrary']
 emitter_list = [b.emitter, MyIdlEmitter]
 b.emitter = SCons.Builder.ListEmitter(emitter_list)
 
 # C++ defines
 
-# TODO: fix Gears to not require this removal.
-env['CPPDEFINES'].remove('WIN32_LEAN_AND_MEAN')
-
-env.Prepend(
-    CPPPATH = [
-        '$OPEN_DIR',
-        '$OPEN_DIR/..',
-        '$THIRD_PARTY_DIR',
-        '$THIRD_PARTY_DIR/breakpad/src',
-        '$THIRD_PARTY_DIR/googleurl',
-        '$THIRD_PARTY_DIR/npapi',
-        '$THIRD_PARTY_DIR/zlib',
-        '$THIRD_PARTY_DIR/v8/bindings_local',
-        '$GEARS_DIR',
-    ],
-)
-
-env.Append(
-    CPPDEFINES = [
-        'DEBUG=1',
-        '_DEBUG=1',
-        'USING_CCTESTS=1',
-    ],
-
-)
-
-# TODO: if USING_PNG
-env.Append(
-    CPPDEFINES = [
-        'PNG_USER_CONFIG',
-    ],
-)
-
-# TODO: is this needed?
-if env['PLATFORM'] == 'win32':
-# We require APPVER=5.0 for things like HWND_MESSAGE.
-# When APPVER=5.0, win32.mak in the Platform SDK sets:
-#   C defines:  WINVER=0x0500
-#               _WIN32_WINNT=0x0500
-#               _WIN32_IE=0x0500
-#               _RICHEDIT_VER=0x0010
-#   RC defines: WINVER=0x0500
-#   MIDL flags: /target NT50
-# Note: _WIN32_WINDOWS was replaced by _WIN32_WINNT for post-Win95 builds.
-# Note: XP_WIN is only used by Firefox headers
-  env.Append(
-      CPPDEFINES = [
-          'STRICT',
-          '_USRDLL',
-          '_WINDLL',
-#          'WINVER=0x0500',
-#          '_WIN32_WINNT=0x0500',
-          '_WIN32_IE=0x0500',
-          '_RICHEDIT_VER=0x0010',
-          '_MERGE_PROXYSTUB',
-          'BREAKPAD_AVOID_STREAMS',  # TODO: move to breakpad env
-          'XP_WIN',
-      ],
-      LINKFLAGS = [
-# Set the preferred base address.  This value was chosen because (a) it's near
-# the top of the valid address range, and (b) it doesn't conflict with other
-# DLLs loaded by Chrome in either the browser or plugin process.
-          '/BASE:0x65000000',
-      ],
-  )
-
-env.Append(
-    CPPFLAGS = [
-        '/wd4018'
-    ]
-)
-
 env_common = env.Clone()
 env_common.Prepend(
 )
 
 env_browser = env.Clone()
 env_browser.Prepend(
     CPPDEFINES = [
         'BROWSER_${BROWSER}=1',
     ],
 )
@@ skipping 50 matching lines @@
     ],
 )
 
 if env['PLATFORM'] == 'win32':
   env.Append(
       RCFLAGS = [
           ['/l', '0x409'],
       ],
   )
 
+if env['PLATFORM'] == 'win32':
+  env.Append(
+      CPPFLAGS = [
+        '/wd4018'  # TODO: move to breakpad
+      ]
+  )
 
 # Input file lists
 
 def NewInputs():
   """Returns a new dictionary of input file lists.
 
   Browser-specific inputs are referenced by the browser name.  All browsers
   include inputs from the 'all' list.  'common' inputs are built using
   env_common."""
 
@@ skipping 664 matching lines @@
     '$THIRD_PARTY_DIR/v8/bin-dbg/no_snapshotv8.lib',
     '$THIRD_PARTY_DIR/v8/bin-dbg/libjscre.lib',
     '$THIRD_PARTY_DIR/skia/skia-dbg-win32-i386.lib',
 ]
 
 if env['BROWSER'] == 'NPAPI':
   libs += ['$OPEN_DIR/base/chrome/module.def',]
 elif env['BROWSER'] == 'IE':
   libs += ['$OPEN_DIR/tools/mscom.def',]
 
-sconscripts = [
-    'SConscript.libgd',
-    'SConscript.libjpeg',
-    'SConscript.libpng',
-    'SConscript.portaudio',
-    'SConscript.sqlite',
-    'SConscript.zlib',
-]
-
 # TODO: all the other ports, including third-party libs
 # - IE, FF[23], SAFARI, android, symbian
 # - breakpad[_osx]
 # - glint
 # - growl
 # - spidermonkey
 # - libspeex
 # - libtremor
 # - vista broker  
 # TODO: other targets
@@ skipping 38 matching lines @@
       env_browser.Depends(html_m4, stab)
 
 #  genfiles/%.from_bin.cc: %
 bins = [env_common.Bin2cpp(src + '.from_bin.cc', src)
         for src in binsrcs['common']]
 installed_bins = env_common.Install('$GENFILES_DIR', bins)
 srcs['all'] += installed_bins
 
 #  genfiles/%.h: %.idl
 # Note: the emitter fixes the targets to be put in genfiles.
-idls = [env_browser.TypeLibrary(src)
-        for src in idlsrcs['all']]
-installed_idls = idls
-srcs['all'] += [x for x in installed_idls[0] if str(x).endswith('_i.c')]
+if idlsrcs['all']:
+  idls = [env_browser.TypeLibrary(src)
+          for src in idlsrcs['all']]
+  installed_idls = idls
+  srcs['all'] += [x for x in installed_idls[0] if str(x).endswith('_i.c')]
 
 # TODO: figure out why the .rc scanner doesn't notice these dependencies.
 env_browser.Depends(dll_resources[0], installed_html_m4s)
 env_browser.Depends(dll_resources[1], installed_m4s)
 
-env_browser.SConscript(sconscripts, exports=['env'])
-
 lib = env_browser.ChromeSharedLibrary('gears',
     srcs['all'] + libs + dll_resources)
 env_browser.Alias('gears', lib)