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, 83 insertions, 6 deletions

diff --git a/chrome/third_party/hunspell/SConscript b/chrome/third_party/hunspell/SConscript
index 7113579..4d4c037 100644
--- a/chrome/third_party/hunspell/SConscript
+++ b/chrome/third_party/hunspell/SConscript
@@ -70,17 +70,46 @@ if env.Bit('linux'):
       ],
   )
 
-input_files = [
-    'google/bdict_reader.cc',
+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('parsers', [
+    'src/parsers/textparser.cxx',
+    'src/parsers/textparser.hxx',
+  ]),
+  MSVSFilter('hunspell', [
     'src/hunspell/affentry.cxx',
+    'src/hunspell/affentry.hxx',
     'src/hunspell/affixmgr.cxx',
+    'src/hunspell/affixmgr.hxx',
+    'src/hunspell/atypes.hxx',
+    'src/hunspell/baseaffix.hxx',
     'src/hunspell/csutil.cxx',
+    'src/hunspell/csutil.hxx',
     'src/hunspell/dictmgr.cxx',
+    'src/hunspell/dictmgr.hxx',
     'src/hunspell/hashmgr.cxx',
+    'src/hunspell/hashmgr.hxx',
+    'src/hunspell/htypes.hxx',
     'src/hunspell/hunspell.cxx',
+    'src/hunspell/hunspell.h',
+    'src/hunspell/hunspell.hxx',
+    'src/hunspell/langnum.hxx',
     'src/hunspell/suggestmgr.cxx',
-    'src/parsers/textparser.cxx',
-]
+    'src/hunspell/suggestmgr.hxx',
+    'src/hunspell/utf_info.hxx',
+  ]),
+  MSVSFilter('Dictionaries', [
+    'dictionaries/en-US-1-2.bdic',
+  ]),
+  MSVSFilter('google', [
+    'google/bdict.h',
+    'google/bdict_affentry.h',
+    'google/bdict_reader.cc',
+    'google/bdict_reader.h',
+  ]),
+])
 
 env.ChromeLibrary('hunspell', input_files)
 
@@ -94,5 +123,53 @@ dictionaries = [
 i = env.Install('$DESTINATION_ROOT/Dictionaries', dictionaries)
 env.Alias('chrome_Dictionaries', i)
 
-env.ChromeMSVSProject('$CHROME_DIR/third_party/hunspell/hunspell.vcproj',
-                guid='{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}')
+
+p = env.ChromeMSVSProject('hunspell.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'third_party/hunspell/hunspell.vcproj'),
+                          guid='{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'CopyDictionaries',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+p.AddToolFile('./copy_dictionary_files.rules')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '../../../build/debug.vsprops',
+                '$(SolutionDir)../build/external_code.vsprops',
+                './hunspell.vsprops',
+                './using_hunspell.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '../../../build/release.vsprops',
+                '$(SolutionDir)../build/external_code.vsprops',
+                './hunspell.vsprops',
+                './using_hunspell.vsprops',
+            ])