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/LibIDN | |
| 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/LibIDN')
| -rw-r--r-- | 3rdParty/LibIDN/SConscript | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/3rdParty/LibIDN/SConscript b/3rdParty/LibIDN/SConscript index e3ed839..90892b0 100644 --- a/3rdParty/LibIDN/SConscript +++ b/3rdParty/LibIDN/SConscript @@ -8,67 +8,67 @@ if env.get("LIBIDN_BUNDLED", False) : # Module flags ################################################################################ - if env["SCONS_STAGE"] == "flags" : - env["LIBIDN_FLAGS"] = { - "CPPDEFINES": ["LIBIDN_STATIC"], - } - if os.path.basename(env["CC"]) in ("clang", "gcc") : - env["LIBIDN_FLAGS"].update({"CPPFLAGS": ["-isystem" "3rdParty/LibIDN/src"]}) - else : - env["LIBIDN_FLAGS"].update({"CPPPATH": [Dir("src")]}) + if env["SCONS_STAGE"] == "flags" : + env["LIBIDN_FLAGS"] = { + "CPPDEFINES": ["LIBIDN_STATIC"], + } + if os.path.basename(env["CC"]) in ("clang", "gcc") : + env["LIBIDN_FLAGS"].update({"CPPFLAGS": ["-isystem" "3rdParty/LibIDN/src"]}) + else : + env["LIBIDN_FLAGS"].update({"CPPPATH": [Dir("src")]}) - if env["PLATFORM"] == "win32" : - env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")] - if float(env["MSVC_VERSION"]) < 14: - env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32/stdbool")] - if env["MSVC_VERSION"][:3] == "9.0" : - env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32/VC2008")] + if env["PLATFORM"] == "win32" : + env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")] + if float(env["MSVC_VERSION"]) < 14: + env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32/stdbool")] + if env["MSVC_VERSION"][:3] == "9.0" : + env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32/VC2008")] ################################################################################ # Build ################################################################################ - if env["SCONS_STAGE"] == "build" : - myenv = env.Clone() + if env["SCONS_STAGE"] == "build" : + myenv = env.Clone() - # Remove warn flags - myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]]) + # Remove warn flags + myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]]) - # Check for strcasecmp() or replacement - conf = Configure(conf_env) - if not conf.CheckFunc('strcasecmp') : - if conf.CheckFunc("stricmp") : - myenv.Append(CPPDEFINES = [("strcasecmp", "stricmp")]) - else : - print "Error: Cannot find strcasecmp() or stricmp()" - Exit(1) - if not conf.CheckFunc('strncasecmp') : - if conf.CheckFunc("strnicmp") : - myenv.Append(CPPDEFINES = [("strncasecmp", "strnicmp")]) - else : - print "Error: Cannot find strncasecmp() or strnicmp()" - Exit(1) - conf.Finish() + # Check for strcasecmp() or replacement + conf = Configure(conf_env) + if not conf.CheckFunc('strcasecmp') : + if conf.CheckFunc("stricmp") : + myenv.Append(CPPDEFINES = [("strcasecmp", "stricmp")]) + else : + print "Error: Cannot find strcasecmp() or stricmp()" + Exit(1) + if not conf.CheckFunc('strncasecmp') : + if conf.CheckFunc("strnicmp") : + myenv.Append(CPPDEFINES = [("strncasecmp", "strnicmp")]) + else : + print "Error: Cannot find strncasecmp() or strnicmp()" + Exit(1) + conf.Finish() - myenv.Append(CPPDEFINES = ["LIBIDN_STATIC", "HAVE_CONFIG_H"]) - myenv.Append(CPPPATH = ["src", "stubs", "src/gl"]) - if myenv["PLATFORM"] == "win32" : - myenv.Append(CPPPATH = "stubs/win32") - if float(env["MSVC_VERSION"]) < 14: - myenv.Append(CPPPATH = "stubs/win32/stdbool") - if myenv["MSVC_VERSION"][:3] == "9.0" : - myenv.Append(CPPPATH = "stubs/win32/VC2008") + myenv.Append(CPPDEFINES = ["LIBIDN_STATIC", "HAVE_CONFIG_H"]) + myenv.Append(CPPPATH = ["src", "stubs", "src/gl"]) + if myenv["PLATFORM"] == "win32" : + myenv.Append(CPPPATH = "stubs/win32") + if float(env["MSVC_VERSION"]) < 14: + myenv.Append(CPPPATH = "stubs/win32/stdbool") + if myenv["MSVC_VERSION"][:3] == "9.0" : + myenv.Append(CPPPATH = "stubs/win32/VC2008") - env["LIBIDN_OBJECTS"] = myenv.SwiftenObject([ - "src/stringprep.c", - "src/profiles.c", - "src/rfc3454.c", - "src/punycode.c", - "src/idna.c", - "src/toutf8.c", - "src/nfkc.c", - "src/gl/c-ctype.c", - "src/gl/c-strcasecmp.c", - "src/gl/c-strncasecmp.c", - "src/gl/unistr/u8-check.c" - ]) + env["LIBIDN_OBJECTS"] = myenv.SwiftenObject([ + "src/stringprep.c", + "src/profiles.c", + "src/rfc3454.c", + "src/punycode.c", + "src/idna.c", + "src/toutf8.c", + "src/nfkc.c", + "src/gl/c-ctype.c", + "src/gl/c-strcasecmp.c", + "src/gl/c-strncasecmp.c", + "src/gl/unistr/u8-check.c" + ]) |