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

8 files changed, 29 insertions, 9 deletions

diff --git a/net/crash_cache.scons b/net/crash_cache.scons
index 4480008b..6ddb9d7 100644
--- a/net/crash_cache.scons
+++ b/net/crash_cache.scons
@@ -33,11 +33,12 @@ input_files = ChromeFileList([
 
 if not env.Bit('mac'):
   # TODO(port): port to mac?
-  env.ChromeTestProgram('crash_cache', input_files)
+  x = env.ChromeTestProgram('crash_cache', input_files)
 
 p = env.ChromeMSVSProject('$NET_DIR/build/crash_cache.vcproj',
                           dest='$CHROME_SRC_DIR/net/build/crash_cache.vcproj',
                           guid='{B0EE0599-2913-46A0-A847-A3EC813658D3}',
+                          keyword='Win32Proj',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
                               '$NET_DIR/build/net.vcproj',
diff --git a/net/dump_cache.scons b/net/dump_cache.scons
index 57852f7..b118625 100644
--- a/net/dump_cache.scons
+++ b/net/dump_cache.scons
@@ -37,6 +37,7 @@ if env.Bit('windows'):
 p = env.ChromeMSVSProject('$NET_DIR/build/dump_cache.vcproj',
                           dest='$CHROME_SRC_DIR/net/build/dump_cache.vcproj',
                           guid='{4A14E455-2B7C-4C0F-BCC2-35A9666C186F}',
+                          keyword='Win32Proj',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
                               '$NET_DIR/build/net.vcproj',
diff --git a/net/net_lib.scons b/net/net_lib.scons
index 9495a08..043db5c 100644
--- a/net/net_lib.scons
+++ b/net/net_lib.scons
@@ -36,6 +36,7 @@ input_files = ChromeFileList([
     'base/client_socket_pool.h',
     'base/completion_callback.h',
     'base/connection_type_histograms.cc',
+    'base/connection_type_histograms.h',
     'base/cookie_monster.cc',
     'base/cookie_monster.h',
     'base/cookie_policy.cc',
@@ -336,6 +337,7 @@ lib = env.ChromeLibrary('net', input_files)
 p = env.ChromeMSVSProject('$NET_DIR/build/net.vcproj',
                           dest='$CHROME_SRC_DIR/net/build/net.vcproj',
                           guid='{326E9795-E760-410A-B69A-3F79DB3F5243}',
+                          keyword='Win32Proj',
                           dependencies = [
                               '$NET_DIR/build/net_resources.vcproj',
                               '$NET_DIR/build/tld_cleanup.vcproj',
diff --git a/net/net_perftests.scons b/net/net_perftests.scons
index 6cbe6d9..570eeca 100644
--- a/net/net_perftests.scons
+++ b/net/net_perftests.scons
@@ -63,6 +63,7 @@ env.ChromeMSVSProject('$NET_DIR/build/net_perftests.vcproj',
 p = env.ChromeMSVSProject('$NET_DIR/build/net_perftests.vcproj',
                           dest='$CHROME_SRC_DIR/net/build/net_perftests.vcproj',
                           guid='{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}',
+                          keyword='Win32Proj',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
                               '$NET_DIR/build/net.vcproj',
diff --git a/net/net_resources.scons b/net/net_resources.scons
index a48a654..1bc534e 100644
--- a/net/net_resources.scons
+++ b/net/net_resources.scons
@@ -44,10 +44,21 @@ if env.Bit('windows'):
     net_resources.extend(net_res)
     env.Depends(net_res, tld_names_clean)
 
+  input_files = ChromeFileList([
+      'base/net_resources.grd',
+      Derived(env.File('$TARGET_ROOT/grit_derived_sources/net_resources.h')),
+  ])
+
   p = env.ChromeMSVSProject('build/net_resources.vcproj',
-                            dest='$CHROME_SRC_DIR/net/build/net_resources.vcproj',
+                            dest=('$CHROME_SRC_DIR/net/'
+                                  + 'build/net_resources.vcproj'),
                             guid='{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}',
-                            buildtargets=net_resources,
+                            keyword='Win32Proj',
+                            #buildtargets=net_resources,
+                            files=input_files,
+                            relative_path_substitutions = [
+                              ('../../..', '$(OutDir)'),
+                            ],
                             ConfigurationType='10')
 
   p.AddToolFile('../tools/grit/build/grit_resources.rules')
diff --git a/net/net_unittests.scons b/net/net_unittests.scons
index 8f91e18..4f35414 100644
--- a/net/net_unittests.scons
+++ b/net/net_unittests.scons
@@ -39,7 +39,8 @@ input_files = ChromeFileList([
   # reindent too much when we remove the explicit MSVSFilter() calls
   # in favor of generating the hierarchy to reflect the file system.
   MSVSFilter('support', [
-    'build/precompiled_net$OBJSUFFIX',
+    # Built from build/precomiled_net.cc, net_lib.scons.
+    'precompiled_net$OBJSUFFIX',
     'build/precompiled_net.h',
     'base/run_all_unittests.cc',
   ]),
@@ -71,9 +72,6 @@ input_files = ChromeFileList([
     'http/http_util_unittest.cc',
     'http/http_vary_data_unittest.cc',
     ]),
-   MSVSFilter('ftp', [
-    'ftp/ftp_auth_cache_unittest.cc',
-    ]),
    MSVSFilter('base', [
     'base/base64_unittest.cc',
     'base/bzip2_filter_unittest.cc',
@@ -102,6 +100,9 @@ input_files = ChromeFileList([
     'base/wininet_util_unittest.cc',
     'base/x509_certificate_unittest.cc',
     ]),
+   MSVSFilter('ftp', [
+    'ftp/ftp_auth_cache_unittest.cc',
+    ]),
    MSVSFilter('url_request', [
     'url_request/url_request_unittest.cc',
     'url_request/url_request_unittest.h',
@@ -116,7 +117,7 @@ input_files = ChromeFileList([
 if not env.Bit('windows'):
   input_files.Remove(
       'base/wininet_util_unittest.cc',
-      'build/precompiled_net$OBJSUFFIX',
+      'precompiled_net$OBJSUFFIX',
   )
 
 if env.Bit('linux'):
@@ -143,6 +144,8 @@ net_unittests = env.ChromeTestProgram('net_unittests', input_files)
 
 p = env.ChromeMSVSProject('$NET_DIR/build/net_unittests.vcproj',
                           dest='$CHROME_SRC_DIR/net/build/net_unittests.vcproj',
+                          guid='{E99DA267-BE90-4F45-88A1-6919DB2C7567}',
+                          keyword='Win32Proj',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
                               '$BZIP2_DIR/bzip2.vcproj',
@@ -154,7 +157,6 @@ p = env.ChromeMSVSProject('$NET_DIR/build/net_unittests.vcproj',
                               '$GOOGLEURL_DIR/build/googleurl.vcproj',
                               '$SDCH_DIR/sdch.vcproj',
                           ],
-                          guid='{E99DA267-BE90-4F45-88A1-6919DB2C7567}',
                           # TODO: restore when we can derive all info,
                           # on all platforms, from the windows build targets.
                           #buildtargets=net_unittests,
diff --git a/net/stress_cache.scons b/net/stress_cache.scons
index fba9d09..d777d57 100644
--- a/net/stress_cache.scons
+++ b/net/stress_cache.scons
@@ -47,6 +47,7 @@ if not env.Bit('mac'):
 p = env.ChromeMSVSProject('$NET_DIR/build/stress_cache.vcproj',
                           dest='$CHROME_SRC_DIR/net/build/stress_cache.vcproj',
                           guid='{B491C3A1-DE5F-4843-A1BB-AB8C4337187B}',
+                          keyword='Win32Proj',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
                               '$NET_DIR/build/net.vcproj',
diff --git a/net/tools/tld_cleanup/tld_cleanup.scons b/net/tools/tld_cleanup/tld_cleanup.scons
index 4ab9066..5708179 100644
--- a/net/tools/tld_cleanup/tld_cleanup.scons
+++ b/net/tools/tld_cleanup/tld_cleanup.scons
@@ -32,6 +32,7 @@ env.ChromeProgram('tld_cleanup', input_files)
 p = env.ChromeMSVSProject('$NET_DIR/build/tld_cleanup.vcproj',
                           dest='$CHROME_SRC_DIR/net/build/tld_cleanup.vcproj',
                           guid='{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}',
+                          keyword='Win32Proj',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
                               '$ICU38_DIR/build/icu.vcproj',