summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-04-25 19:43:29 (GMT)
committerTobias Markmann <tm@ayena.de>2016-04-25 19:43:29 (GMT)
commit857791adda753a0f94da8317bbc019378b1f09bd (patch)
tree96aa2e4d863d50888a16527f9fbb38712e97d8ee /SwifTools/SConscript
parentb58ad7f4b01623a8807b8c268208bd9c8496f4e2 (diff)
downloadswift-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 'SwifTools/SConscript')
-rw-r--r--SwifTools/SConscript128
1 files changed, 64 insertions, 64 deletions
diff --git a/SwifTools/SConscript b/SwifTools/SConscript
index b9822e0..aa6d47e 100644
--- a/SwifTools/SConscript
+++ b/SwifTools/SConscript
@@ -5,79 +5,79 @@ Import("env")
################################################################################
if env["SCONS_STAGE"] == "flags" :
- env["SWIFTOOLS_FLAGS"] = {
- "LIBPATH": [Dir(".")],
- "LIBS": ["SwifTools"]
- }
+ env["SWIFTOOLS_FLAGS"] = {
+ "LIBPATH": [Dir(".")],
+ "LIBS": ["SwifTools"]
+ }
################################################################################
# Build
################################################################################
if env["SCONS_STAGE"] == "build" :
- swiftools_env = env.Clone()
- swiftools_env.UseFlags(swiftools_env["SWIFTEN_FLAGS"])
- swiftools_env.UseFlags(swiftools_env["BOOST_FLAGS"])
+ swiftools_env = env.Clone()
+ swiftools_env.UseFlags(swiftools_env["SWIFTEN_FLAGS"])
+ swiftools_env.UseFlags(swiftools_env["BOOST_FLAGS"])
- sources = [
- "Idle/IdleDetector.cpp",
- "Idle/ActualIdleDetector.cpp",
- "Idle/IdleQuerier.cpp",
- "Idle/PlatformIdleQuerier.cpp",
- "AutoUpdater/AutoUpdater.cpp",
- "AutoUpdater/PlatformAutoUpdaterFactory.cpp",
- "Linkify.cpp",
- "TabComplete.cpp",
- "LastLineTracker.cpp",
- ]
-
- if swiftools_env["HAVE_HUNSPELL"] :
- swiftools_env.UseFlags(swiftools_env["HUNSPELL_FLAGS"])
- swiftools_env.Append(CPPDEFINES = ["HAVE_HUNSPELL"])
- sources += [
- "SpellCheckerFactory.cpp",
- "HunspellChecker.cpp",
- "SpellParser.cpp",
- ]
- elif swiftools_env["PLATFORM"] == "darwin" and env["target"] == "native" :
- sources += [
- "SpellCheckerFactory.cpp",
- "MacOSXChecker.mm",
- "SpellParser.cpp",
- ]
+ sources = [
+ "Idle/IdleDetector.cpp",
+ "Idle/ActualIdleDetector.cpp",
+ "Idle/IdleQuerier.cpp",
+ "Idle/PlatformIdleQuerier.cpp",
+ "AutoUpdater/AutoUpdater.cpp",
+ "AutoUpdater/PlatformAutoUpdaterFactory.cpp",
+ "Linkify.cpp",
+ "TabComplete.cpp",
+ "LastLineTracker.cpp",
+ ]
+ if swiftools_env["HAVE_HUNSPELL"] :
+ swiftools_env.UseFlags(swiftools_env["HUNSPELL_FLAGS"])
+ swiftools_env.Append(CPPDEFINES = ["HAVE_HUNSPELL"])
+ sources += [
+ "SpellCheckerFactory.cpp",
+ "HunspellChecker.cpp",
+ "SpellParser.cpp",
+ ]
+ elif swiftools_env["PLATFORM"] == "darwin" and env["target"] == "native" :
+ sources += [
+ "SpellCheckerFactory.cpp",
+ "MacOSXChecker.mm",
+ "SpellParser.cpp",
+ ]
- if swiftools_env.get("HAVE_SPARKLE", 0) :
- swiftools_env.UseFlags(swiftools_env["SPARKLE_FLAGS"])
- swiftools_env.Append(CPPDEFINES = ["HAVE_SPARKLE"])
- sources += ["AutoUpdater/SparkleAutoUpdater.mm"]
- if swiftools_env["PLATFORM"] == "win32" :
- sources += ["Idle/WindowsIdleQuerier.cpp"]
- elif swiftools_env["PLATFORM"] == "darwin" and swiftools_env.get("HAVE_IOKIT", False) :
- swiftools_env.Append(CPPDEFINES = ["HAVE_IOKIT"])
- sources += ["Idle/MacOSXIdleQuerier.cpp"]
- elif swiftools_env["HAVE_XSS"] :
- swiftools_env.Append(CPPDEFINES = ["HAVE_XSS"])
- sources += ["Idle/XSSIdleQuerier.cpp"]
+ if swiftools_env.get("HAVE_SPARKLE", 0) :
+ swiftools_env.UseFlags(swiftools_env["SPARKLE_FLAGS"])
+ swiftools_env.Append(CPPDEFINES = ["HAVE_SPARKLE"])
+ sources += ["AutoUpdater/SparkleAutoUpdater.mm"]
- if env.get("HAVE_BREAKPAD", False) :
- swiftools_env.UseFlags(swiftools_env["BREAKPAD_FLAGS"])
- swiftools_env.Append(CPPDEFINES = ["HAVE_BREAKPAD"])
- sources += ["CrashReporter.cpp"]
-
- swiftools_env["SWIFTOOLS_OBJECTS"] = []
- Export("swiftools_env")
-
- SConscript(dirs = [
- "Application",
- "Dock",
- "Notifier",
- "URIHandler",
- "Idle/IdleQuerierTest",
- "Idle/UnitTest",
- "Cocoa",
- "UnitTest"
- ])
+ if swiftools_env["PLATFORM"] == "win32" :
+ sources += ["Idle/WindowsIdleQuerier.cpp"]
+ elif swiftools_env["PLATFORM"] == "darwin" and swiftools_env.get("HAVE_IOKIT", False) :
+ swiftools_env.Append(CPPDEFINES = ["HAVE_IOKIT"])
+ sources += ["Idle/MacOSXIdleQuerier.cpp"]
+ elif swiftools_env["HAVE_XSS"] :
+ swiftools_env.Append(CPPDEFINES = ["HAVE_XSS"])
+ sources += ["Idle/XSSIdleQuerier.cpp"]
- swiftools_env.StaticLibrary("SwifTools", sources + swiftools_env["SWIFTOOLS_OBJECTS"])
+ if env.get("HAVE_BREAKPAD", False) :
+ swiftools_env.UseFlags(swiftools_env["BREAKPAD_FLAGS"])
+ swiftools_env.Append(CPPDEFINES = ["HAVE_BREAKPAD"])
+ sources += ["CrashReporter.cpp"]
+
+ swiftools_env["SWIFTOOLS_OBJECTS"] = []
+ Export("swiftools_env")
+
+ SConscript(dirs = [
+ "Application",
+ "Dock",
+ "Notifier",
+ "URIHandler",
+ "Idle/IdleQuerierTest",
+ "Idle/UnitTest",
+ "Cocoa",
+ "UnitTest"
+ ])
+
+ swiftools_env.StaticLibrary("SwifTools", sources + swiftools_env["SWIFTOOLS_OBJECTS"])