summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'SwifTools')
-rw-r--r--SwifTools/Application/SConscript30
-rw-r--r--SwifTools/Cocoa/SConscript2
-rw-r--r--SwifTools/Dock/SConscript10
-rw-r--r--SwifTools/Idle/IdleQuerierTest/SConscript18
-rw-r--r--SwifTools/Idle/UnitTest/SConscript4
-rw-r--r--SwifTools/Notifier/SConscript30
-rw-r--r--SwifTools/SConscript128
-rw-r--r--SwifTools/URIHandler/SConscript20
-rw-r--r--SwifTools/UnitTest/SConscript14
9 files changed, 128 insertions, 128 deletions
diff --git a/SwifTools/Application/SConscript b/SwifTools/Application/SConscript
index 32924fc..29bcceb 100644
--- a/SwifTools/Application/SConscript
+++ b/SwifTools/Application/SConscript
@@ -1,27 +1,27 @@
Import("swiftools_env", "env")
sources = [
- "ApplicationPathProvider.cpp",
- ]
+ "ApplicationPathProvider.cpp",
+ ]
if swiftools_env["PLATFORM"] == "darwin" and swiftools_env["target"] == "native" :
- sources += [
- "CocoaApplication.mm",
- "MacOSXApplicationPathProvider.cpp",
- ]
+ sources += [
+ "CocoaApplication.mm",
+ "MacOSXApplicationPathProvider.cpp",
+ ]
elif swiftools_env["PLATFORM"] == "win32" :
- sources += [
- "WindowsApplicationPathProvider.cpp"
- ]
+ sources += [
+ "WindowsApplicationPathProvider.cpp"
+ ]
else :
- sources += [
- "UnixApplicationPathProvider.cpp"
- ]
+ sources += [
+ "UnixApplicationPathProvider.cpp"
+ ]
objects = swiftools_env.StaticObject(sources)
swiftools_env.Append(SWIFTOOLS_OBJECTS = [objects])
if swiftools_env["PLATFORM"] != "darwin" or swiftools_env["target"] == "native" :
- env.Append(UNITTEST_SOURCES = [
- File("UnitTest/ApplicationPathProviderTest.cpp")
- ])
+ env.Append(UNITTEST_SOURCES = [
+ File("UnitTest/ApplicationPathProviderTest.cpp")
+ ])
diff --git a/SwifTools/Cocoa/SConscript b/SwifTools/Cocoa/SConscript
index 4ae4a07..f4bd286 100644
--- a/SwifTools/Cocoa/SConscript
+++ b/SwifTools/Cocoa/SConscript
@@ -2,7 +2,7 @@ Import("swiftools_env", "env")
sources = []
if swiftools_env["PLATFORM"] == "darwin" and swiftools_env["target"] == "native" :
- sources += ["CocoaAction.mm"]
+ sources += ["CocoaAction.mm"]
objects = swiftools_env.StaticObject(sources)
swiftools_env.Append(SWIFTOOLS_OBJECTS = [objects])
diff --git a/SwifTools/Dock/SConscript b/SwifTools/Dock/SConscript
index 94797cb..3dbcf60 100644
--- a/SwifTools/Dock/SConscript
+++ b/SwifTools/Dock/SConscript
@@ -1,13 +1,13 @@
Import("swiftools_env")
sources = [
- "Dock.cpp",
- ]
+ "Dock.cpp",
+ ]
if swiftools_env["PLATFORM"] == "darwin" and swiftools_env["target"] == "native" :
- sources += [
- "MacOSXDock.mm",
- ]
+ sources += [
+ "MacOSXDock.mm",
+ ]
objects = swiftools_env.StaticObject(sources)
swiftools_env.Append(SWIFTOOLS_OBJECTS = objects)
diff --git a/SwifTools/Idle/IdleQuerierTest/SConscript b/SwifTools/Idle/IdleQuerierTest/SConscript
index 5878a46..89bb3f9 100644
--- a/SwifTools/Idle/IdleQuerierTest/SConscript
+++ b/SwifTools/Idle/IdleQuerierTest/SConscript
@@ -1,12 +1,12 @@
Import("env")
if env["TEST"] :
- myenv = env.Clone()
- myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
- myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
- myenv.MergeFlags(myenv["BOOST_FLAGS"])
- if myenv["HAVE_XSS"] :
- myenv.MergeFlags(myenv.get("XSS_FLAGS", {}))
- myenv.Append(LIBS = ["X11"])
- myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
- tester = myenv.Program("IdleQuerierTest", ["IdleQuerierTest.cpp"])
+ myenv = env.Clone()
+ myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
+ myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.MergeFlags(myenv["BOOST_FLAGS"])
+ if myenv["HAVE_XSS"] :
+ myenv.MergeFlags(myenv.get("XSS_FLAGS", {}))
+ myenv.Append(LIBS = ["X11"])
+ myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
+ tester = myenv.Program("IdleQuerierTest", ["IdleQuerierTest.cpp"])
diff --git a/SwifTools/Idle/UnitTest/SConscript b/SwifTools/Idle/UnitTest/SConscript
index f193349..26a9190 100644
--- a/SwifTools/Idle/UnitTest/SConscript
+++ b/SwifTools/Idle/UnitTest/SConscript
@@ -1,5 +1,5 @@
Import("env")
env.Append(UNITTEST_SOURCES = [
- File("ActualIdleDetectorTest.cpp")
- ])
+ File("ActualIdleDetectorTest.cpp")
+ ])
diff --git a/SwifTools/Notifier/SConscript b/SwifTools/Notifier/SConscript
index e60937b..a8e8590 100644
--- a/SwifTools/Notifier/SConscript
+++ b/SwifTools/Notifier/SConscript
@@ -3,25 +3,25 @@ Import("swiftools_env")
myenv = swiftools_env.Clone()
sources = [
- "Notifier.cpp",
- ]
+ "Notifier.cpp",
+ ]
if swiftools_env.get("HAVE_GROWL", False) :
- sources += [
- "GrowlNotifier.mm",
- "GrowlNotifierDelegate.mm",
- ]
+ sources += [
+ "GrowlNotifier.mm",
+ "GrowlNotifierDelegate.mm",
+ ]
elif myenv["PLATFORM"] == "darwin" :
- sources += [
- "NotificationCenterNotifier.mm",
- "NotificationCenterNotifierDelegate.mm",
- ]
+ sources += [
+ "NotificationCenterNotifier.mm",
+ "NotificationCenterNotifierDelegate.mm",
+ ]
if swiftools_env.get("HAVE_SNARL", False) :
- myenv.MergeFlags(myenv["SNARL_FLAGS"])
- sources += [
- "SnarlNotifier.cpp",
- ]
-
+ myenv.MergeFlags(myenv["SNARL_FLAGS"])
+ sources += [
+ "SnarlNotifier.cpp",
+ ]
+
objects = myenv.StaticObject(sources)
swiftools_env.Append(SWIFTOOLS_OBJECTS = objects)
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"])
diff --git a/SwifTools/URIHandler/SConscript b/SwifTools/URIHandler/SConscript
index 90ec00a..8ebbdaf 100644
--- a/SwifTools/URIHandler/SConscript
+++ b/SwifTools/URIHandler/SConscript
@@ -1,22 +1,22 @@
Import("swiftools_env", "env")
sources = [
- "XMPPURI.cpp",
- "URIHandler.cpp",
- ]
+ "XMPPURI.cpp",
+ "URIHandler.cpp",
+ ]
if swiftools_env["PLATFORM"] == "darwin" and swiftools_env["target"] == "native" :
- sources += [
- "MacOSXURIHandler.mm"
- ]
+ sources += [
+ "MacOSXURIHandler.mm"
+ ]
elif swiftools_env["PLATFORM"] == "win32" :
- sources += []
+ sources += []
else :
- sources += []
+ sources += []
objects = swiftools_env.StaticObject(sources)
swiftools_env.Append(SWIFTOOLS_OBJECTS = [objects])
env.Append(UNITTEST_SOURCES = [
- File("UnitTest/XMPPURITest.cpp"),
- ])
+ File("UnitTest/XMPPURITest.cpp"),
+ ])
diff --git a/SwifTools/UnitTest/SConscript b/SwifTools/UnitTest/SConscript
index dbd1ce5..bf44899 100644
--- a/SwifTools/UnitTest/SConscript
+++ b/SwifTools/UnitTest/SConscript
@@ -1,12 +1,12 @@
Import("env")
env.Append(UNITTEST_SOURCES = [
- File("LinkifyTest.cpp"),
- File("TabCompleteTest.cpp"),
- File("LastLineTrackerTest.cpp"),
- ])
+ File("LinkifyTest.cpp"),
+ File("TabCompleteTest.cpp"),
+ File("LastLineTrackerTest.cpp"),
+ ])
if env["HAVE_HUNSPELL"] :
- env.Append(UNITTEST_SOURCES = [
- File("SpellParserTest.cpp"),
- ])
+ env.Append(UNITTEST_SOURCES = [
+ File("SpellParserTest.cpp"),
+ ])