Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-05-19 08:47:04 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-05-19 10:33:54 (GMT) |
| commit | ed23f4578d6a5776b77e743ad54802d55f54f7e1 (patch) | |
| tree | 36bd0737bf6a9890577baa796858d1ce75b62537 /BuildTools/SCons/SConstruct | |
| parent | e86a46545e23ad824d7013c3c57bd83a52ade9af (diff) | |
| download | swift-ed23f4578d6a5776b77e743ad54802d55f54f7e1.zip swift-ed23f4578d6a5776b77e743ad54802d55f54f7e1.tar.bz2 | |
Consolidate Python and SCons files to tab based indentation
Test-Information:
Verified that SCons still runs on OS X.
Change-Id: I7e9b97f90ee5581a691a959b6f2c999d93e0be53
Diffstat (limited to 'BuildTools/SCons/SConstruct')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 9fba359..4ead554 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -70,13 +70,13 @@ def checkObjCHeader(context, header) : ################################################################################ # Platform configuration ################################################################################ if ARGUMENTS.get("force-configure", 0) : - SCons.SConf.SetCacheMode("force") + SCons.SConf.SetCacheMode("force") def CheckPKG(context, name): context.Message( 'Checking for package %s... ' % name ) ret = context.TryAction('pkg-config --exists \'%s\'' % name)[0] context.Result( ret ) return ret @@ -96,15 +96,15 @@ def GetVersion(context, define, header, extension = ".c") : int main(int argc, char* argv[]) { printf("%%d\\n", %(define)s); return 0; } """ % { "header" : header, "define": define }, extension) if ret[0] : - return int(ret[1]) + return int(ret[1]) else : - return -1 + return -1 conf = Configure(conf_env) if not conf.CheckCXX() or not conf.CheckCC() : print "Error: You need a working compiler" @@ -336,13 +336,13 @@ env["NEED_IDN"] = env.get("need_idn", True) # ICU icu_env = conf_env.Clone() use_icu = bool(env["icu"]) icu_prefix = "" if isinstance(env["icu"], str) : - icu_prefix = env["icu"] + icu_prefix = env["icu"] icu_flags = {} if icu_prefix : icu_flags = { "CPPPATH": [os.path.join(icu_prefix, "include")] } icu_flags["LIBPATH"] = [os.path.join(icu_prefix, "lib")] icu_env.MergeFlags(icu_flags) @@ -378,17 +378,17 @@ if not env.get("HAVE_ICU", False) and not env.get("HAVE_LIBIDN", False) : Exit(1) else: print "Proceeding without an IDN library because need_idn was false. This will break all internal binaries" # Unbound if env["unbound"] : - env["LDNS_BUNDLED"] = 1 - env["UNBOUND_BUNDLED"] = 1 + env["LDNS_BUNDLED"] = 1 + env["UNBOUND_BUNDLED"] = 1 else : - env["LDNS_FLAGS"] = {} - env["UNBOUND_FLAGS"] = {} + env["LDNS_FLAGS"] = {} + env["UNBOUND_FLAGS"] = {} # LibMiniUPnPc if env["experimental_ft"] : libminiupnpc_flags = {"CPPPATH": ["/usr/include/miniupnpc/"]} libminiupnpc_conf_env = conf_env.Clone() if env.get("libminiupnpc_libdir", None) : @@ -690,14 +690,14 @@ env["PROJECTS"] = [m for m in modules if m not in ["Documentation", "QA", "SwifT for stage in ["flags", "build"] : env["SCONS_STAGE"] = stage SConscript(dirs = map(lambda x : root + "/" + x, modules)) # SLOCCount if ARGUMENTS.get("sloccount", False) : - for project in env["PROJECTS"] : - env.SLOCCount("#/" + project) + for project in env["PROJECTS"] : + env.SLOCCount("#/" + project) ################################################################################ # Print summary ################################################################################ |