Generate all chrome .vcproj files:

* Path name translation (/ to \) of various MSVSTool attributes.
* Explicit keyword= arguments to MSVSProject.  This will likely
  go away eventually in favor of uniform behavior.
* Add a relative_path_substitutions array that can be used
  to substitute in Visual Studio variable like $(OutDir).
* Add a local_directory_prefix that can be set to './' to only
  affect files in the current directory.
* Additional Keyword ordering in Tool attributes to continue to
  match the default order Visual Studio generates.
* Add a Derived() proxy class that can wrap a File node to tell
  the .vcproj generation that we want the derived file, not its
  source(s), in the file list.
* In the individual *.scons files, add the necessary files (mostly
  .h files) to file lists, and update MSVSProject() calls with
  the additional necessary information.

Result is identical .vcproj files modulo the following differences:

* Four locales .vcproj files (da, en-US, he and zh-TW) with
  source file orders that don't match the other locale .vcproj
  files have re-ordered file lists to match the rest.
* Cosmetic XML changes (white space, ending tags) in:
    chrome/app/chrome_dll.vcproj
    chrome/app/generated_resources.vcproj
    net/build/net_resources.vcproj
* Removal or addition of ./ prefixes from various files that don't
  match the other file specifications within their individual
  .vcproj files:
    chrome/installer/util/util.vcproj
    net/build/net.vcproj
    net/build/net_unittests.vcproj
* Add missing empty sections (<ToolFiles>, <References>, <Globals>)
  for consistency with other .vcproj files:
    chrome/tools/test/image_diff/image_diff.vcproj
    third_party/libpng/libpng.vcproj
    third_party/zlib/zlib.vcproj
* Add missing RootNameSpace attribute:
    chrome/test/automation/automation.vcproj
    testing/gtest.vcproj
* Use && instead of \r\n as a command separator, to sidestep
  XML-generation problems:
    chrome/app/chrome_exe.vcproj
* Remove unnecessary (?) duplicate files in the file list:
    chrome/browser/views/browser_views.vcproj
      (event_utils.cc and event_utils.h were duplicated)
  
Review URL: http://codereview.chromium.org/17603

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

1 files changed, 7 insertions, 1 deletions

diff --git a/chrome/chrome.scons b/chrome/chrome.scons
index e07b0a4..c78e095 100644
--- a/chrome/chrome.scons
+++ b/chrome/chrome.scons
@@ -12,6 +12,7 @@ Import('env')
 env.Append(
     COMPONENT_PROGRAM_GROUPS = ['chrome'],
     COMPONENT_TEST_PROGRAM_GROUPS = ['chrome'],
+    STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME = 1,
 )
 
 
@@ -19,7 +20,8 @@ env.Append(
 def chrome_version_emitter(target, source, env):
     source.append(env.File('$CHROME_SRC_DIR/chrome/VERSION'))
     # TODO(sgk):  parameterize for chromium-vs.-google_chrome
-    source.append(env.File('$CHROME_SRC_DIR/chrome/app/theme/google_chrome/BRANDING'))
+    source.append(env.File('$CHROME_SRC_DIR/chrome/'
+                           + 'app/theme/google_chrome/BRANDING'))
     return target, source
 
 b = Builder(action = '$CHROME_VERSION_RC_COM',
@@ -49,8 +51,12 @@ sconscript_files = env.ChromiumLoadComponentSConscripts(
     debugger            = 'browser/debugger/debugger.scons',
     common              = 'common/common.scons',
     ipc_tests           = 'common/ipc_tests.scons',
+    #gcapi_dll           = 'installer/gcapi/gcapi_dll.scons',
+    #gcapi_lib           = 'installer/gcapi/gcapi_lib.scons',
+    #gcapi_test          = 'installer/gcapi/gcapi_test.scons',
     mini_installer      = 'installer/mini_installer/mini_installer.scons',
     setup               = 'installer/setup/setup.scons',
+    #installer_unittests = 'installer/util/installer_unittests.scons',
     util                = 'installer/util/util.scons',
     installer_unittests = 'installer/util/installer_unittests.scons',
     plugin              = 'plugin/plugin.scons',