diff options
| -rw-r--r-- | third_party/bsdiff/bsdiff.scons | 64 | ||||
| -rw-r--r-- | third_party/bspatch/bspatch.scons | 39 | ||||
| -rw-r--r-- | third_party/bspatch/bspatch.vcproj | 6 | ||||
| -rw-r--r-- | third_party/bzip2/bzip2.scons | 36 | ||||
| -rw-r--r-- | third_party/bzip2/bzip2.vcproj | 11 | ||||
| -rw-r--r-- | third_party/libjpeg/libjpeg.scons | 46 | ||||
| -rw-r--r-- | third_party/libjpeg/libjpeg.vcproj | 6 | ||||
| -rw-r--r-- | third_party/libxml/libxml.scons | 108 | ||||
| -rw-r--r-- | third_party/libxslt/build/libxslt.vcproj | 6 | ||||
| -rw-r--r-- | third_party/libxslt/libxslt.scons | 71 | ||||
| -rw-r--r-- | third_party/lzma_sdk/7z_C.vcproj | 2 | ||||
| -rw-r--r-- | third_party/lzma_sdk/lzma_sdk.scons | 86 | ||||
| -rw-r--r-- | third_party/modp_b64/modp_b64.scons | 37 | ||||
| -rw-r--r-- | third_party/modp_b64/modp_b64.vcproj | 6 | ||||
| -rw-r--r-- | third_party/sqlite/SConscript | 183 |
15 files changed, 622 insertions, 85 deletions
diff --git a/third_party/bsdiff/bsdiff.scons b/third_party/bsdiff/bsdiff.scons index d186d19..0bb1610 100644 --- a/third_party/bsdiff/bsdiff.scons +++ b/third_party/bsdiff/bsdiff.scons @@ -12,15 +12,61 @@ env.ApplySConscript([ '$LZMA_SDK_DIR/using_lzma_sdk.scons', ]) -input_files = [ - "mbsdiff.cc", -] +input_files = ChromeFileList([ + 'mbsdiff.cc', +]) env.ChromeProgram('bsdiff', input_files) -env.ChromeMSVSProject('$BSDIFF_DIR/bsdiff.vcproj', - dependencies = [ - '$LZMA_SDK_DIR/7z_C.vcproj', - '$BSPATCH_DIR/bspatch.vcproj', - ], - guid='{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}') +p = env.ChromeMSVSProject('bsdiff.vcproj', + dest=('$CHROME_SRC_DIR/third_party/' + + 'bsdiff/bsdiff.vcproj'), + dependencies = [ + '$LZMA_SDK_DIR/7z_C.vcproj', + '$BSPATCH_DIR/bspatch.vcproj', + ], + guid='{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}', + # TODO(sgk): when we can intuit the hierarchy + # from the built targets. + #buildtargets=TODO, + files=input_files, + relative_path_prefix='./', + tools=[ + 'VCPreBuildEventTool', + 'VCCustomBuildTool', + 'VCXMLDataGeneratorTool', + 'VCWebServiceProxyGeneratorTool', + 'VCMIDLTool', + 'VCCLCompilerTool', + 'VCManagedResourceCompilerTool', + 'VCResourceCompilerTool', + 'VCPreLinkEventTool', + 'VCLinkerTool', + 'VCALinkTool', + 'VCManifestTool', + 'VCXDCMakeTool', + 'VCBscMakeTool', + 'VCFxCopTool', + 'VCAppVerifierTool', + 'VCWebDeploymentTool', + 'VCPostBuildEventTool', + ], + ConfigurationType='1') + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/debug.vsprops', + '$(SolutionDir)../build/external_code.vsprops', + '$(SolutionDir)../third_party/bspatch/using_bspatch.vsprops', + './bsdiff.vsprops', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/release.vsprops', + '$(SolutionDir)../build/external_code.vsprops', + '$(SolutionDir)../third_party/bspatch/using_bspatch.vsprops', + './bsdiff.vsprops', + ]) diff --git a/third_party/bspatch/bspatch.scons b/third_party/bspatch/bspatch.scons index 654bc41..759f475 100644 --- a/third_party/bspatch/bspatch.scons +++ b/third_party/bspatch/bspatch.scons @@ -23,11 +23,42 @@ elif env.Bit('linux'): CXXFLAGS = ['-Wall'], ) -input_files = [ +input_files = ChromeFileList([ 'mbspatch.cc', -] + 'mbspatch.h', +]) env.ChromeLibrary('bspatch', input_files) -env.ChromeMSVSProject('$BSPATCH_DIR/bspatch.vcproj', - guid='{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}') +p = env.ChromeMSVSProject('bspatch.vcproj', + dest=('$CHROME_SRC_DIR/third_party/bspatch/' + + '/bspatch.vcproj'), + guid='{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}', + # TODO(sgk): when we can intuit the hierarchy + # from the built targets. + #buildtargets=TODO, + files=input_files, + relative_path_prefix='./', + tools=[ + 'VCCLCompilerTool', + 'VCLibrarianTool', + ], + ConfigurationType='4') + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/debug.vsprops', + '$(SolutionDir)../build/external_code.vsprops', + '$(SolutionDir)../third_party/bspatch/using_bspatch.vsprops', + '$(SolutionDir)../third_party/lzma_sdk/using_lzma_sdk.vsprops', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/release.vsprops', + '$(SolutionDir)../build/external_code.vsprops', + '$(SolutionDir)../third_party/bspatch/using_bspatch.vsprops', + '$(SolutionDir)../third_party/lzma_sdk/using_lzma_sdk.vsprops', + ]) diff --git a/third_party/bspatch/bspatch.vcproj b/third_party/bspatch/bspatch.vcproj index a3bed7d..0f068a3 100644 --- a/third_party/bspatch/bspatch.vcproj +++ b/third_party/bspatch/bspatch.vcproj @@ -11,6 +11,8 @@ Name="Win32" /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" @@ -37,6 +39,8 @@ /> </Configuration> </Configurations> + <References> + </References> <Files> <File RelativePath=".\mbspatch.cc" @@ -47,4 +51,6 @@ > </File> </Files> + <Globals> + </Globals> </VisualStudioProject> diff --git a/third_party/bzip2/bzip2.scons b/third_party/bzip2/bzip2.scons index c144906..06da657 100644 --- a/third_party/bzip2/bzip2.scons +++ b/third_party/bzip2/bzip2.scons @@ -28,17 +28,45 @@ if env.Bit('windows'): ], ) -input_files = [ +input_files = ChromeFileList([ 'blocksort.c', 'bzlib.c', + 'bzlib.h', + 'bzlib_private.h', 'compress.c', 'crctable.c', 'decompress.c', 'huffman.c', 'randtable.c', -] +]) env.ChromeLibrary('bzip2', input_files) -env.ChromeMSVSProject('$BZIP2_DIR/bzip2.vcproj', - guid='{2A70CBF0-847E-4E3A-B926-542A656DC7FE}') +p = env.ChromeMSVSProject('bzip2.vcproj', + dest='$CHROME_SRC_DIR/third_party/bzip2/bzip2.vcproj', + guid='{2A70CBF0-847E-4E3A-B926-542A656DC7FE}', + # TODO(sgk): when we can intuit the hierarchy + # from the built targets. + #buildtargets=TODO, + files=input_files, + tools=[ + MSVSTool('VCCLCompilerTool', + PreprocessorDefinitions=['BZ_NO_STDIO'], + DisableSpecificWarnings='4996'), + 'VCLibrarianTool', + ], + ConfigurationType='4') + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/debug.vsprops', + '$(SolutionDir)../build/external_code.vsprops', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/release.vsprops', + '$(SolutionDir)../build/external_code.vsprops', + ]) diff --git a/third_party/bzip2/bzip2.vcproj b/third_party/bzip2/bzip2.vcproj index b33f293..68359b6 100644 --- a/third_party/bzip2/bzip2.vcproj +++ b/third_party/bzip2/bzip2.vcproj @@ -4,12 +4,15 @@ Version="8.00" Name="bzip2" ProjectGUID="{2A70CBF0-847E-4E3A-B926-542A656DC7FE}" + RootNamespace="bzip2" > <Platforms> <Platform Name="Win32" /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" @@ -18,8 +21,8 @@ > <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="BZ_NO_STDIO" DisableSpecificWarnings="4996" + PreprocessorDefinitions="BZ_NO_STDIO" /> <Tool Name="VCLibrarianTool" @@ -32,14 +35,16 @@ > <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="BZ_NO_STDIO" DisableSpecificWarnings="4996" + PreprocessorDefinitions="BZ_NO_STDIO" /> <Tool Name="VCLibrarianTool" /> </Configuration> </Configurations> + <References> + </References> <Files> <File RelativePath="blocksort.c" @@ -78,4 +83,6 @@ > </File> </Files> + <Globals> + </Globals> </VisualStudioProject> diff --git a/third_party/libjpeg/libjpeg.scons b/third_party/libjpeg/libjpeg.scons index fb1e295e..dd9badf 100644 --- a/third_party/libjpeg/libjpeg.scons +++ b/third_party/libjpeg/libjpeg.scons @@ -53,18 +53,20 @@ elif env.Bit('linux'): # We're not responsible for bad warning hygiene in this third party code. env['CCFLAGS'].remove('-Wall') -input_files = [ +input_files = ChromeFileList([ 'jcapimin.c', 'jcapistd.c', 'jccoefct.c', 'jccolor.c', 'jcdctmgr.c', 'jchuff.c', + 'jchuff.h', 'jcinit.c', 'jcmainct.c', 'jcmarker.c', 'jcmaster.c', 'jcomapi.c', + 'jconfig.h', 'jcparam.c', 'jcphuff.c', 'jcprepct.c', @@ -75,8 +77,10 @@ input_files = [ 'jdatasrc.c', 'jdcoefct.c', 'jdcolor.c', + 'jdct.h', 'jddctmgr.c', 'jdhuff.c', + 'jdhuff.h', 'jdinput.c', 'jdmainct.c', 'jdmarker.c', @@ -86,20 +90,54 @@ input_files = [ 'jdpostct.c', 'jdsample.c', 'jerror.c', + 'jerror.h', 'jfdctflt.c', 'jfdctfst.c', 'jfdctint.c', 'jidctflt.c', 'jidctfst.c', 'jidctint.c', + 'jinclude.h', 'jmemmgr.c', 'jmemnobs.c', + 'jmemsys.h', + 'jmorecfg.h', + 'jpegint.h', + 'jpeglib.h', 'jquant1.c', 'jquant2.c', 'jutils.c', -] + 'jversion.h', +]) env.ChromeLibrary('libjpeg', input_files) -env.ChromeMSVSProject('$LIBJPEG_DIR/libjpeg.vcproj', - guid='{238CE175-76CE-4A25-A676-69D115885601}') +p = env.ChromeMSVSProject('libjpeg.vcproj', + dest=('$CHROME_SRC_DIR/third_party/' + + 'libjpeg/libjpeg.vcproj'), + guid='{238CE175-76CE-4A25-A676-69D115885601}', + keyword='Win32Proj', + # TODO(sgk): when we can intuit the hierarchy + # from the built targets. + #buildtargets=TODO, + files=input_files, + relative_path_prefix='./', + tools=[ + 'VCLibrarianTool', + 'VCCLCompilerTool', + ], + ConfigurationType='4') + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/debug.vsprops', + '$(SolutionDir)../build/external_code.vsprops', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/release.vsprops', + '$(SolutionDir)../build/external_code.vsprops', + ]) diff --git a/third_party/libjpeg/libjpeg.vcproj b/third_party/libjpeg/libjpeg.vcproj index c32858f..8a6359f 100644 --- a/third_party/libjpeg/libjpeg.vcproj +++ b/third_party/libjpeg/libjpeg.vcproj @@ -12,6 +12,8 @@ Name="Win32" /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" @@ -38,6 +40,8 @@ /> </Configuration> </Configurations> + <References> + </References> <Files> <File RelativePath=".\jcapimin.c" @@ -256,4 +260,6 @@ > </File> </Files> + <Globals> + </Globals> </VisualStudioProject> diff --git a/third_party/libxml/libxml.scons b/third_party/libxml/libxml.scons index 438e3fd..63329f7 100644 --- a/third_party/libxml/libxml.scons +++ b/third_party/libxml/libxml.scons @@ -67,13 +67,72 @@ elif env.Bit('linux'): env['CCFLAGS'].remove('-Werror') -input_files = [ +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('include', [ + 'include/win32config.h', + 'include/wsockcompat.h', + MSVSFilter('libxml', [ + 'include/libxml/c14n.h', + 'include/libxml/catalog.h', + 'include/libxml/chvalid.h', + 'include/libxml/debugXML.h', + 'include/libxml/dict.h', + 'include/libxml/DOCBparser.h', + 'include/libxml/encoding.h', + 'include/libxml/entities.h', + 'include/libxml/globals.h', + 'include/libxml/hash.h', + 'include/libxml/HTMLparser.h', + 'include/libxml/HTMLtree.h', + 'include/libxml/list.h', + 'include/libxml/nanoftp.h', + 'include/libxml/nanohttp.h', + 'include/libxml/parser.h', + 'include/libxml/parserInternals.h', + 'include/libxml/pattern.h', + 'include/libxml/relaxng.h', + 'include/libxml/SAX.h', + 'include/libxml/SAX2.h', + 'include/libxml/schemasInternals.h', + 'include/libxml/schematron.h', + 'include/libxml/threads.h', + 'include/libxml/tree.h', + 'include/libxml/uri.h', + 'include/libxml/valid.h', + 'include/libxml/xinclude.h', + 'include/libxml/xlink.h', + 'include/libxml/xmlautomata.h', + 'include/libxml/xmlerror.h', + 'include/libxml/xmlexports.h', + 'include/libxml/xmlIO.h', + 'include/libxml/xmlmemory.h', + 'include/libxml/xmlmodule.h', + 'include/libxml/xmlreader.h', + 'include/libxml/xmlregexp.h', + 'include/libxml/xmlsave.h', + 'include/libxml/xmlschemas.h', + 'include/libxml/xmlschemastypes.h', + 'include/libxml/xmlstring.h', + 'include/libxml/xmlunicode.h', + 'include/libxml/xmlversion.h', + 'include/libxml/xmlwriter.h', + 'include/libxml/xpath.h', + 'include/libxml/xpathInternals.h', + 'include/libxml/xpointer.h', + ]), + ]), + 'acconfig.h', 'c14n.c', 'catalog.c', 'chvalid.c', + 'config.h', 'debugXML.c', 'dict.c', 'DOCBparser.c', + 'elfgcchack.h', 'encoding.c', 'entities.c', 'error.c', @@ -82,6 +141,7 @@ input_files = [ 'HTMLparser.c', 'HTMLtree.c', 'legacy.c', + 'libxml.h', 'list.c', 'nanoftp.c', 'nanohttp.c', @@ -111,19 +171,49 @@ input_files = [ 'xmlwriter.c', 'xpath.c', 'xpointer.c', -] +]) env.ChromeLibrary('libxml', input_files) -env.ChromeMSVSProject('$LIBXML_DIR/build/libxml.vcproj', - dependencies = [ - '$LIBXML_DIR/build/libxml_config.vcproj', - ], - guid='{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}') +p = env.ChromeMSVSProject('$LIBXML_DIR/build/libxml.vcproj', + dest=('$CHROME_SRC_DIR/third_party/libxml/' + + '/build/libxml.vcproj'), + guid='{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}', + keyword='Win32Proj', + # TODO(sgk): when we can intuit the hierarchy + # from the built targets. + #buildtargets=TODO, + files=input_files, + tools=[ + 'VCPreBuildEventTool', + 'VCCustomBuildTool', + 'VCXMLDataGeneratorTool', + 'VCWebServiceProxyGeneratorTool', + 'VCMIDLTool', + 'VCCLCompilerTool', + 'VCManagedResourceCompilerTool', + 'VCResourceCompilerTool', + 'VCPreLinkEventTool', + 'VCLibrarianTool', + 'VCALinkTool', + 'VCXDCMakeTool', + 'VCBscMakeTool', + 'VCFxCopTool', + 'VCPostBuildEventTool', + ], + ConfigurationType='4') -env.ChromeMSVSProject('$LIBXML_DIR/build/libxml_config.vcproj', - guid='{31D88CBF-DC28-47A8-8838-BF81D528EE74}') +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/debug.vsprops', + './libxml.vsprops', + ]) +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/release.vsprops', + './libxml.vsprops', + ]) if env.Bit('windows'): config_files = [ diff --git a/third_party/libxslt/build/libxslt.vcproj b/third_party/libxslt/build/libxslt.vcproj index f9fbee4..3180b18 100644 --- a/third_party/libxslt/build/libxslt.vcproj +++ b/third_party/libxslt/build/libxslt.vcproj @@ -12,6 +12,8 @@ Name="Win32" /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" @@ -38,6 +40,8 @@ /> </Configuration> </Configurations> + <References> + </References> <Files> <Filter Name="libxslt" @@ -216,4 +220,6 @@ </File> </Filter> </Files> + <Globals> + </Globals> </VisualStudioProject> diff --git a/third_party/libxslt/libxslt.scons b/third_party/libxslt/libxslt.scons index 6e95764..0a9337b 100644 --- a/third_party/libxslt/libxslt.scons +++ b/third_party/libxslt/libxslt.scons @@ -64,39 +64,85 @@ if env.Bit('windows'): ) -input_files = [ +input_files = ChromeFileList([ + MSVSFilter('libxslt', [ 'libxslt/attributes.c', + 'libxslt/attributes.h', 'libxslt/attrvt.c', 'libxslt/documents.c', + 'libxslt/documents.h', 'libxslt/extensions.c', + 'libxslt/extensions.h', 'libxslt/extra.c', + 'libxslt/extra.h', 'libxslt/functions.c', + 'libxslt/functions.h', 'libxslt/imports.c', + 'libxslt/imports.h', 'libxslt/keys.c', + 'libxslt/keys.h', + 'libxslt/libxslt.h', 'libxslt/namespaces.c', + 'libxslt/namespaces.h', 'libxslt/numbers.c', + 'libxslt/numbersInternals.h', 'libxslt/pattern.c', + 'libxslt/pattern.h', 'libxslt/preproc.c', + 'libxslt/preproc.h', 'libxslt/security.c', + 'libxslt/security.h', 'libxslt/templates.c', + 'libxslt/templates.h', 'libxslt/transform.c', + 'libxslt/transform.h', + 'libxslt/trio.h', + 'libxslt/triodef.h', 'libxslt/variables.c', + 'libxslt/variables.h', + 'libxslt/win32config.h', 'libxslt/xslt.c', + 'libxslt/xslt.h', + 'libxslt/xsltconfig.h', + 'libxslt/xsltexports.h', + 'libxslt/xsltInternals.h', 'libxslt/xsltutils.c', -] + 'libxslt/xsltutils.h', + 'libxslt/xsltwin32config.h', + ]), +]) env.ChromeLibrary('libxslt', input_files) -env.ChromeMSVSProject('$LIBXSLT_DIR/build/libxslt.vcproj', - dependencies = [ - '$LIBXSLT_DIR/build/libxslt_config.vcproj', - '$LIBXML_DIR/build/libxml.vcproj', - ], - guid='{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}') - -env.ChromeMSVSProject('$LIBXSLT_DIR/build/libxslt_config.vcproj', - guid='{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}') - +p = env.ChromeMSVSProject('build/libxslt.vcproj', + dest=('$CHROME_SRC_DIR/third_party/libxslt' + + '/build/libxslt.vcproj'), + guid='{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}', + dependencies = [ + '$LIBXML_DIR/build/libxml.vcproj', + ], + keyword='Win32Proj', + # TODO(sgk): when we can intuit the hierarchy + # from the built targets. + #buildtargets=TODO, + files=input_files, + tools=[ + 'VCLibrarianTool', + 'VCCLCompilerTool', + ], + ConfigurationType='4') + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/debug.vsprops', + './libxslt.vsprops', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/release.vsprops', + './libxslt.vsprops', + ]) if env.Bit('windows'): config_files = [ @@ -141,4 +187,3 @@ elif env.Bit('linux'): for cf in config_files: result = env.Command('scons/' + cf, 'linux/' + cf, Copy('$TARGET', '$SOURCE')) - diff --git a/third_party/lzma_sdk/7z_C.vcproj b/third_party/lzma_sdk/7z_C.vcproj index 7d1db41..feb970a 100644 --- a/third_party/lzma_sdk/7z_C.vcproj +++ b/third_party/lzma_sdk/7z_C.vcproj @@ -12,6 +12,8 @@ Name="Win32" /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" diff --git a/third_party/lzma_sdk/lzma_sdk.scons b/third_party/lzma_sdk/lzma_sdk.scons index e50c5ea..51db052 100644 --- a/third_party/lzma_sdk/lzma_sdk.scons +++ b/third_party/lzma_sdk/lzma_sdk.scons @@ -31,23 +31,93 @@ if env.Bit('windows'): ], ) -input_files = [ +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('LZMA', [ + 'Compress/Lzma/LzmaDecode.c', + 'Compress/Lzma/LzmaDecode.h', + 'Compress/Lzma/LzmaTypes.h', + ]), + MSVSFilter('Common', [ '7zCrc.c', + '7zCrc.h', + 'Types.h', + ]), + MSVSFilter('Branch', [ + 'Compress/Branch/BranchTypes.h', + 'Compress/Branch/BranchX86.c', + 'Compress/Branch/BranchX86.h', + 'Compress/Branch/BranchX86_2.c', + 'Compress/Branch/BranchX86_2.h', + ]), + MSVSFilter('7z', [ 'Archive/7z/7zAlloc.c', + 'Archive/7z/7zAlloc.h', 'Archive/7z/7zBuffer.c', + 'Archive/7z/7zBuffer.h', 'Archive/7z/7zDecode.c', + 'Archive/7z/7zDecode.h', 'Archive/7z/7zExtract.c', + 'Archive/7z/7zExtract.h', 'Archive/7z/7zHeader.c', + 'Archive/7z/7zHeader.h', 'Archive/7z/7zIn.c', + 'Archive/7z/7zIn.h', 'Archive/7z/7zItem.c', + 'Archive/7z/7zItem.h', 'Archive/7z/7zMethodID.c', - 'Compress/Branch/BranchX86.c', - 'Compress/Branch/BranchX86_2.c', - 'Compress/Lzma/LzmaDecode.c', -] + 'Archive/7z/7zMethodID.h', + ]), +]) env.ChromeLibrary('lzma_sdk', input_files) -env.ChromeMSVSProject('$LZMA_SDK_DIR/7z_C.vcproj', - name='lzma_sdk', - guid='{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}') +p = env.ChromeMSVSProject('7z_C.vcproj', + dest=('$CHROME_SRC_DIR/third_party/' + + 'lzma_sdk/7z_C.vcproj'), + name='lzma_sdk', + guid='{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}', + keyword='Win32Proj', + # TODO(sgk): when we can intuit the hierarchy + # from the built targets. + #buildtargets=TODO, + files=input_files, + ConfigurationType='4') + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/debug.vsprops', + '$(SolutionDir)../build/external_code.vsprops', + '$(SolutionDir)../third_party/lzma_sdk/using_lzma_sdk.vsprops', + ], + tools=[ + MSVSTool('VCCLCompilerTool', + PreprocessorDefinitions=[ + '_DEBUG', + 'WIN32', + '_CONSOLE', + '_LZMA_PROB32' + ]), + 'VCLibrarianTool', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/release.vsprops', + '$(SolutionDir)../build/external_code.vsprops', + '$(SolutionDir)../third_party/lzma_sdk/using_lzma_sdk.vsprops', + ], + tools=[ + MSVSTool('VCCLCompilerTool', + PreprocessorDefinitions=[ + 'NDEBUG', + 'WIN32', + '_CONSOLE', + '_LZMA_PROB32' + ]), + 'VCLibrarianTool', + ]) diff --git a/third_party/modp_b64/modp_b64.scons b/third_party/modp_b64/modp_b64.scons index f114e8e..15919c7 100644 --- a/third_party/modp_b64/modp_b64.scons +++ b/third_party/modp_b64/modp_b64.scons @@ -18,11 +18,40 @@ env.Prepend( ], ) -input_files = [ +input_files = ChromeFileList([ 'modp_b64.cc', -] + 'modp_b64.h', + 'modp_b64_data.h', +]) env.ChromeLibrary('modp_b64', input_files) -env.ChromeMSVSProject('$MODP_B64_DIR/modp_b64.vcproj', - guid='{7100F41F-868D-4E99-80A2-AF8E6574749D}') +p = env.ChromeMSVSProject('modp_b64.vcproj', + dest=('$CHROME_SRC_DIR/third_party/' + + 'modp_b64/modp_b64.vcproj'), + guid='{7100F41F-868D-4E99-80A2-AF8E6574749D}', + keyword='Win32Proj', + # TODO(sgk): when we can intuit the hierarchy + # from the built targets. + #buildtargets=TODO, + files=input_files, + relative_path_prefix='./', + tools=[ + 'VCCLCompilerTool', + 'VCLibrarianTool', + ], + ConfigurationType='4') + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/debug.vsprops', + '$(SolutionDir)../build/external_code.vsprops', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/release.vsprops', + '$(SolutionDir)../build/external_code.vsprops', + ]) diff --git a/third_party/modp_b64/modp_b64.vcproj b/third_party/modp_b64/modp_b64.vcproj index adee3b9..6b76477 100644 --- a/third_party/modp_b64/modp_b64.vcproj +++ b/third_party/modp_b64/modp_b64.vcproj @@ -12,6 +12,8 @@ Name="Win32" /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" @@ -38,6 +40,8 @@ /> </Configuration> </Configurations> + <References> + </References> <Files> <File RelativePath=".\modp_b64.cc" @@ -52,4 +56,6 @@ > </File> </Files> + <Globals> + </Globals> </VisualStudioProject> 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. |