Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-25 19:43:29 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-25 19:43:29 (GMT) |
| commit | 857791adda753a0f94da8317bbc019378b1f09bd (patch) | |
| tree | 96aa2e4d863d50888a16527f9fbb38712e97d8ee /3rdParty/Breakpad | |
| parent | b58ad7f4b01623a8807b8c268208bd9c8496f4e2 (diff) | |
| download | swift-857791adda753a0f94da8317bbc019378b1f09bd.zip swift-857791adda753a0f94da8317bbc019378b1f09bd.tar.bz2 | |
Convert hard tabs to four spaces in all our SConscript/*.py files
Test-Information:
Test that it still builds and unit test pass on OS X 10.11.4.
Change-Id: I2eb4a0b707991aee553db36a8cd1ae28b813acab
Diffstat (limited to '3rdParty/Breakpad')
| -rw-r--r-- | 3rdParty/Breakpad/SConscript | 148 |
1 files changed, 74 insertions, 74 deletions
diff --git a/3rdParty/Breakpad/SConscript b/3rdParty/Breakpad/SConscript index 142634b..3b9447d 100644 --- a/3rdParty/Breakpad/SConscript +++ b/3rdParty/Breakpad/SConscript @@ -7,91 +7,91 @@ if env["PLATFORM"] == "win32" : # Module flags ################################################################################ - if env["SCONS_STAGE"] == "flags" : - env["HAVE_BREAKPAD"] = True - env["BREAKPAD_FLAGS"] = { - "CPPPATH": [env.Dir("src")], - "CPPFLAGS": [], - "LIBPATH": [env.Dir(".")], - "LIBS": ["Swift_BreakPad"] - } + if env["SCONS_STAGE"] == "flags" : + env["HAVE_BREAKPAD"] = True + env["BREAKPAD_FLAGS"] = { + "CPPPATH": [env.Dir("src")], + "CPPFLAGS": [], + "LIBPATH": [env.Dir(".")], + "LIBS": ["Swift_BreakPad"] + } ################################################################################ # Build ################################################################################ - if env["SCONS_STAGE"] == "build" : - myenv = env.Clone() - myenv.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if not flag.startswith("-W")]) - myenv.Append(CPPPATH = ["src"]) + if env["SCONS_STAGE"] == "build" : + myenv = env.Clone() + myenv.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if not flag.startswith("-W")]) + myenv.Append(CPPPATH = ["src"]) - lib_sources = [] - dumpsyms_sources = [] - common_sources = [] - if myenv["PLATFORM"] == "win32" : - myenv.Append(CPPDEFINES = ["UNICODE"]) - lib_sources += [ - "src/client/windows/handler/exception_handler.cc", - "src/client/windows/crash_generation/crash_generation_client.cc", - "src/common/windows/guid_string.cc", - ] + lib_sources = [] + dumpsyms_sources = [] + common_sources = [] + if myenv["PLATFORM"] == "win32" : + myenv.Append(CPPDEFINES = ["UNICODE"]) + lib_sources += [ + "src/client/windows/handler/exception_handler.cc", + "src/client/windows/crash_generation/crash_generation_client.cc", + "src/common/windows/guid_string.cc", + ] - if myenv["PLATFORM"] == "darwin" or myenv["PLATFORM"] == "linux" : - lib_sources += [ - ] - common_sources += [ - "src/common/md5.cc", - ] - - if myenv["PLATFORM"] == "darwin" : - myenv.Append(CPPDEFINES = ["HAVE_MACH_O_NLIST_H"]) - lib_sources += [ - "src/client/mac/handler/exception_handler.cc", - "src/client/mac/handler/minidump_generator.cc", - "src/client/mac/handler/dynamic_images.cc", - "src/client/mac/handler/breakpad_nlist_64.cc", - "src/client/mac/crash_generation/crash_generation_client.cc", - "src/common/mac/MachIPC.mm", - "src/common/mac/string_utilities.cc", - "src/common/mac/bootstrap_compat.cc", - "src/client/minidump_file_writer.cc", - "src/common/string_conversion.cc", - "src/common/convert_UTF.c", - ] - common_sources += [ - "src/common/mac/macho_id.cc", - "src/common/mac/macho_walker.cc", - "src/common/mac/file_id.cc", - "src/common/mac/macho_utilities.cc", - ] - dumpsyms_sources += [ - "src/tools/mac/dump_syms/dump_syms_tool.mm", - "src/common/mac/dump_syms.mm", - "src/common/mac/macho_reader.cc", - "src/common/dwarf/bytereader.cc", - "src/common/dwarf/dwarf2reader.cc", - "src/common/dwarf/dwarf2diehandler.cc", - "src/common/dwarf_line_to_module.cc", - "src/common/dwarf_cfi_to_module.cc", - "src/common/dwarf_cu_to_module.cc", - "src/common/stabs_to_module.cc", - "src/common/stabs_reader.cc", - "src/common/module.cc", - "src/common/language.cc", - ] + if myenv["PLATFORM"] == "darwin" or myenv["PLATFORM"] == "linux" : + lib_sources += [ + ] + common_sources += [ + "src/common/md5.cc", + ] + + if myenv["PLATFORM"] == "darwin" : + myenv.Append(CPPDEFINES = ["HAVE_MACH_O_NLIST_H"]) + lib_sources += [ + "src/client/mac/handler/exception_handler.cc", + "src/client/mac/handler/minidump_generator.cc", + "src/client/mac/handler/dynamic_images.cc", + "src/client/mac/handler/breakpad_nlist_64.cc", + "src/client/mac/crash_generation/crash_generation_client.cc", + "src/common/mac/MachIPC.mm", + "src/common/mac/string_utilities.cc", + "src/common/mac/bootstrap_compat.cc", + "src/client/minidump_file_writer.cc", + "src/common/string_conversion.cc", + "src/common/convert_UTF.c", + ] + common_sources += [ + "src/common/mac/macho_id.cc", + "src/common/mac/macho_walker.cc", + "src/common/mac/file_id.cc", + "src/common/mac/macho_utilities.cc", + ] + dumpsyms_sources += [ + "src/tools/mac/dump_syms/dump_syms_tool.mm", + "src/common/mac/dump_syms.mm", + "src/common/mac/macho_reader.cc", + "src/common/dwarf/bytereader.cc", + "src/common/dwarf/dwarf2reader.cc", + "src/common/dwarf/dwarf2diehandler.cc", + "src/common/dwarf_line_to_module.cc", + "src/common/dwarf_cfi_to_module.cc", + "src/common/dwarf_cu_to_module.cc", + "src/common/stabs_to_module.cc", + "src/common/stabs_reader.cc", + "src/common/module.cc", + "src/common/language.cc", + ] - if myenv["PLATFORM"] == "linux" : - dumpsyms_sources += ["src/tools/linux/dump_syms/dump_syms.cc"] + if myenv["PLATFORM"] == "linux" : + dumpsyms_sources += ["src/tools/linux/dump_syms/dump_syms.cc"] - common_objects = myenv.StaticObject(common_sources) + common_objects = myenv.StaticObject(common_sources) - myenv.StaticLibrary("Swift_BreakPad", lib_sources + common_objects) + myenv.StaticLibrary("Swift_BreakPad", lib_sources + common_objects) - #if myenv["PLATFORM"] == "darwin" or myenv["PLATFORM"] == "linux" : - # myenv.Program("dump_syms", dumpsyms_sources + common_objects) + #if myenv["PLATFORM"] == "darwin" or myenv["PLATFORM"] == "linux" : + # myenv.Program("dump_syms", dumpsyms_sources + common_objects) else : - if env["SCONS_STAGE"] == "flags" : - env["HAVE_BREAKPAD"] = False - env["BREAKPAD_FLAGS"] = {} + if env["SCONS_STAGE"] == "flags" : + env["HAVE_BREAKPAD"] = False + env["BREAKPAD_FLAGS"] = {} |