summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-10 20:55:31 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-10 20:57:13 (GMT)
commit5b45133a6cc563ea32daa3cafa48b173fc1e61ab (patch)
tree718a61e076999a098ef400b54f484a9da8f62a78
parent44d66c87401b38b2be0ca7875d9c72c222cd268f (diff)
downloadswift-5b45133a6cc563ea32daa3cafa48b173fc1e61ab.zip
swift-5b45133a6cc563ea32daa3cafa48b173fc1e61ab.tar.bz2
Fix SCons building on os x again.
-rw-r--r--SConstruct11
-rw-r--r--Swiften/QA/ClientTest/SConscript21
-rw-r--r--Swiften/QA/NetworkTest/SConscript18
-rw-r--r--Swiften/QA/SConscript9
-rw-r--r--Swiften/SConscript2
5 files changed, 57 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 87a2f4c..6e52bc5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -32,7 +32,7 @@ if int(ARGUMENTS.get("universal", 0)) == 1 :
"-arch", "ppc"])
if int(ARGUMENTS.get("warnings", env["PLATFORM"] != "win32")) == 1 :
- if env["PLATFORM"] != "win32" :
+ if env["PLATFORM"] == "win32" :
env.Append(CCFLAGS = ["/Wall"])
else :
env.Append(CCFLAGS = ["-W", "-Wall"])
@@ -121,15 +121,18 @@ else :
SConscript("3rdParty/ZLib/SConscript")
if conf.CheckLib("dl") :
- env.Append(LIBS = "dl")
+ env.Append(LIBS = ["dl"])
+
+if conf.CheckLib("c") :
+ env.Append(LIBS = ["c"])
if conf.CheckLib("resolv") :
- env.Append(LIBS = "resolv")
+ env.Append(LIBS = ["resolv"])
if conf.CheckCHeader("expat.h") and conf.CheckLib("expat") :
env["HAVE_EXPAT"] = 1
env["EXPAT_FLAGS"] = ""
- env.Append(LIBS = "expat")
+ env.Append(LIBS = ["expat"])
conf.Finish()
diff --git a/Swiften/QA/ClientTest/SConscript b/Swiften/QA/ClientTest/SConscript
new file mode 100644
index 0000000..6da8705
--- /dev/null
+++ b/Swiften/QA/ClientTest/SConscript
@@ -0,0 +1,21 @@
+import os
+
+Import("env")
+
+myenv = env.Clone()
+myenv.MergeFlags(env["SWIFTEN_FLAGS"])
+myenv.MergeFlags(env["CPPUNIT_FLAGS"])
+myenv.MergeFlags(env["LIBIDN_FLAGS"])
+myenv.MergeFlags(env["BOOST_FLAGS"])
+myenv.MergeFlags(env["SQLITE_FLAGS"])
+myenv.MergeFlags(env["EXPAT_FLAGS"])
+myenv.MergeFlags(env["ZLIB_FLAGS"])
+myenv.MergeFlags(env["OPENSSL_FLAGS"])
+
+for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
+ if os.environ.get(i, "") :
+ myenv["ENV"][i] = os.environ[i]
+
+tester = myenv.Program("ClientTest", ["ClientTest.cpp"])
+clientTest = myenv.Alias("ClientTest", tester, tester[0].abspath)
+env.AlwaysBuild(clientTest)
diff --git a/Swiften/QA/NetworkTest/SConscript b/Swiften/QA/NetworkTest/SConscript
new file mode 100644
index 0000000..f12c28d
--- /dev/null
+++ b/Swiften/QA/NetworkTest/SConscript
@@ -0,0 +1,18 @@
+import os
+
+Import("env")
+
+myenv = env.Clone()
+myenv.MergeFlags(env["SWIFTEN_FLAGS"])
+myenv.MergeFlags(env["CPPUNIT_FLAGS"])
+myenv.MergeFlags(env["BOOST_FLAGS"])
+myenv.MergeFlags(env["LIBIDN_FLAGS"])
+
+tester = myenv.Program("NetworkTest", [
+ "BoostConnectionServerTest.cpp",
+ "BoostConnectionTest.cpp",
+ "DomainNameResolverTest.cpp",
+ "#/QA/UnitTest/checker.cpp"
+ ])
+clientTest = myenv.Alias("NetworkTest", tester, tester[0].abspath)
+env.AlwaysBuild(clientTest)
diff --git a/Swiften/QA/SConscript b/Swiften/QA/SConscript
new file mode 100644
index 0000000..89d8285
--- /dev/null
+++ b/Swiften/QA/SConscript
@@ -0,0 +1,9 @@
+Import("env")
+
+if "test" in COMMAND_LINE_TARGETS or env.GetOption("clean") :
+ SConscript([
+ "NetworkTest/SConscript",
+ "ClientTest/SConscript",
+ ])
+
+ test = env.Alias("test", ["NetworkTest", "ClientTest"])
diff --git a/Swiften/SConscript b/Swiften/SConscript
index cf33930..eac3084 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -253,3 +253,5 @@ env.Append(UNITTEST_SOURCES = [
File("StringCodecs/UnitTest/Base64Test.cpp"),
File("StringCodecs/UnitTest/SHA1Test.cpp"),
])
+
+SConscript("QA/SConscript")