diff options
author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-08 04:29:55 +0000 |
---|---|---|
committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-08 04:29:55 +0000 |
commit | 5b67b116e9caa53d1aa5a62129431c8d7f5473be (patch) | |
tree | 598889e4d9c67b1139f0ca19e4c3244b97be4b2f /webkit/tools | |
parent | 7091ca47e63c66e8f9f9b02508ea4cbc25ab3aff (diff) | |
download | chromium_src-5b67b116e9caa53d1aa5a62129431c8d7f5473be.zip chromium_src-5b67b116e9caa53d1aa5a62129431c8d7f5473be.tar.gz chromium_src-5b67b116e9caa53d1aa5a62129431c8d7f5473be.tar.bz2 |
Convert the webkit build on Windows to gyp:
* build\all.gyp now uses webkit\webkit.gyp and
webkit\tools\test_shell\test_shell.gyp.
* 'svn remove' checked-in .sln and .vcproj files that will now
become gyp-generated files. (We'll leave the other old ones
in place, uncalled, and remove them with a later CL.)
* Add generated *.sln and *.vcproj files to svn:ignore on
the relevant directories.
* Update various chrome\**.vcproj files with the new gyp directory
in which various generated webkit files will now appear.
* Update the checked-in chrome\chrome.sln with all (?) the changes
necessary to reflect the new gyp generation.
Review URL: http://codereview.chromium.org/115115
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r-- | webkit/tools/test_shell/test_shell.vcproj | 359 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell_tests.vcproj | 469 |
2 files changed, 0 insertions, 828 deletions
diff --git a/webkit/tools/test_shell/test_shell.vcproj b/webkit/tools/test_shell/test_shell.vcproj deleted file mode 100644 index 9525a72..0000000 --- a/webkit/tools/test_shell/test_shell.vcproj +++ /dev/null @@ -1,359 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="test_shell"
- ProjectGUID="{FA39524D-3067-4141-888D-28A86C66F2B9}"
- RootNamespace="test_shell"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\test_shell.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\test_shell.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="resources"
- >
- <File
- RelativePath="$(OutDir)\obj\global_intermediate\net\net_resources.rc"
- >
- </File>
- <File
- RelativePath="..\..\glue\resources\pan_east.cur"
- >
- </File>
- <File
- RelativePath="..\..\glue\resources\pan_middle.cur"
- >
- </File>
- <File
- RelativePath="..\..\glue\resources\pan_north.cur"
- >
- </File>
- <File
- RelativePath="..\..\glue\resources\pan_north_east.cur"
- >
- </File>
- <File
- RelativePath="..\..\glue\resources\pan_north_west.cur"
- >
- </File>
- <File
- RelativePath="..\..\glue\resources\pan_south.cur"
- >
- </File>
- <File
- RelativePath="..\..\glue\resources\pan_south_east.cur"
- >
- </File>
- <File
- RelativePath="..\..\glue\resources\pan_south_west.cur"
- >
- </File>
- <File
- RelativePath="..\..\glue\resources\pan_west.cur"
- >
- </File>
- <File
- RelativePath=".\resource.h"
- >
- </File>
- <File
- RelativePath=".\resources\small.ico"
- >
- </File>
- <File
- RelativePath=".\resources\test_shell.ico"
- >
- </File>
- <File
- RelativePath=".\resources\test_shell.rc"
- >
- </File>
- <File
- RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.rc"
- >
- </File>
- <File
- RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_en-US.rc"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\drag_delegate.cc"
- >
- </File>
- <File
- RelativePath=".\drag_delegate.h"
- >
- </File>
- <File
- RelativePath=".\drop_delegate.cc"
- >
- </File>
- <File
- RelativePath=".\drop_delegate.h"
- >
- </File>
- <File
- RelativePath=".\event_sending_controller.cc"
- >
- </File>
- <File
- RelativePath=".\event_sending_controller.h"
- >
- </File>
- <File
- RelativePath=".\layout_test_controller.cc"
- >
- </File>
- <File
- RelativePath=".\layout_test_controller.h"
- >
- </File>
- <File
- RelativePath=".\mock_webclipboard_impl.cc"
- >
- </File>
- <File
- RelativePath=".\mock_webclipboard_impl.h"
- >
- </File>
- <File
- RelativePath=".\simple_clipboard_impl.cc"
- >
- </File>
- <File
- RelativePath=".\simple_resource_loader_bridge.cc"
- >
- </File>
- <File
- RelativePath=".\test_navigation_controller.cc"
- >
- </File>
- <File
- RelativePath=".\test_navigation_controller.h"
- >
- </File>
- <File
- RelativePath=".\test_shell.cc"
- >
- </File>
- <File
- RelativePath=".\test_shell.h"
- >
- </File>
- <File
- RelativePath=".\test_shell_main.cc"
- >
- </File>
- <File
- RelativePath=".\test_shell_platform_delegate.h"
- >
- </File>
- <File
- RelativePath=".\test_shell_platform_delegate_win.cc"
- >
- </File>
- <File
- RelativePath=".\test_shell_request_context.cc"
- >
- </File>
- <File
- RelativePath=".\test_shell_request_context.h"
- >
- </File>
- <File
- RelativePath=".\test_shell_switches.cc"
- >
- </File>
- <File
- RelativePath=".\test_shell_switches.h"
- >
- </File>
- <File
- RelativePath=".\test_shell_webkit_init.h"
- >
- </File>
- <File
- RelativePath=".\test_shell_win.cc"
- >
- </File>
- <File
- RelativePath=".\test_webview_delegate.cc"
- >
- </File>
- <File
- RelativePath=".\test_webview_delegate.h"
- >
- </File>
- <File
- RelativePath=".\test_webview_delegate_win.cc"
- >
- </File>
- <File
- RelativePath=".\test_webworker_helper.cc"
- >
- </File>
- <File
- RelativePath=".\test_webworker_helper.h"
- >
- </File>
- <File
- RelativePath=".\text_input_controller.cc"
- >
- </File>
- <File
- RelativePath=".\text_input_controller.h"
- >
- </File>
- <File
- RelativePath=".\webview_host.h"
- >
- </File>
- <File
- RelativePath=".\webview_host_win.cc"
- >
- </File>
- <File
- RelativePath=".\webwidget_host.h"
- >
- </File>
- <File
- RelativePath=".\webwidget_host_win.cc"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/webkit/tools/test_shell/test_shell_tests.vcproj b/webkit/tools/test_shell/test_shell_tests.vcproj deleted file mode 100644 index ecc8a23..0000000 --- a/webkit/tools/test_shell/test_shell_tests.vcproj +++ /dev/null @@ -1,469 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="test_shell_tests"
- ProjectGUID="{E6766F81-1FCD-4CD7-BC16-E36964A14867}"
- RootNamespace="test_shell_tests"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\test_shell_tests.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\test_shell_tests.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="support"
- >
- <File
- RelativePath=".\drag_delegate.cc"
- >
- </File>
- <File
- RelativePath=".\drag_delegate.h"
- >
- </File>
- <File
- RelativePath=".\drop_delegate.cc"
- >
- </File>
- <File
- RelativePath=".\drop_delegate.h"
- >
- </File>
- <File
- RelativePath=".\event_sending_controller.cc"
- >
- </File>
- <File
- RelativePath=".\event_sending_controller.h"
- >
- </File>
- <File
- RelativePath=".\image_decoder_unittest.cc"
- >
- </File>
- <File
- RelativePath=".\image_decoder_unittest.h"
- >
- </File>
- <File
- RelativePath=".\layout_test_controller.cc"
- >
- </File>
- <File
- RelativePath=".\layout_test_controller.h"
- >
- </File>
- <File
- RelativePath=".\mock_webclipboard_impl.cc"
- >
- </File>
- <File
- RelativePath=".\mock_webclipboard_impl.h"
- >
- </File>
- <File
- RelativePath="$(OutDir)\obj\global_intermediate\net\net_resources.rc"
- >
- </File>
- <File
- RelativePath=".\resource.h"
- >
- </File>
- <File
- RelativePath=".\run_all_tests.cc"
- >
- </File>
- <File
- RelativePath=".\simple_clipboard_impl.cc"
- >
- </File>
- <File
- RelativePath=".\simple_resource_loader_bridge.cc"
- >
- </File>
- <File
- RelativePath=".\resources\small.ico"
- >
- </File>
- <File
- RelativePath=".\test_navigation_controller.cc"
- >
- </File>
- <File
- RelativePath=".\test_navigation_controller.h"
- >
- </File>
- <File
- RelativePath=".\test_shell.cc"
- >
- </File>
- <File
- RelativePath=".\test_shell.h"
- >
- </File>
- <File
- RelativePath=".\resources\test_shell.ico"
- >
- </File>
- <File
- RelativePath=".\resources\test_shell.rc"
- >
- </File>
- <File
- RelativePath=".\test_shell_platform_delegate.h"
- >
- </File>
- <File
- RelativePath=".\test_shell_platform_delegate_win.cc"
- >
- </File>
- <File
- RelativePath=".\test_shell_request_context.cc"
- >
- </File>
- <File
- RelativePath=".\test_shell_request_context.h"
- >
- </File>
- <File
- RelativePath=".\test_shell_switches.cc"
- >
- </File>
- <File
- RelativePath=".\test_shell_switches.h"
- >
- </File>
- <File
- RelativePath=".\test_shell_test.cc"
- >
- </File>
- <File
- RelativePath=".\test_shell_test.h"
- >
- </File>
- <File
- RelativePath=".\test_shell_win.cc"
- >
- </File>
- <File
- RelativePath=".\test_webview_delegate.cc"
- >
- </File>
- <File
- RelativePath=".\test_webview_delegate.h"
- >
- </File>
- <File
- RelativePath=".\test_webview_delegate_win.cc"
- >
- </File>
- <File
- RelativePath=".\test_webworker_helper.cc"
- >
- </File>
- <File
- RelativePath=".\test_webworker_helper.h"
- >
- </File>
- <File
- RelativePath=".\text_input_controller.cc"
- >
- </File>
- <File
- RelativePath=".\text_input_controller.h"
- >
- </File>
- <File
- RelativePath=".\unittest_test_server.h"
- >
- </File>
- <File
- RelativePath=".\webview_host.h"
- >
- </File>
- <File
- RelativePath=".\webview_host_win.cc"
- >
- </File>
- <File
- RelativePath=".\webwidget_host.h"
- >
- </File>
- <File
- RelativePath=".\webwidget_host_win.cc"
- >
- </File>
- </Filter>
- <Filter
- Name="tests"
- >
- <File
- RelativePath="..\webcore_unit_tests\BMPImageDecoder_unittest.cpp"
- >
- </File>
- <File
- RelativePath="..\..\glue\bookmarklet_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\glue\context_menu_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\skia\ext\convolver_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\glue\cpp_bound_class_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\glue\cpp_variant_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\glue\devtools\devtools_mock_rpc.h"
- >
- </File>
- <File
- RelativePath="..\..\glue\devtools\devtools_rpc_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\glue\devtools\dom_agent_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\glue\dom_operations_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\glue\dom_serializer_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\webcore_unit_tests\GKURL_unittest.cpp"
- >
- </File>
- <File
- RelativePath="..\..\glue\glue_serialize_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\webcore_unit_tests\ICOImageDecoder_unittest.cpp"
- >
- </File>
- <File
- RelativePath="..\..\glue\iframe_redirect_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\skia\ext\image_operations_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\skia\ext\skia_utils_unittest.cc"
- >
- </File>
- <File
- RelativePath=".\keyboard_unittest.cc"
- >
- </File>
- <File
- RelativePath=".\layout_test_controller_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\glue\mimetype_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\glue\multipart_response_delegate_unittest.cc"
- >
- </File>
- <File
- RelativePath=".\node_leak_test.cc"
- >
- </File>
- <File
- RelativePath="..\..\glue\password_autocomplete_listener_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\skia\ext\platform_canvas_unittest.cc"
- >
- </File>
- <File
- RelativePath=".\plugin_tests.cc"
- >
- </File>
- <File
- RelativePath="..\..\glue\regular_expression_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\glue\resource_fetcher_unittest.cc"
- >
- </File>
- <File
- RelativePath=".\text_input_controller_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\webcore_unit_tests\TransparencyWin_unittest.cpp"
- >
- </File>
- <File
- RelativePath="..\webcore_unit_tests\UniscribeHelper_unittest.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\skia\ext\vector_canvas_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\glue\webframe_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\..\glue\webplugin_impl_unittest.cc"
- >
- </File>
- <File
- RelativePath="..\webcore_unit_tests\XBMImageDecoder_unittest.cpp"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
|