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/Ldns | |
| 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/Ldns')
| -rw-r--r-- | 3rdParty/Ldns/SConscript | 111 |
1 files changed, 55 insertions, 56 deletions
diff --git a/3rdParty/Ldns/SConscript b/3rdParty/Ldns/SConscript index a43bde7..eae2e5c 100644 --- a/3rdParty/Ldns/SConscript +++ b/3rdParty/Ldns/SConscript @@ -2,69 +2,68 @@ Import("env") if env.get("LDNS_BUNDLED", False) : - if env["PLATFORM"] == "win32" : - cppflags = ["/I" + Dir("#/3rdParty/Ldns/src/ldns").abspath] - else : - cppflags = [("-isystem", Dir("#/3rdParty/Ldns/src/ldns").abspath)] + if env["PLATFORM"] == "win32" : + cppflags = ["/I" + Dir("#/3rdParty/Ldns/src/ldns").abspath] + else : + cppflags = [("-isystem", Dir("#/3rdParty/Ldns/src/ldns").abspath)] ################################################################################ # Flags ################################################################################ - - if env["SCONS_STAGE"] == "flags" : - env["LDNS_FLAGS"] = { - "CPPPATH": [Dir("src/ldns")], - "CPPFLAGS": cppflags, - "LIBPATH": [env.Dir(".")], - "LIBS": ["Swiften_Ldns"], - } - if env["target"] == "android" : - env["LDNS_FLAGS"]["CPPPATH"].append(Dir("src/android")) + if env["SCONS_STAGE"] == "flags" : + env["LDNS_FLAGS"] = { + "CPPPATH": [Dir("src/ldns")], + "CPPFLAGS": cppflags, + "LIBPATH": [env.Dir(".")], + "LIBS": ["Swiften_Ldns"], + } + if env["target"] == "android" : + env["LDNS_FLAGS"]["CPPPATH"].append(Dir("src/android")) ################################################################################ # Build ################################################################################ - if env["SCONS_STAGE"] == "build" : - myenv = env.Clone() - myenv.Append(CPPDEFINES = [("LDNS_STATICLIB")]) - myenv.Append(CPPPATH = ["src/ldns", "."]) - if env["target"] == "android" : - myenv.Append(CPPPATH = ["src/android"]) - myenv.UseFlags(env["OPENSSL_FLAGS"]) - - env["LDNS_OBJECTS"] = myenv.SwiftenObject([ - "src/ldns/compat/b32_ntop.c", - "src/ldns/compat/b32_pton.c", - "src/ldns/compat/b64_ntop.c", - "src/ldns/compat/b64_pton.c", - "src/ldns/buffer.c", - "src/ldns/dname.c", - "src/ldns/dnssec_sign.c", - "src/ldns/dnssec_verify.c", - "src/ldns/dnssec_zone.c", - "src/ldns/dnssec.c", - "src/ldns/error.c", - "src/ldns/higher.c", - "src/ldns/host2str.c", - "src/ldns/host2wire.c", - "src/ldns/keys.c", - "src/ldns/linktest.c", - "src/ldns/net.c", - "src/ldns/packet.c", - "src/ldns/parse.c", - "src/ldns/rbtree.c", - "src/ldns/rdata.c", - "src/ldns/resolver.c", - "src/ldns/rr_functions.c", - "src/ldns/rr.c", - "src/ldns/sha1.c", - "src/ldns/sha2.c", - "src/ldns/str2host.c", - "src/ldns/tsig.c", - "src/ldns/update.c", - "src/ldns/util.c", - "src/ldns/wire2host.c", - "src/ldns/zone.c", - ]) + if env["SCONS_STAGE"] == "build" : + myenv = env.Clone() + myenv.Append(CPPDEFINES = [("LDNS_STATICLIB")]) + myenv.Append(CPPPATH = ["src/ldns", "."]) + if env["target"] == "android" : + myenv.Append(CPPPATH = ["src/android"]) + myenv.UseFlags(env["OPENSSL_FLAGS"]) + + env["LDNS_OBJECTS"] = myenv.SwiftenObject([ + "src/ldns/compat/b32_ntop.c", + "src/ldns/compat/b32_pton.c", + "src/ldns/compat/b64_ntop.c", + "src/ldns/compat/b64_pton.c", + "src/ldns/buffer.c", + "src/ldns/dname.c", + "src/ldns/dnssec_sign.c", + "src/ldns/dnssec_verify.c", + "src/ldns/dnssec_zone.c", + "src/ldns/dnssec.c", + "src/ldns/error.c", + "src/ldns/higher.c", + "src/ldns/host2str.c", + "src/ldns/host2wire.c", + "src/ldns/keys.c", + "src/ldns/linktest.c", + "src/ldns/net.c", + "src/ldns/packet.c", + "src/ldns/parse.c", + "src/ldns/rbtree.c", + "src/ldns/rdata.c", + "src/ldns/resolver.c", + "src/ldns/rr_functions.c", + "src/ldns/rr.c", + "src/ldns/sha1.c", + "src/ldns/sha2.c", + "src/ldns/str2host.c", + "src/ldns/tsig.c", + "src/ldns/update.c", + "src/ldns/util.c", + "src/ldns/wire2host.c", + "src/ldns/zone.c", + ]) |