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 /3rdParty/CppUnit
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 '3rdParty/CppUnit')
-rw-r--r--3rdParty/CppUnit/SConscript104
1 files changed, 52 insertions, 52 deletions
diff --git a/3rdParty/CppUnit/SConscript b/3rdParty/CppUnit/SConscript
index addc8ab..0b97289 100644
--- a/3rdParty/CppUnit/SConscript
+++ b/3rdParty/CppUnit/SConscript
@@ -2,65 +2,65 @@ Import("env")
if env["TEST"] :
- if env["PLATFORM"] == "win32" :
- cppflags = ["/I" + Dir("src/include").abspath]
- elif env["PLATFORM"] == "sunos" :
- cppflags = [("-I" + Dir("src/include").abspath)]
- else :
- cppflags = [("-isystem", Dir("src/include").abspath)]
+ if env["PLATFORM"] == "win32" :
+ cppflags = ["/I" + Dir("src/include").abspath]
+ elif env["PLATFORM"] == "sunos" :
+ cppflags = [("-I" + Dir("src/include").abspath)]
+ else :
+ cppflags = [("-isystem", Dir("src/include").abspath)]
################################################################################
# Module flags
################################################################################
- if env["SCONS_STAGE"] == "flags" :
- env["CPPUNIT_FLAGS"] = {
- "CPPPATH": [env.Dir(".")],
- "CPPFLAGS": cppflags,
- "LIBPATH": [env.Dir(".")],
- "LIBS": ["Swiften_CppUnit"]
- }
+ if env["SCONS_STAGE"] == "flags" :
+ env["CPPUNIT_FLAGS"] = {
+ "CPPPATH": [env.Dir(".")],
+ "CPPFLAGS": cppflags,
+ "LIBPATH": [env.Dir(".")],
+ "LIBS": ["Swiften_CppUnit"]
+ }
################################################################################
# Build
################################################################################
- if env["SCONS_STAGE"] == "build" :
- myenv = env.Clone()
- myenv.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if not flag.startswith("-W")])
- myenv.Append(CPPPATH = ["src/include", "."])
- sources = [
- "src/src/cppunit/TextTestRunner.cpp",
- "src/src/cppunit/TextTestProgressListener.cpp",
- "src/src/cppunit/BriefTestProgressListener.cpp",
- "src/src/cppunit/TextOutputter.cpp",
- "src/src/cppunit/XmlOutputter.cpp",
- "src/src/cppunit/XmlElement.cpp",
- "src/src/cppunit/XmlDocument.cpp",
- "src/src/cppunit/StringTools.cpp",
- "src/src/cppunit/DefaultProtector.cpp",
- "src/src/cppunit/Protector.cpp",
- "src/src/cppunit/ProtectorChain.cpp",
- "src/src/cppunit/SynchronizedObject.cpp",
- "src/src/cppunit/SourceLine.cpp",
- "src/src/cppunit/TestRunner.cpp",
- "src/src/cppunit/TestFactoryRegistry.cpp",
- "src/src/cppunit/TestSuite.cpp",
- "src/src/cppunit/TestSuiteBuilderContext.cpp",
- "src/src/cppunit/TestResult.cpp",
- "src/src/cppunit/TestResultCollector.cpp",
- "src/src/cppunit/TestSuccessListener.cpp",
- "src/src/cppunit/TestComposite.cpp",
- "src/src/cppunit/TestCase.cpp",
- "src/src/cppunit/TestFailure.cpp",
- "src/src/cppunit/TestLeaf.cpp",
- "src/src/cppunit/TestNamer.cpp",
- "src/src/cppunit/Asserter.cpp",
- "src/src/cppunit/TypeInfoHelper.cpp",
- "src/src/cppunit/Exception.cpp",
- "src/src/cppunit/Message.cpp",
- "src/src/cppunit/AdditionalMessage.cpp",
- "src/src/cppunit/Test.cpp",
- "src/src/cppunit/TestPath.cpp"
- ]
- myenv.StaticLibrary("Swiften_CppUnit", sources)
+ if env["SCONS_STAGE"] == "build" :
+ myenv = env.Clone()
+ myenv.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if not flag.startswith("-W")])
+ myenv.Append(CPPPATH = ["src/include", "."])
+ sources = [
+ "src/src/cppunit/TextTestRunner.cpp",
+ "src/src/cppunit/TextTestProgressListener.cpp",
+ "src/src/cppunit/BriefTestProgressListener.cpp",
+ "src/src/cppunit/TextOutputter.cpp",
+ "src/src/cppunit/XmlOutputter.cpp",
+ "src/src/cppunit/XmlElement.cpp",
+ "src/src/cppunit/XmlDocument.cpp",
+ "src/src/cppunit/StringTools.cpp",
+ "src/src/cppunit/DefaultProtector.cpp",
+ "src/src/cppunit/Protector.cpp",
+ "src/src/cppunit/ProtectorChain.cpp",
+ "src/src/cppunit/SynchronizedObject.cpp",
+ "src/src/cppunit/SourceLine.cpp",
+ "src/src/cppunit/TestRunner.cpp",
+ "src/src/cppunit/TestFactoryRegistry.cpp",
+ "src/src/cppunit/TestSuite.cpp",
+ "src/src/cppunit/TestSuiteBuilderContext.cpp",
+ "src/src/cppunit/TestResult.cpp",
+ "src/src/cppunit/TestResultCollector.cpp",
+ "src/src/cppunit/TestSuccessListener.cpp",
+ "src/src/cppunit/TestComposite.cpp",
+ "src/src/cppunit/TestCase.cpp",
+ "src/src/cppunit/TestFailure.cpp",
+ "src/src/cppunit/TestLeaf.cpp",
+ "src/src/cppunit/TestNamer.cpp",
+ "src/src/cppunit/Asserter.cpp",
+ "src/src/cppunit/TypeInfoHelper.cpp",
+ "src/src/cppunit/Exception.cpp",
+ "src/src/cppunit/Message.cpp",
+ "src/src/cppunit/AdditionalMessage.cpp",
+ "src/src/cppunit/Test.cpp",
+ "src/src/cppunit/TestPath.cpp"
+ ]
+ myenv.StaticLibrary("Swiften_CppUnit", sources)