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, 130 insertions, 56 deletions

diff --git a/chrome/test/perf/perftests.scons b/chrome/test/perf/perftests.scons
index 2767199..b645d38 100644
--- a/chrome/test/perf/perftests.scons
+++ b/chrome/test/perf/perftests.scons
@@ -35,16 +35,6 @@ if env.Bit('posix'):
       '$LIBEVENT_DIR/using_libevent.scons',
   ], {'env':env})
 
-input_files = [
-    'perftests.cc',
-    'url_parse_perftest.cc',
-    '$BASE_DIR/perftimer$OBJSUFFIX',
-    '$CHROME_DIR/browser/safe_browsing/database_perftest.cc',
-    '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX',
-    '$CHROME_DIR/browser/visitedlink_perftest.cc',
-    '$CHROME_DIR/common/json_value_serializer_perftest.cc',
-]
-
 if env.Bit('windows'):
   env.Prepend(
       LIBS = [
@@ -54,64 +44,148 @@ if env.Bit('windows'):
       ]
   )
 
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('TestVisitedLink', [
+    '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX',
+    '$CHROME_DIR/browser/visitedlink_perftest.cc',
+  ]),
+  MSVSFilter('Common', [
+    'perftests.cc',
+    '$BASE_DIR/perftimer$OBJSUFFIX',
+  ]),
+  MSVSFilter('TestURLParser', [
+    'url_parse_perftest.cc',
+  ]),
+  MSVSFilter('TestJSONSerializer', [
+    '$CHROME_DIR/common/json_value_serializer_perftest.cc',
+  ]),
+  MSVSFilter('TestSafeBrowsing', [
+    '$CHROME_DIR/browser/safe_browsing/database_perftest.cc',
+  ]),
+])
+
 if env.Bit('linux'):
   # TODO(port): Port these files.
-  remove_files = [
+  input_files.Remove(
       'url_parse_perftest.cc',
       '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX',
       '$CHROME_DIR/browser/visitedlink_perftest.cc',
-  ]
-  for file in remove_files:
-    input_files.remove(file)
+  )
 
 if env.Bit('mac'):
   # TODO(port): Port these files.
-  remove_files = [
+  input_files.Remove(
       'url_parse_perftest.cc',
       '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX',
       '$CHROME_DIR/browser/visitedlink_perftest.cc',
-  ]
-  for file in remove_files:
-    input_files.remove(file)
+  )
 
 if not env.Bit('mac'):
   env.ChromeTestProgram('perf_tests', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/perf/perftests.vcproj',
-                name='perf_tests',
-                dependencies = [
-                    '$BASE_DIR/build/base.vcproj',
-                    '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
-                    '$CHROME_DIR/plugin/plugin.vcproj',
-                    '$LIBJPEG_DIR/libjpeg.vcproj',
-                    '$BZIP2_DIR/bzip2.vcproj',
-                    '$NET_DIR/build/net.vcproj',
-                    '$WEBKIT_DIR/build/JavaScriptCore/JavaScriptCore_pcre.vcproj',
-                    '$WEBKIT_DIR/build/port/port.vcproj',
-                    '$CHROME_DIR/browser/debugger/debugger.vcproj',
-                    '$WEBKIT_DIR/default_plugin/default_plugin.vcproj',
-                    '$CHROME_DIR/browser/browser.vcproj',
-                    '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
-                    '$SQLITE_DIR/sqlite.vcproj',
-                    '$CHROME_DIR/views/views.vcproj',
-                    '$MODP_B64_DIR/modp_b64.vcproj',
-                    '$ZLIB_DIR/zlib.vcproj',
-                    '$CHROME_DIR/common/common.vcproj',
-                    '$ICU38_DIR/build/icu.vcproj',
-                    '$CHROME_DIR/renderer/renderer.vcproj',
-                    '$BASE_DIR/build/base_gfx.vcproj',
-                    '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
-                    '$TESTING_DIR/gtest.vcproj',
-                    '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj',
-                    '$LIBPNG_DIR/libpng.vcproj',
-                    '$WEBKIT_DIR/build/glue/glue.vcproj',
-                    '$SKIA_DIR/skia.vcproj',
-                    '$CHROME_DIR/third_party/hunspell/hunspell.vcproj',
-                    '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                    '$CHROME_DIR/installer/util/util.vcproj',
-                    '$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
-                    '$SDCH_DIR/sdch.vcproj',
-                    '$CHROME_DIR/browser/views/browser_views.vcproj',
-                    '$LIBXSLT_DIR/build/libxslt.vcproj',
-                ],
-                guid='{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}')
+p = env.ChromeMSVSProject('perftests.vcproj',
+                          name='perf_tests',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'test/perf/perftests.vcproj'),
+                          guid='{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$BASE_DIR/build/base.vcproj',
+                              '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
+                              '$CHROME_DIR/plugin/plugin.vcproj',
+                              '$LIBJPEG_DIR/libjpeg.vcproj',
+                              '$BZIP2_DIR/bzip2.vcproj',
+                              '$NET_DIR/build/net.vcproj',
+                              ('$WEBKIT_DIR/build/'
+                               + 'JavaScriptCore/JavaScriptCore_pcre.vcproj'),
+                              '$WEBKIT_DIR/build/port/port.vcproj',
+                              '$CHROME_DIR/browser/debugger/debugger.vcproj',
+                              ('$WEBKIT_DIR/default_plugin/'
+                               + 'default_plugin.vcproj'),
+                              '$CHROME_DIR/browser/browser.vcproj',
+                              '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
+                              '$SQLITE_DIR/sqlite.vcproj',
+                              '$CHROME_DIR/views/views.vcproj',
+                              '$MODP_B64_DIR/modp_b64.vcproj',
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$CHROME_DIR/renderer/renderer.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
+                              '$TESTING_DIR/gtest.vcproj',
+                              '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj',
+                              '$LIBPNG_DIR/libpng.vcproj',
+                              '$WEBKIT_DIR/build/glue/glue.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                              ('$CHROME_DIR/third_party/'
+                               + 'hunspell/hunspell.vcproj'),
+                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                              '$CHROME_DIR/installer/util/util.vcproj',
+                              '$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
+                              '$SDCH_DIR/sdch.vcproj',
+                              '$CHROME_DIR/browser/views/browser_views.vcproj',
+                              '$LIBXSLT_DIR/build/libxslt.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              MSVSTool('VCCLCompilerTool',
+                                       PreprocessorDefinitions=[
+                                           'PERF_TEST',
+                                           '_CRT_RAND_S',
+                                       ]),
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              MSVSTool('VCLinkerTool',
+                                       AdditionalDependencies=[
+                                           'shlwapi.lib',
+                                           'rpcrt4.lib',
+                                           'winmm.lib',
+                                       ],
+                                       SubSystem='1'),
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+                ('$(SolutionDir)../'
+                 + 'third_party/libxml/build/using_libxml.vsprops'),
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+                ('$(SolutionDir)../'
+                 + 'third_party/libxml/build/using_libxml.vsprops'),
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+            ])