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, 269 insertions, 19 deletions

diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons
index d036ec7..f7cbc9d 100644
--- a/chrome/test/unit/unit_tests.scons
+++ b/chrome/test/unit/unit_tests.scons
@@ -108,20 +108,177 @@ if env.Bit('windows'):
       ],
   )
 
-unit_test_files = []
-
-unit_test_files.extend([
+input_files = ChromeFileList([
+  MSVSFilter('Common', [
+    '$CHROME_DIR/browser/browser_resources.h',
+    '$CHROME_DIR/browser/browser_resources.rc',
+    '$CHROME_DIR/test/browser_with_test_window_test.cc',
+    '$CHROME_DIR/test/browser_with_test_window_test.h',
+    'chrome_test_suite.h',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+    'run_all_unittests.cc',
+    '$CHROME_DIR/test/test_browser_window.h',
+    '$CHROME_DIR/test/test_notification_tracker.cc',
+    '$CHROME_DIR/test/test_notification_tracker.h',
+    '$CHROME_DIR/test/test_tab_contents.cc',
+    '$CHROME_DIR/test/test_tab_contents.h',
+    '$CHROME_DIR/test/testing_browser_process.h',
+    '$CHROME_DIR/test/testing_profile.cc',
+    '$CHROME_DIR/test/testing_profile.h',
+    '$CHROME_DIR/../net/url_request/url_request_test_job$OBJSUFFIX',
+    '$CHROME_DIR/../net/url_request/url_request_test_job.h',
+  ]),
+  MSVSFilter('hunspell', [
+    '$CHROME_DIR/tools/convert_dict/aff_reader$OBJSUFFIX',
+    '$CHROME_DIR/tools/convert_dict/aff_reader.h',
+    '$CHROME_DIR/third_party/hunspell/google/bdict.h',
+    '$CHROME_DIR/third_party/hunspell/google/bdict_reader$OBJSUFFIX',
+    '$CHROME_DIR/third_party/hunspell/google/bdict_reader.h',
+    '$CHROME_DIR/third_party/hunspell/google/bdict_writer$OBJSUFFIX',
+    '$CHROME_DIR/third_party/hunspell/google/bdict_writer.h',
+    '$CHROME_DIR/tools/convert_dict/dic_reader$OBJSUFFIX',
+    '$CHROME_DIR/tools/convert_dict/dic_reader.h',
+    '$CHROME_DIR/tools/convert_dict/hunspell_reader$OBJSUFFIX',
+    '$CHROME_DIR/tools/convert_dict/hunspell_reader.h',
+    '$CHROME_DIR/third_party/hunspell/google/hunspell_tests.cc',
+  ]),
+  '$CHROME_DIR/common/animation_unittest.cc',
+  '$CHROME_DIR/browser/autocomplete/autocomplete_unittest.cc',
+  '$CHROME_DIR/browser/back_forward_menu_model_unittest.cc',
+  '$CHROME_DIR/browser/safe_browsing/bloom_filter_unittest.cc',
+  '$CHROME_DIR/browser/bookmarks/bookmark_context_menu_test.cc',
+  '$CHROME_DIR/browser/bookmarks/bookmark_drag_data_unittest.cc',
+  '$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc',
+  '$CHROME_DIR/browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
+  '$CHROME_DIR/browser/bookmarks/bookmark_html_writer_unittest.cc',
+  '$CHROME_DIR/browser/bookmarks/bookmark_model_unittest.cc',
+  '$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc',
+  '$CHROME_DIR/browser/bookmarks/bookmark_utils_unittest.cc',
+  '$CHROME_DIR/browser/browser_commands_unittest.cc',
+  '$CHROME_DIR/common/bzip2_unittest.cc',
+  '$CHROME_DIR/browser/cache_manager_host_unittest.cc',
+  '$CHROME_DIR/common/chrome_plugin_unittest.cc',
+  '$CHROME_DIR/browser/chrome_thread_unittest.cc',
+  '$CHROME_DIR/browser/safe_browsing/chunk_range_unittest.cc',
+  '$CHROME_DIR/browser/controller_unittest.cc',
+  '$CHROME_DIR/browser/net/dns_host_info_unittest.cc',
+  '$CHROME_DIR/browser/net/dns_master_unittest.cc',
+  '$CHROME_DIR/browser/download/download_manager_unittest.cc',
+  '$CHROME_DIR/browser/download/download_request_manager_unittest.cc',
+  '$CHROME_DIR/common/gfx/emf_unittest.cc',
+  '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc',
+  '$CHROME_DIR/browser/history/expire_history_backend_unittest.cc',
+  '$CHROME_DIR/browser/extensions/extension_protocols_unittest.cc',
+  '$CHROME_DIR/browser/extensions/extension_unittest.cc',
+  '$CHROME_DIR/browser/extensions/extensions_service_unittest.cc',
+  '$CHROME_DIR/browser/importer/firefox_importer_unittest.cc',
+  '$CHROME_DIR/views/focus_manager_unittest.cc',
+  '$CHROME_DIR/browser/google_url_tracker_unittest.cc',
+  '$CHROME_DIR/views/grid_layout_unittest.cc',
+  '$CHROME_DIR/../googleurl/src/gurl_unittest$OBJSUFFIX',
+  '$CHROME_DIR/browser/history/history_backend_unittest.cc',
+  '$CHROME_DIR/browser/autocomplete/history_contents_provider_unittest.cc',
+  '$CHROME_DIR/browser/history/history_querying_unittest.cc',
+  '$CHROME_DIR/browser/history/history_types_unittest.cc',
+  '$CHROME_DIR/browser/history/history_unittest.cc',
+  '$CHROME_DIR/browser/autocomplete/history_url_provider_unittest.cc',
+  '$CHROME_DIR/common/gfx/icon_util_unittest.cc',
+  '$CHROME_DIR/browser/importer/importer_unittest.cc',
+  '$CHROME_DIR/common/ipc_message_unittest.cc',
+  '$CHROME_DIR/common/ipc_sync_channel_unittest.cc',
+  '$CHROME_DIR/common/ipc_sync_channel_unittest.h',
   '$CHROME_DIR/common/ipc_sync_message_unittest.cc',
+  '$CHROME_DIR/common/ipc_sync_message_unittest.h',
+  '$CHROME_DIR/common/jpeg_codec_unittest.cc',
+  '$CHROME_DIR/common/json_value_serializer_unittest.cc',
+  '$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc',
+  '$CHROME_DIR/browser/autocomplete/keyword_provider_unittest.cc',
   '$CHROME_DIR/common/l10n_util_unittest.cc',
+  '$CHROME_DIR/views/label_unittest.cc',
+  '$CHROME_DIR/browser/login_prompt_unittest.cc',
+  '$CHROME_DIR/browser/metrics/metrics_log_unittest.cc',
+  '$CHROME_DIR/browser/metrics/metrics_response_unittest.cc',
+  '$CHROME_DIR/renderer/mock_render_process.h',
+  '$CHROME_DIR/renderer/mock_render_thread.cc',
+  '$CHROME_DIR/renderer/mock_render_thread.h',
+  '$CHROME_DIR/common/mru_cache_unittest.cc',
+  '$CHROME_DIR/browser/navigation_controller_unittest.cc',
+  '$CHROME_DIR/common/notification_service_unittest.cc',
+  '$CHROME_DIR/common/os_exchange_data_unittest.cc',
+  '$CHROME_DIR/browser/printing/page_number_unittest.cc',
+  '$CHROME_DIR/browser/printing/page_overlays_unittest.cc',
+  '$CHROME_DIR/browser/printing/page_range_unittest.cc',
+  '$CHROME_DIR/browser/printing/page_setup_unittest.cc',
+  '$CHROME_DIR/browser/password_manager/password_form_manager_unittest.cc',
+  '$CHROME_DIR/common/pref_member_unittest.cc',
+  '$CHROME_DIR/common/pref_service_unittest.cc',
+  '$CHROME_DIR/browser/printing/print_job_unittest.cc',
+  '$CHROME_DIR/browser/printing/printing_test.h',
+  '$CHROME_DIR/browser/profile_manager_unittest.cc',
   '$CHROME_DIR/common/property_bag_unittest.cc',
+  '$CHROME_DIR/browser/safe_browsing/protocol_manager_unittest.cc',
+  '$CHROME_DIR/browser/safe_browsing/protocol_parser_unittest.cc',
+  '$CHROME_DIR/browser/history/query_parser_unittest.cc',
+  '$CHROME_DIR/renderer/net/render_dns_master_unittest.cc',
+  '$CHROME_DIR/renderer/net/render_dns_queue_unittest.cc',
+  '$CHROME_DIR/renderer/render_view_unittest.cc',
+  '$CHROME_DIR/renderer/render_widget_unittest.cc',
+  '$CHROME_DIR/browser/renderer_security_policy_unittest.cc',
+  '$CHROME_DIR/test/data/resource.h',
+  '$CHROME_DIR/test/data/resource.rc',
+  '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_unittest.cc',
+  '$CHROME_DIR/common/resource_dispatcher_unittest.cc',
+  '$CHROME_DIR/browser/rlz/rlz_unittest.cc',
+  '$CHROME_DIR/browser/safe_browsing/safe_browsing_database_unittest.cc',
+  '$CHROME_DIR/browser/safe_browsing/safe_browsing_util_unittest.cc',
+  '$CHROME_DIR/browser/download/save_package_unittest.cc',
+  '$CHROME_DIR/browser/sessions/session_backend_unittest.cc',
+  '$CHROME_DIR/browser/sessions/session_service_test_helper.cc',
+  '$CHROME_DIR/browser/sessions/session_service_test_helper.h',
+  '$CHROME_DIR/browser/sessions/session_service_unittest.cc',
+  '$CHROME_DIR/browser/site_instance_unittest.cc',
+  '$CHROME_DIR/browser/history/snippet_unittest.cc',
+  '$CHROME_DIR/browser/spellcheck_unittest.cc',
+  '$CHROME_DIR/browser/history/starred_url_database_unittest.cc',
+  '$CHROME_DIR/browser/sessions/tab_restore_service_unittest.cc',
+  '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc',
+  '$CHROME_DIR/views/table_view_unittest.cc',
+  '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc',
+  '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc',
+  '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc',
+  '$CHROME_DIR/browser/search_engines/template_url_unittest.cc',
+  '$CHROME_DIR/browser/history/text_database_manager_unittest.cc',
+  '$CHROME_DIR/browser/history/text_database_unittest.cc',
+  '$CHROME_DIR/common/gfx/text_elider_unittest.cc',
+  '$CHROME_DIR/browser/history/thumbnail_database_unittest.cc',
+  '$CHROME_DIR/common/time_format_unittest.cc',
+  '$CHROME_DIR/views/tree_node_iterator_unittest.cc',
+  '$CHROME_DIR/browser/printing/units_unittest.cc',
   '$CHROME_DIR/common/unzip_unittest.cc',
+  '$CHROME_DIR/../googleurl/src/url_canon_unittest$OBJSUFFIX',
+  '$CHROME_DIR/browser/history/url_database_unittest.cc',
+  '$CHROME_DIR/browser/net/url_fetcher_unittest.cc',
+  '$CHROME_DIR/browser/net/url_fixer_upper_unittest.cc',
+  '$CHROME_DIR/../googleurl/src/url_parse_unittest$OBJSUFFIX',
+  '$CHROME_DIR/../googleurl/src/url_util_unittest$OBJSUFFIX',
+  '$CHROME_DIR/browser/extensions/user_script_master_unittest.cc',
   '$CHROME_DIR/renderer/user_script_slave_unittest.cc',
+  '$CHROME_DIR/views/view_unittest.cc',
   '$CHROME_DIR/browser/history/visit_database_unittest.cc',
+  '$CHROME_DIR/browser/history/visit_tracker_unittest.cc',
+  '$CHROME_DIR/browser/visitedlink_unittest.cc',
+  '$CHROME_DIR/browser/tab_contents/web_contents_unittest.cc',
+  '$CHROME_DIR/browser/webdata/web_database_unittest.cc',
+  '$CHROME_DIR/browser/printing/win_printing_context_unittest.cc',
+  '$CHROME_DIR/common/win_util_unittest.cc',
+  '$CHROME_DIR/browser/window_sizer_unittest.cc',
+  '$CHROME_DIR/common/worker_thread_ticker_unittest.cc',
 ])
 
-if not env.Bit('mac'):
+if env.Bit('mac'):
   # TODO(port): Port to Mac.
-  unit_test_files.extend([
+  input_files.Remove(
       'run_all_unittests.cc',
 
       '$CHROME_DIR/browser/chrome_thread_unittest.cc',
@@ -157,11 +314,18 @@ if not env.Bit('mac'):
       '$CHROME_DIR/test/test_notification_tracker.cc',
 
       '$NET_DIR/base/ssl_test_util$OBJSUFFIX',
-  ])
+  )
 
-if env.Bit('windows'):
+if not env.Bit('windows'):
+  # Windows-specific.
+  input_files.Remove(
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+  )
+
+if not env.Bit('windows'):
   # TODO(port): Port these.
-  unit_test_files.extend([
+  input_files.Remove(
       '$CHROME_DIR/browser/autocomplete/autocomplete_unittest.cc',
       '$CHROME_DIR/browser/autocomplete/history_contents_provider_unittest.cc',
       '$CHROME_DIR/browser/autocomplete/history_url_provider_unittest.cc',
@@ -174,13 +338,14 @@ if env.Bit('windows'):
       '$CHROME_DIR/browser/bookmarks/bookmark_model_unittest.cc',
       '$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc',
       '$CHROME_DIR/browser/bookmarks/bookmark_utils_unittest.cc',
+      '$CHROME_DIR/browser/browser_commands_unittest.cc',
       '$CHROME_DIR/browser/cache_manager_host_unittest.cc',
       '$CHROME_DIR/browser/controller_unittest.cc',
       '$CHROME_DIR/browser/download/download_manager_unittest.cc',
       '$CHROME_DIR/browser/download/download_request_manager_unittest.cc',
       '$CHROME_DIR/browser/download/save_package_unittest.cc',
+      '$CHROME_DIR/browser/extensions/extension_protocols_unittest.cc',
       '$CHROME_DIR/browser/extensions/user_script_master_unittest.cc',
-      '$CHROME_DIR/browser/encryptor_unittest.cc',
       '$CHROME_DIR/browser/google_url_tracker_unittest.cc',
       '$CHROME_DIR/browser/history/expire_history_backend_unittest.cc',
       '$CHROME_DIR/browser/history/history_backend_unittest.cc',
@@ -198,30 +363,32 @@ if env.Bit('windows'):
       '$CHROME_DIR/browser/navigation_controller_unittest.cc',
       '$CHROME_DIR/browser/net/dns_master_unittest.cc',
       '$CHROME_DIR/browser/net/url_fixer_upper_unittest.cc',
-      '$CHROME_DIR/browser/password_form_manager_unittest.cc',
+      '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc',
+      '$CHROME_DIR/browser/password_manager/password_form_manager_unittest.cc',
       '$CHROME_DIR/browser/printing/page_number_unittest.cc',
       '$CHROME_DIR/browser/printing/page_overlays_unittest.cc',
       '$CHROME_DIR/browser/printing/print_job_unittest.cc',
       '$CHROME_DIR/browser/printing/win_printing_context_unittest.cc',
       '$CHROME_DIR/browser/profile_manager_unittest.cc',
+      '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_unittest.cc',
       '$CHROME_DIR/browser/renderer_security_policy_unittest.cc',
       '$CHROME_DIR/browser/resource_dispatcher_host_unittest.cc',
       '$CHROME_DIR/browser/rlz/rlz_unittest.cc',
       '$CHROME_DIR/browser/safe_browsing/protocol_manager_unittest.cc',
+      '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc',
+      '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc',
+      '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc',
+      '$CHROME_DIR/browser/search_engines/template_url_unittest.cc',
       '$CHROME_DIR/browser/sessions/session_backend_unittest.cc',
       '$CHROME_DIR/browser/sessions/session_service_test_helper.cc',
       '$CHROME_DIR/browser/sessions/session_service_unittest.cc',
       '$CHROME_DIR/browser/sessions/tab_restore_service_unittest.cc',
       '$CHROME_DIR/browser/site_instance_unittest.cc',
+      '$CHROME_DIR/browser/tab_contents/web_contents_unittest.cc',
       '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc',
-      '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc',
-      '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc',
-      '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc',
-      '$CHROME_DIR/browser/search_engines/template_url_unittest.cc',
       '$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc',
       '$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc',
       '$CHROME_DIR/browser/visitedlink_unittest.cc',
-      '$CHROME_DIR/browser/web_contents_unittest.cc',
       '$CHROME_DIR/browser/webdata/web_database_unittest.cc',
       '$CHROME_DIR/browser/window_sizer_unittest.cc',
       '$CHROME_DIR/common/chrome_plugin_unittest.cc',
@@ -234,12 +401,22 @@ if env.Bit('windows'):
       '$CHROME_DIR/common/resource_dispatcher_unittest.cc',
       '$CHROME_DIR/common/time_format_unittest.cc',
       '$CHROME_DIR/common/win_util_unittest.cc',
+      '$CHROME_DIR/renderer/mock_render_thread.cc',
       '$CHROME_DIR/renderer/net/render_dns_master_unittest.cc',
+      '$CHROME_DIR/renderer/render_view_unittest.cc',
       '$CHROME_DIR/renderer/render_widget_unittest.cc',
+      '$CHROME_DIR/test/browser_with_test_window_test.cc',
       '$CHROME_DIR/test/test_tab_contents.cc',
       '$CHROME_DIR/test/testing_profile.cc',
+      '$CHROME_DIR/third_party/hunspell/google/bdict_reader$OBJSUFFIX',
+      '$CHROME_DIR/third_party/hunspell/google/bdict_writer$OBJSUFFIX',
+      '$CHROME_DIR/third_party/hunspell/google/hunspell_tests.cc',
+      '$CHROME_DIR/tools/convert_dict/aff_reader$OBJSUFFIX',
+      '$CHROME_DIR/tools/convert_dict/dic_reader$OBJSUFFIX',
+      '$CHROME_DIR/tools/convert_dict/hunspell_reader$OBJSUFFIX',
       '$CHROME_DIR/views/focus_manager_unittest.cc',
       '$CHROME_DIR/views/grid_layout_unittest.cc',
+      '$CHROME_DIR/views/label_unittest.cc',
       '$CHROME_DIR/views/table_view_unittest.cc',
       '$CHROME_DIR/views/tree_node_iterator_unittest.cc',
       '$CHROME_DIR/views/view_unittest.cc',
@@ -251,17 +428,18 @@ if env.Bit('windows'):
 
       '$CHROME_DIR/browser/browser_resources.res',
       '$CHROME_DIR/test/data/resource.res',
-  ])
+  )
 
 if not env.Bit('mac'):
   # TODO(port): This should work on all platforms.
 
-  unit_tests = env.ChromeTestProgram('unit_tests', unit_test_files)
+  unit_tests = env.ChromeTestProgram('unit_tests', input_files)
 
   i = env.Install('$TARGET_ROOT', unit_tests)
   Alias('chrome', i)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/unit/unittests.vcproj',
+p = env.ChromeMSVSProject('unittests.vcproj',
+                dest='$CHROME_SRC_DIR/chrome/test/unit/unittests.vcproj',
                 name='unit_tests',
                 dependencies = [
                     '$BASE_DIR/build/base.vcproj',
@@ -305,4 +483,76 @@ env.ChromeMSVSProject('$CHROME_DIR/test/unit/unittests.vcproj',
                     '$LIBXSLT_DIR/build/libxslt.vcproj',
                     '$CHROME_DIR/app/theme/theme_dll.vcproj',
                 ],
-                guid='{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}')
+                guid='{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}',
+                # 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',
+                    'VCCLCompilerTool',
+                    'VCManagedResourceCompilerTool',
+                    MSVSTool('VCResourceCompilerTool',
+                             AdditionalIncludeDirectories=[
+                               '$(SolutionDir)..',
+                               '"$(IntDir)"',
+                               '"$(IntDir)"',
+                               '"$(SolutionDir)"',
+                               '"$(IntDir)/../"',
+                             ]),
+                    'VCPreLinkEventTool',
+                    MSVSTool('VCLinkerTool',
+                             AdditionalDependencies='winmm.lib'),
+                    'VCALinkTool',
+                    'VCManifestTool',
+                    'VCXDCMakeTool',
+                    'VCBscMakeTool',
+                    'VCFxCopTool',
+                    'VCAppVerifierTool',
+                    'VCWebDeploymentTool',
+                    'VCPostBuildEventTool',
+                ],
+                ConfigurationType='1')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../../tools/build/win/precompiled_wtl.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '$(SolutionDir)../third_party/libpng/using_libpng.vsprops',
+                '$(SolutionDir)../third_party/zlib/using_zlib.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../third_party/libxml/build/using_libxml.vsprops',
+                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+                '../../third_party/hunspell/using_hunspell.vsprops',
+                '../../../third_party/npapi/using_npapi.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '$(SolutionDir)../third_party/libpng/using_libpng.vsprops',
+                '$(SolutionDir)../third_party/zlib/using_zlib.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../third_party/libxml/build/using_libxml.vsprops',
+                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+                '../../third_party/hunspell/using_hunspell.vsprops',
+                '../../../third_party/npapi/using_npapi.vsprops',
+            ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])