summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-05-19 08:47:04 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-05-19 10:33:54 (GMT)
commited23f4578d6a5776b77e743ad54802d55f54f7e1 (patch)
tree36bd0737bf6a9890577baa796858d1ce75b62537 /BuildTools/SCons/SConstruct
parente86a46545e23ad824d7013c3c57bd83a52ade9af (diff)
downloadswift-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/SConstruct20
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
@@ -73,7 +73,7 @@ def checkObjCHeader(context, header) :
################################################################################
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 )
@@ -99,9 +99,9 @@ int main(int argc, char* argv[]) {
}
""" % { "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)
@@ -339,7 +339,7 @@ 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")] }
@@ -381,11 +381,11 @@ if not env.get("HAVE_ICU", False) and not env.get("HAVE_LIBIDN", False) :
# 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"] :
@@ -693,8 +693,8 @@ for stage in ["flags", "build"] :
# SLOCCount
if ARGUMENTS.get("sloccount", False) :
- for project in env["PROJECTS"] :
- env.SLOCCount("#/" + project)
+ for project in env["PROJECTS"] :
+ env.SLOCCount("#/" + project)
################################################################################