Generation of .vcproj files for remaining third_party components.

Updates the .vcproj files themselves for stylistic consistency
with the rest.  Affected .vcproj files:
* No change (byte-for-byte identical):
    third_party\libxml\build\libxml.vcproj
    third_party\bsdiff\bsdiff.vcproj
    third_party\sqlite\sqlite.vcproj
* Add empty <ToolFiles>, <References> and <Globals> sections:
    third_party\libxslt\build\libxslt.vcproj
    third_party\bspatch\bspatch.vcproj
    third_party\bzip2\bzip2.vcproj
    third_party\lzma\7z_C.vcproj
    third_party\modp_b64\modp_b64.vcproj
    third_party\libjpeg\libjpeg.vcproj
* Add explicit RootNamspace attribute:
    third_party\bzip2\bzip2.vcproj
* Reorder DisableSpecificWarnings and PreprocessorDefinitions attributes
  in VCCLCompilerTool:
    third_party\bzip2\bzip2.vcproj
Review URL: http://codereview.chromium.org/18785

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

1 files changed, 155 insertions, 28 deletions

diff --git a/third_party/sqlite/SConscript b/third_party/sqlite/SConscript
index b6ddffb..615989d 100644
--- a/third_party/sqlite/SConscript
+++ b/third_party/sqlite/SConscript
@@ -43,23 +43,7 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
-    'ext/fts2/fts2.c',
-    'ext/fts2/fts2.h',
-    'ext/fts2/fts2_hash.c',
-    'ext/fts2/fts2_hash.h',
-    'ext/fts2/fts2_icu.c',
-    'ext/fts2/fts2_porter.c',
-    'ext/fts2/fts2_tokenizer.c',
-    'ext/fts2/fts2_tokenizer.h',
-    'ext/fts2/fts2_tokenizer1.c',
-    'ext/icu/icu.c',
-    'preprocessed/keywordhash.h',
-    'preprocessed/opcodes.c',
-    'preprocessed/opcodes.h',
-    'preprocessed/parse.c',
-    'preprocessed/parse.h',
-    'preprocessed/sqlite3.h',
+input_files = ChromeFileList([
     'src/alter.c',
     'src/analyze.c',
     'src/attach.c',
@@ -76,11 +60,22 @@ input_files = [
     'src/delete.c',
     'src/expr.c',
     'src/fault.c',
+    'ext/fts2/fts2.c',
+    'ext/fts2/fts2.h',
+    'ext/fts2/fts2_hash.c',
+    'ext/fts2/fts2_hash.h',
+    'ext/fts2/fts2_icu.c',
+    'ext/fts2/fts2_porter.c',
+    'ext/fts2/fts2_tokenizer.c',
+    'ext/fts2/fts2_tokenizer.h',
+    'ext/fts2/fts2_tokenizer1.c',
     'src/func.c',
     'src/global.c',
     'src/hash.c',
     'src/hash.h',
+    'ext/icu/icu.c',
     'src/insert.c',
+    'preprocessed/keywordhash.h',
     'src/legacy.c',
     'src/loadext.c',
     'src/main.c',
@@ -95,6 +90,8 @@ input_files = [
     'src/mutex.h',
     'src/mutex_unix.c',
     'src/mutex_w32.c',
+    'preprocessed/opcodes.c',
+    'preprocessed/opcodes.h',
     'src/os.c',
     'src/os.h',
     'src/os_common.h',
@@ -102,11 +99,16 @@ input_files = [
     'src/os_win.c',
     'src/pager.c',
     'src/pager.h',
+    'preprocessed/parse.c',
+    'preprocessed/parse.h',
     'src/pragma.c',
     'src/prepare.c',
     'src/printf.c',
     'src/random.c',
     'src/select.c',
+    'src/shell.c',
+    'src/shell_icu.c',
+    'preprocessed/sqlite3.h',
     'src/sqlite3ext.h',
     'src/sqliteInt.h',
     'src/sqliteLimit.h',
@@ -120,27 +122,152 @@ input_files = [
     'src/vacuum.c',
     'src/vdbe.c',
     'src/vdbe.h',
-    'src/vdbeInt.h',
     'src/vdbeapi.c',
     'src/vdbeaux.c',
     'src/vdbeblob.c',
     'src/vdbefifo.c',
+    'src/vdbeInt.h',
     'src/vdbemem.c',
     'src/vtab.c',
     'src/where.c',
-]
+])
 
-if env.Bit('windows'):
-  input_files += [
-    'src/shell_icu.c',
-  ]
+if not env.Bit('windows'):
+  input_files.Remove(
+      'src/mutex_w32.c',
+      'src/os_win.c',
+      'src/shell.c',
+      'src/shell_icu.c',
+  )
+
+if not env.Bit('linux'):
+  input_files.Remove(
+      'src/mutex_unix.c',
+      'src/os_unix.c',
+  )
 
 env.ChromeLibrary('sqlite', input_files)
 
-env.ChromeMSVSProject('$SQLITE_DIR/sqlite.vcproj',
-                dependencies = [
-                    '$ICU38_DIR/build/icu.vcproj',
-                ],
-                guid='{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}')
+p = env.ChromeMSVSProject('sqlite.vcproj',
+                          dest=('$CHROME_SRC_DIR/third_party/' +
+                                    'sqlite/sqlite.vcproj'),
+                          dependencies = [
+                              '$ICU38_DIR/build/icu.vcproj',
+                          ],
+                          guid='{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                './sqlite.vsprops',
+                '$(SolutionDir)../build/external_code.vsprops',
+                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+            ],
+            ConfigurationType='4',
+            tools=[
+                'VCPreBuildEventTool',
+                'VCCustomBuildTool',
+                'VCXMLDataGeneratorTool',
+                'VCWebServiceProxyGeneratorTool',
+                'VCMIDLTool',
+                MSVSTool('VCCLCompilerTool',
+                         AdditionalIncludeDirectories='"$(SolutionDir)..\\third_party\\sqlite\\src";"$(SolutionDir)..\\third_party\\sqlite\\preprocessed"'),
+                'VCManagedResourceCompilerTool',
+                'VCResourceCompilerTool',
+                'VCPreLinkEventTool',
+                'VCLibrarianTool',
+                'VCALinkTool',
+                'VCXDCMakeTool',
+                'VCBscMakeTool',
+                'VCFxCopTool',
+                'VCPostBuildEventTool',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                './sqlite.vsprops',
+                '$(SolutionDir)../build/external_code.vsprops',
+                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+            ],
+            ConfigurationType='4',
+            tools=[
+                'VCPreBuildEventTool',
+                'VCCustomBuildTool',
+                'VCXMLDataGeneratorTool',
+                'VCWebServiceProxyGeneratorTool',
+                'VCMIDLTool',
+                MSVSTool('VCCLCompilerTool',
+                         AdditionalIncludeDirectories=[
+                           '"$(SolutionDir)../third_party/sqlite/src"',
+                           '"$(SolutionDir)../third_party/sqlite/preprocessed"',
+                        ]),
+                'VCManagedResourceCompilerTool',
+                'VCResourceCompilerTool',
+                'VCPreLinkEventTool',
+                'VCLibrarianTool',
+                'VCALinkTool',
+                'VCXDCMakeTool',
+                'VCBscMakeTool',
+                'VCFxCopTool',
+                'VCPostBuildEventTool',
+            ])
+
+p.AddConfig('Shell|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                './sqlite.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)../build/external_code.vsprops',
+                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+            ],
+            ConfigurationType='1',
+            tools=[
+                'VCPreBuildEventTool',
+                'VCCustomBuildTool',
+                'VCXMLDataGeneratorTool',
+                'VCWebServiceProxyGeneratorTool',
+                'VCMIDLTool',
+                MSVSTool('VCCLCompilerTool',
+                         AdditionalIncludeDirectories=[
+                           '"$(SolutionDir)../third_party/sqlite/src"',
+                           '"$(SolutionDir)../third_party/sqlite/preprocessed"',
+                        ]),
+                'VCManagedResourceCompilerTool',
+                'VCResourceCompilerTool',
+                'VCPreLinkEventTool',
+                'VCLinkerTool',
+                'VCALinkTool',
+                'VCManifestTool',
+                'VCXDCMakeTool',
+                'VCBscMakeTool',
+                'VCFxCopTool',
+                'VCAppVerifierTool',
+                'VCWebDeploymentTool',
+                'VCPostBuildEventTool',
+            ])
+
+p.AddFileConfig('./src/shell.c',
+                'Debug|Win32',
+                ExcludedFromBuild='true',
+                tools=[
+                    'VCCLCompilerTool',
+                ])
+
+p.AddFileConfig('./src/shell.c',
+                'Release|Win32',
+                ExcludedFromBuild='true',
+                tools=[
+                    'VCCLCompilerTool',
+                ])
 
 # TODO(tc): There should be a target to build the stand alone sqlite shell.