Convert hunspell.lib to gyp generation.

Convert convert_dict to gyp generation.
Combine Linux and Windows convert_dict targets.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/114071

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

4 files changed, 18 insertions, 484 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 6c8f7af..2398f2c 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3454,27 +3454,6 @@
           },
         }],
       ],
-      'targets': [
-        {
-          'target_name': 'convert_dict',
-          'type': 'executable',
-          'msvs_guid': '42ECD5EC-722F-41DE-B6B8-83764C8016DF',
-          'msvs_existing_vcproj': 'tools/convert_dict/convert_dict.vcproj',
-          'dependencies': [
-            '../base/base.gyp:base',
-            'third_party/hunspell/hunspell.gyp:hunspell',
-          ],
-          'sources': [
-            'tools/convert_dict/aff_reader.cc',
-            'tools/convert_dict/aff_reader.h',
-            'tools/convert_dict/convert_dict.cc',
-            'tools/convert_dict/dic_reader.cc',
-            'tools/convert_dict/dic_reader.h',
-            'tools/convert_dict/hunspell_reader.cc',
-            'tools/convert_dict/hunspell_reader.h',
-          ],
-        },
-      ],
     }],
     ['OS=="mac"',
       # On Mac only, add a project target called "build_app_dmg" that only
@@ -3511,6 +3490,24 @@
     }, { # else: OS != "mac"
       'targets': [
         {
+          'target_name': 'convert_dict',
+          'type': 'executable',
+          'msvs_guid': '42ECD5EC-722F-41DE-B6B8-83764C8016DF',
+          'dependencies': [
+            '../base/base.gyp:base',
+            'third_party/hunspell/hunspell.gyp:hunspell',
+          ],
+          'sources': [
+            'tools/convert_dict/aff_reader.cc',
+            'tools/convert_dict/aff_reader.h',
+            'tools/convert_dict/convert_dict.cc',
+            'tools/convert_dict/dic_reader.cc',
+            'tools/convert_dict/dic_reader.h',
+            'tools/convert_dict/hunspell_reader.cc',
+            'tools/convert_dict/hunspell_reader.h',
+          ],
+        },
+        {
           'target_name': 'flush_cache',
           'type': 'executable',
           'msvs_guid': '4539AFB3-B8DC-47F3-A491-6DAC8FD26657',
@@ -3916,32 +3913,6 @@
         #  },
         #},
         {
-          'target_name': 'convert_dict',
-          'type': 'executable',
-          'msvs_guid': '42ECD5EC-722F-41DE-B6B8-83764C8016DF',
-          'msvs_existing_vcproj': 'tools/convert_dict/convert_dict.vcproj',
-          'dependencies': [
-            '../base/base.gyp:base',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'sources': [
-            'third_party/hunspell/google/bdict.h',
-            'third_party/hunspell/google/bdict_reader.cc',
-            'third_party/hunspell/google/bdict_reader.h',
-            'third_party/hunspell/google/bdict_writer.cc',
-            'third_party/hunspell/google/bdict_writer.h',
-            'tools/convert_dict/aff_reader.cc',
-            'tools/convert_dict/aff_reader.h',
-            'tools/convert_dict/convert_dict.cc',
-            'tools/convert_dict/dic_reader.cc',
-            'tools/convert_dict/dic_reader.h',
-            'tools/convert_dict/hunspell_reader.cc',
-            'tools/convert_dict/hunspell_reader.h',
-          ],
-        },
-        {
           'target_name': 'crash_service',
           'type': 'executable',
           'msvs_guid': '89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC',
diff --git a/chrome/third_party/hunspell/hunspell.gyp b/chrome/third_party/hunspell/hunspell.gyp
index 4b81189..a19f103 100644
--- a/chrome/third_party/hunspell/hunspell.gyp
+++ b/chrome/third_party/hunspell/hunspell.gyp
@@ -11,7 +11,6 @@
       'target_name': 'hunspell',
       'type': '<(library)',
       'msvs_guid': 'D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E',
-      'msvs_existing_vcproj': 'hunspell.vcproj',
       'dependencies': [
         '../../../base/base.gyp:base',
         '../../../third_party/icu38/icu38.gyp:icuuc',
diff --git a/chrome/third_party/hunspell/hunspell.vcproj b/chrome/third_party/hunspell/hunspell.vcproj
deleted file mode 100644
index eafe363..0000000
--- a/chrome/third_party/hunspell/hunspell.vcproj
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="hunspell"
-	ProjectGUID="{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}"
-	RootNamespace="hunspell"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;..\..\..\build\debug.vsprops;$(SolutionDir)..\build\external_code.vsprops;.\hunspell.vsprops;.\using_hunspell.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="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;..\..\..\build\release.vsprops;$(SolutionDir)..\build\external_code.vsprops;.\hunspell.vsprops;.\using_hunspell.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="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="parsers"
-			>
-			<File
-				RelativePath=".\src\parsers\textparser.cxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\parsers\textparser.hxx"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="hunspell"
-			>
-			<File
-				RelativePath=".\src\hunspell\affentry.cxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\affentry.hxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\affixmgr.cxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\affixmgr.hxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\atypes.hxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\baseaffix.hxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\csutil.cxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\csutil.hxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\dictmgr.cxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\dictmgr.hxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\hashmgr.cxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\hashmgr.hxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\htypes.hxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\hunspell.cxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\hunspell.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\hunspell.hxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\langnum.hxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\suggestmgr.cxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\suggestmgr.hxx"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hunspell\utf_info.hxx"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="google"
-			>
-			<File
-				RelativePath=".\google\bdict.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\bdict_affentry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\bdict_reader.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\bdict_reader.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/chrome/tools/convert_dict/convert_dict.vcproj b/chrome/tools/convert_dict/convert_dict.vcproj
deleted file mode 100644
index d7e03de..0000000
--- a/chrome/tools/convert_dict/convert_dict.vcproj
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="convert_dict"
-	ProjectGUID="{42ECD5EC-722F-41DE-B6B8-83764C8016DF}"
-	RootNamespace="convert_dict"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets="..\..\..\build\debug.vsprops"
-			CharacterSet="2"
-			>
-			<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="..\..\..\build\release.vsprops"
-			CharacterSet="2"
-			>
-			<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>
-		<File
-			RelativePath=".\aff_reader.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\aff_reader.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\third_party\hunspell\google\bdict.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\third_party\hunspell\google\bdict_reader.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\..\third_party\hunspell\google\bdict_reader.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\third_party\hunspell\google\bdict_writer.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\..\third_party\hunspell\google\bdict_writer.h"
-			>
-		</File>
-		<File
-			RelativePath=".\convert_dict.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\dic_reader.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\dic_reader.h"
-			>
-		</File>
-		<File
-			RelativePath=".\hunspell_reader.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\hunspell_reader.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>