diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/bsdiff/bsdiff.gyp | 5 | ||||
| -rw-r--r-- | third_party/bsdiff/bsdiff.scons | 72 | ||||
| -rw-r--r-- | third_party/bsdiff/bsdiff.vcproj | 148 | ||||
| -rw-r--r-- | third_party/bsdiff/bsdiff.vsprops | 11 | ||||
| -rw-r--r-- | third_party/bspatch/bspatch.scons | 64 | ||||
| -rw-r--r-- | third_party/bspatch/bspatch.vcproj | 56 | ||||
| -rw-r--r-- | third_party/bspatch/using_bspatch.scons | 18 | ||||
| -rw-r--r-- | third_party/bspatch/using_bspatch.vsprops | 11 |
8 files changed, 5 insertions, 380 deletions
diff --git a/third_party/bsdiff/bsdiff.gyp b/third_party/bsdiff/bsdiff.gyp index c473993..e4eb03c 100644 --- a/third_party/bsdiff/bsdiff.gyp +++ b/third_party/bsdiff/bsdiff.gyp @@ -14,6 +14,11 @@ 'dependencies': [
'../bspatch/bspatch.gyp:bspatch',
],
+ 'link_settings': {
+ 'libraries': [
+ '-lWs2_32.lib',
+ ],
+ },
'sources': [
'mbsdiff.cc',
],
diff --git a/third_party/bsdiff/bsdiff.scons b/third_party/bsdiff/bsdiff.scons deleted file mode 100644 index 0bb1610..0000000 --- a/third_party/bsdiff/bsdiff.scons +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BSPATCH_DIR/using_bspatch.scons', - '$CHROME_SRC_DIR/build/external_code.scons', - '$LZMA_SDK_DIR/using_lzma_sdk.scons', -]) - -input_files = ChromeFileList([ - 'mbsdiff.cc', -]) - -env.ChromeProgram('bsdiff', input_files) - -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/bsdiff/bsdiff.vcproj b/third_party/bsdiff/bsdiff.vcproj deleted file mode 100644 index dd8d7b3..0000000 --- a/third_party/bsdiff/bsdiff.vcproj +++ /dev/null @@ -1,148 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="bsdiff" - ProjectGUID="{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}" - RootNamespace="bsdiff" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="1" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\build\external_code.vsprops;$(SolutionDir)..\third_party\bspatch\using_bspatch.vsprops;.\bsdiff.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\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\build\external_code.vsprops;$(SolutionDir)..\third_party\bspatch\using_bspatch.vsprops;.\bsdiff.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> - <File - RelativePath=".\mbsdiff.cc" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/third_party/bsdiff/bsdiff.vsprops b/third_party/bsdiff/bsdiff.vsprops deleted file mode 100644 index 3c25bba..0000000 --- a/third_party/bsdiff/bsdiff.vsprops +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="bsdiff" - > - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib" - /> -</VisualStudioPropertySheet> diff --git a/third_party/bspatch/bspatch.scons b/third_party/bspatch/bspatch.scons deleted file mode 100644 index 759f475..0000000 --- a/third_party/bspatch/bspatch.scons +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$LZMA_SDK_DIR/using_lzma_sdk.scons', -]) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TP', - '/wd4800', - ], - ) -elif env.Bit('linux'): - # We're not responsible for bad warning hygiene in this third party code. - env.FilterOut( - CXXFLAGS = ['-Wall'], - ) - -input_files = ChromeFileList([ - 'mbspatch.cc', - 'mbspatch.h', -]) - -env.ChromeLibrary('bspatch', input_files) - -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 deleted file mode 100644 index 0f068a3..0000000 --- a/third_party/bspatch/bspatch.vcproj +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="bspatch" - ProjectGUID="{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}" - RootNamespace="bspatch" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="4" - 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" - > - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCLibrarianTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="4" - 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" - > - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCLibrarianTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\mbspatch.cc" - > - </File> - <File - RelativePath=".\mbspatch.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/third_party/bspatch/using_bspatch.scons b/third_party/bspatch/using_bspatch.scons deleted file mode 100644 index 945fdf9..0000000 --- a/third_party/bspatch/using_bspatch.scons +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -__doc__ = """ -Settings for other components using the bspatch library. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$BSPATCH_DIR', - ], - LIBS = [ - 'bspatch', - ], -) diff --git a/third_party/bspatch/using_bspatch.vsprops b/third_party/bspatch/using_bspatch.vsprops deleted file mode 100644 index d13953d..0000000 --- a/third_party/bspatch/using_bspatch.vsprops +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="using_bspatch" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(SolutionDir)..\third_party\bspatch"" - /> -</VisualStudioPropertySheet> |