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 /Slimber
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 'Slimber')
-rw-r--r--Slimber/CLI/SConscript6
-rw-r--r--Slimber/Cocoa/SConscript30
-rw-r--r--Slimber/Qt/SConscript50
-rw-r--r--Slimber/SConscript74
4 files changed, 80 insertions, 80 deletions
diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript
index e17996d..9dfa174 100644
--- a/Slimber/CLI/SConscript
+++ b/Slimber/CLI/SConscript
@@ -8,6 +8,6 @@ myenv.UseFlags(env["SWIFTEN_FLAGS"])
myenv.UseFlags(env["SWIFTEN_DEP_FLAGS"])
myenv.Program("slimber", [
- "main.cpp",
- "DummyMenulet.cpp",
- ])
+ "main.cpp",
+ "DummyMenulet.cpp",
+ ])
diff --git a/Slimber/Cocoa/SConscript b/Slimber/Cocoa/SConscript
index 441dc27..8f3c104 100644
--- a/Slimber/Cocoa/SConscript
+++ b/Slimber/Cocoa/SConscript
@@ -8,22 +8,22 @@ myenv.MergeFlags(env["SWIFTEN_FLAGS"])
myenv.MergeFlags(env["SWIFTEN_DEP_FLAGS"])
myenv.Program("Slimber", [
- "main.mm",
- "CocoaController.mm",
- "CocoaMenulet.mm",
- ])
+ "main.mm",
+ "CocoaController.mm",
+ "CocoaMenulet.mm",
+ ])
myenv.Nib("MainMenu")
myenv.AppBundle("Slimber", resources = { "": [
- "MainMenu.nib",
- "../Resources/Slimber.icns",
- "../Resources/Credits.html",
- "../Resources/Online.png",
- "../Resources/Offline.png",
- "../Resources/UsersOnline.png",
- "../Resources/UsersOffline.png"
- ]}, info = {
- "NSMainNibFile" : "MainMenu",
- "LSUIElement" : "1",
- })
+ "MainMenu.nib",
+ "../Resources/Slimber.icns",
+ "../Resources/Credits.html",
+ "../Resources/Online.png",
+ "../Resources/Offline.png",
+ "../Resources/UsersOnline.png",
+ "../Resources/UsersOffline.png"
+ ]}, info = {
+ "NSMainNibFile" : "MainMenu",
+ "LSUIElement" : "1",
+ })
diff --git a/Slimber/Qt/SConscript b/Slimber/Qt/SConscript
index 9d965cc..8328f8c 100644
--- a/Slimber/Qt/SConscript
+++ b/Slimber/Qt/SConscript
@@ -15,11 +15,11 @@ myenv.UseFlags(env.get("AVAHI_FLAGS", ""))
myenv.UseFlags(myenv["PLATFORM_FLAGS"])
if myenv.get("HAVE_ICU") :
- myenv.MergeFlags(env["ICU_FLAGS"])
- myenv.Append(CPPDEFINES = ["HAVE_ICU"])
+ myenv.MergeFlags(env["ICU_FLAGS"])
+ myenv.Append(CPPDEFINES = ["HAVE_ICU"])
if myenv.get("HAVE_LIBIDN") :
- myenv.MergeFlags(env["LIBIDN_FLAGS"])
- myenv.Append(CPPDEFINES = ["HAVE_LIBIDN"])
+ myenv.MergeFlags(env["LIBIDN_FLAGS"])
+ myenv.Append(CPPDEFINES = ["HAVE_LIBIDN"])
myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"])
myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"])
@@ -27,39 +27,39 @@ myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"])
qt4modules = ['QtCore', 'QtGui']
if myenv["qt5"] :
- qt_version = '5'
- qt4modules += ['QtWidgets']
+ qt_version = '5'
+ qt4modules += ['QtWidgets']
else :
- qt_version = '4'
+ qt_version = '4'
myenv.EnableQt4Modules(qt4modules, debug = False, version = qt_version)
if env["PLATFORM"] == "win32" :
- myenv.Append(LINKFLAGS = ["/SUBSYSTEM:WINDOWS"])
- myenv.Append(LIBS = "qtmain")
+ myenv.Append(LINKFLAGS = ["/SUBSYSTEM:WINDOWS"])
+ myenv.Append(LIBS = "qtmain")
myenv.BuildVersion("BuildVersion.h", project = "slimber")
sources = [
- "main.cpp",
- "QtMenulet.cpp",
- "QtAboutDialog.cpp",
- myenv.Qrc("Slimber.qrc"),
- ]
+ "main.cpp",
+ "QtMenulet.cpp",
+ "QtAboutDialog.cpp",
+ myenv.Qrc("Slimber.qrc"),
+ ]
#if env["PLATFORM"] == "win32" :
-# myenv.RES("../resources/Windows/Slimber.rc")
-# sources += ["../resources/Windows/Slimber.res"]
+# myenv.RES("../resources/Windows/Slimber.rc")
+# sources += ["../resources/Windows/Slimber.res"]
if env["PLATFORM"] == "win32" :
- slimberProgram = myenv.Program("Slimber", sources)
+ slimberProgram = myenv.Program("Slimber", sources)
else :
- slimberProgram = myenv.Program("slimber", sources)
+ slimberProgram = myenv.Program("slimber", sources)
if env["PLATFORM"] == "win32" :
- if "dist" in COMMAND_LINE_TARGETS or env.GetOption("clean") :
- myenv.WindowsBundle("Slimber", resources = {}, qtlibs = ["QtCore4", "QtGui4"])
- myenv.Append(NSIS_OPTIONS = [
- "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"",
- "/DbuildDate=" + datetime.date.today().strftime("%Y%m%d")
- ])
- #myenv.Nsis("../Packaging/nsis/slimber.nsi")
+ if "dist" in COMMAND_LINE_TARGETS or env.GetOption("clean") :
+ myenv.WindowsBundle("Slimber", resources = {}, qtlibs = ["QtCore4", "QtGui4"])
+ myenv.Append(NSIS_OPTIONS = [
+ "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"",
+ "/DbuildDate=" + datetime.date.today().strftime("%Y%m%d")
+ ])
+ #myenv.Nsis("../Packaging/nsis/slimber.nsi")
diff --git a/Slimber/SConscript b/Slimber/SConscript
index ff4f57d..a41fe0b 100644
--- a/Slimber/SConscript
+++ b/Slimber/SConscript
@@ -4,18 +4,18 @@ Import("env")
env["BUILD_SLIMBER"] = True
if env["PLATFORM"] == "win32" :
- if not env.get("HAVE_BONJOUR") and "Slimber" in env["PROJECTS"] :
- env["PROJECTS"].remove("Slimber")
+ if not env.get("HAVE_BONJOUR") and "Slimber" in env["PROJECTS"] :
+ env["PROJECTS"].remove("Slimber")
elif env["PLATFORM"] != "darwin" :
- if not env.get("HAVE_AVAHI", False) and "Slimber" in env["PROJECTS"] :
- env["PROJECTS"].remove("Slimber")
+ if not env.get("HAVE_AVAHI", False) and "Slimber" in env["PROJECTS"] :
+ env["PROJECTS"].remove("Slimber")
if not "Slimber" in env["PROJECTS"] and env["SCONS_STAGE"] == "flags" :
- print "Bonjour missing. Not building Slimber."
+ print "Bonjour missing. Not building Slimber."
if not env.get("HAVE_QT", False) and "Slimber" in env["PROJECTS"] :
- print "Qt missing. Not building Slimber."
- env["PROJECTS"].remove("Slimber")
+ print "Qt missing. Not building Slimber."
+ env["PROJECTS"].remove("Slimber")
if "Slimber" in env["PROJECTS"] :
@@ -23,42 +23,42 @@ if "Slimber" in env["PROJECTS"] :
# Flags
################################################################################
- if env["SCONS_STAGE"] == "flags" :
- env["SLIMBER_FLAGS"] = {
- "LIBPATH": [Dir(".")],
- "LIBS": ["Slimber"]
- }
+ if env["SCONS_STAGE"] == "flags" :
+ env["SLIMBER_FLAGS"] = {
+ "LIBPATH": [Dir(".")],
+ "LIBS": ["Slimber"]
+ }
################################################################################
# Build
################################################################################
- if env["SCONS_STAGE"] == "build" :
- myenv = env.Clone()
- myenv.UseFlags(env["LIMBER_FLAGS"])
- myenv.MergeFlags(env["BOOST_FLAGS"])
- myenv.MergeFlags(env["SWIFTEN_FLAGS"])
- myenv.MergeFlags(env["SWIFTEN_DEP_FLAGS"])
- myenv.StaticLibrary("Slimber", [
- "LinkLocalPresenceManager.cpp",
- "FileVCardCollection.cpp",
- "VCardCollection.cpp",
- "Server.cpp",
- "MainController.cpp",
- "MenuletController.cpp",
- "Menulet.cpp"
- ])
+ if env["SCONS_STAGE"] == "build" :
+ myenv = env.Clone()
+ myenv.UseFlags(env["LIMBER_FLAGS"])
+ myenv.MergeFlags(env["BOOST_FLAGS"])
+ myenv.MergeFlags(env["SWIFTEN_FLAGS"])
+ myenv.MergeFlags(env["SWIFTEN_DEP_FLAGS"])
+ myenv.StaticLibrary("Slimber", [
+ "LinkLocalPresenceManager.cpp",
+ "FileVCardCollection.cpp",
+ "VCardCollection.cpp",
+ "Server.cpp",
+ "MainController.cpp",
+ "MenuletController.cpp",
+ "Menulet.cpp"
+ ])
- env["SLIMBER_VERSION"] = "0.9.9." + datetime.date.today().strftime("%Y%m%d")
+ env["SLIMBER_VERSION"] = "0.9.9." + datetime.date.today().strftime("%Y%m%d")
- env.Append(UNITTEST_SOURCES = [
- File("UnitTest/LinkLocalPresenceManagerTest.cpp"),
- File("UnitTest/MenuletControllerTest.cpp")
- ])
+ env.Append(UNITTEST_SOURCES = [
+ File("UnitTest/LinkLocalPresenceManagerTest.cpp"),
+ File("UnitTest/MenuletControllerTest.cpp")
+ ])
- SConscript("CLI/SConscript")
- if env["PLATFORM"] == "darwin" :
- SConscript("Cocoa/SConscript")
- else :
- SConscript("Qt/SConscript")
+ SConscript("CLI/SConscript")
+ if env["PLATFORM"] == "darwin" :
+ SConscript("Cocoa/SConscript")
+ else :
+ SConscript("Qt/SConscript")