summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-06-03 19:03:47 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-06-03 19:03:47 (GMT)
commit66da202f765c8843bf61bc83fb5e7f81c2cb0a65 (patch)
tree35e56ce082a6945547579511c6c22832a838dfbe
parent5799abfc6afa135f183908688d72f4d7d5254e79 (diff)
downloadswift-contrib-66da202f765c8843bf61bc83fb5e7f81c2cb0a65.zip
swift-contrib-66da202f765c8843bf61bc83fb5e7f81c2cb0a65.tar.bz2
Remove SQLite and SQLiteHistoryManager.
-rw-r--r--3rdParty/SQLite/SConscript22
-rw-r--r--Swift/QtUI/SConscript2
-rw-r--r--Swiften/Examples/ConnectivityTest/SConscript2
-rw-r--r--Swiften/Examples/LinkLocalTool/SConscript2
-rw-r--r--Swiften/Examples/SendMessage/SConscript2
-rw-r--r--Swiften/History/SConscript18
6 files changed, 25 insertions, 23 deletions
diff --git a/3rdParty/SQLite/SConscript b/3rdParty/SQLite/SConscript
index 75b1d97..9b9fead 100644
--- a/3rdParty/SQLite/SConscript
+++ b/3rdParty/SQLite/SConscript
@@ -1,17 +1,19 @@
Import("env")
+if env.get("SQLITE_BUNDLED", False) :
+
################################################################################
# Flags
################################################################################
-if env["SCONS_STAGE"] == "flags" :
- env["SQLITE_FLAGS"] = {
- "CPPPATH": [Dir(".")],
- "LIBPATH": [Dir(".")],
- "LIBS": ["SQLite"],
- }
+ if env["SCONS_STAGE"] == "flags" :
+ env["SQLITE_FLAGS"] = {
+ "CPPPATH": [Dir(".")],
+ "LIBPATH": [Dir(".")],
+ "LIBS": ["SQLite"],
+ }
-if env["SCONS_STAGE"] == "build" :
- myenv = env.Clone()
- myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]])
- myenv.StaticLibrary("SQLite", ["sqlite3.c"], CPPPATH = ["."])
+ if env["SCONS_STAGE"] == "build" :
+ myenv = env.Clone()
+ myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]])
+ myenv.StaticLibrary("SQLite", ["sqlite3.c"], CPPPATH = ["."])
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 8a58f5e..80e3d56 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -30,7 +30,7 @@ if myenv["HAVE_SPARKLE"] :
myenv.MergeFlags(env["SWIFTEN_FLAGS"])
myenv.MergeFlags(env["LIBIDN_FLAGS"])
myenv.MergeFlags(env["BOOST_FLAGS"])
-myenv.MergeFlags(env["SQLITE_FLAGS"])
+myenv.MergeFlags(env.get("SQLITE_FLAGS", {}))
myenv.MergeFlags(env["ZLIB_FLAGS"])
myenv.MergeFlags(env["OPENSSL_FLAGS"])
myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
diff --git a/Swiften/Examples/ConnectivityTest/SConscript b/Swiften/Examples/ConnectivityTest/SConscript
index 55a0b36..6563ded 100644
--- a/Swiften/Examples/ConnectivityTest/SConscript
+++ b/Swiften/Examples/ConnectivityTest/SConscript
@@ -4,7 +4,7 @@ myenv = env.Clone()
myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
myenv.MergeFlags(myenv["BOOST_FLAGS"])
-myenv.MergeFlags(myenv["SQLITE_FLAGS"])
+myenv.MergeFlags(myenv.get("SQLITE_FLAGS", {}))
myenv.MergeFlags(myenv["ZLIB_FLAGS"])
myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
myenv.MergeFlags(myenv.get("LIBXML_FLAGS", ""))
diff --git a/Swiften/Examples/LinkLocalTool/SConscript b/Swiften/Examples/LinkLocalTool/SConscript
index 0feceae..0756d68 100644
--- a/Swiften/Examples/LinkLocalTool/SConscript
+++ b/Swiften/Examples/LinkLocalTool/SConscript
@@ -4,9 +4,9 @@ myenv = env.Clone()
myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
myenv.MergeFlags(myenv["BOOST_FLAGS"])
-myenv.MergeFlags(myenv["SQLITE_FLAGS"])
myenv.MergeFlags(myenv["ZLIB_FLAGS"])
myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
+myenv.MergeFlags(myenv.get("SQLITE_FLAGS", {}))
myenv.MergeFlags(myenv.get("LIBXML_FLAGS", {}))
myenv.MergeFlags(myenv.get("EXPAT_FLAGS", {}))
myenv.MergeFlags(myenv.get("AVAHI_FLAGS", {}))
diff --git a/Swiften/Examples/SendMessage/SConscript b/Swiften/Examples/SendMessage/SConscript
index c3f325e..bc9bde2 100644
--- a/Swiften/Examples/SendMessage/SConscript
+++ b/Swiften/Examples/SendMessage/SConscript
@@ -4,9 +4,9 @@ myenv = env.Clone()
myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
myenv.MergeFlags(myenv["BOOST_FLAGS"])
-myenv.MergeFlags(myenv["SQLITE_FLAGS"])
myenv.MergeFlags(myenv["ZLIB_FLAGS"])
myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
+myenv.MergeFlags(myenv.get("SQLITE_FLAGS", {}))
myenv.MergeFlags(myenv.get("LIBXML_FLAGS", ""))
myenv.MergeFlags(myenv.get("EXPAT_FLAGS", ""))
tester = myenv.Program("SendMessage", ["SendMessage.cpp"])
diff --git a/Swiften/History/SConscript b/Swiften/History/SConscript
index bc80780..c197653 100644
--- a/Swiften/History/SConscript
+++ b/Swiften/History/SConscript
@@ -1,11 +1,11 @@
Import("swiften_env")
-myenv = swiften_env.Clone()
-if myenv["target"] == "native":
- myenv.MergeFlags(swiften_env["SQLITE_FLAGS"])
-
-objects = myenv.StaticObject([
- "HistoryManager.cpp",
- "SQLiteHistoryManager.cpp",
- ])
-swiften_env.Append(SWIFTEN_OBJECTS = [objects])
+#myenv = swiften_env.Clone()
+#if myenv["target"] == "native":
+# myenv.MergeFlags(swiften_env.get("SQLITE_FLAGS", {}))
+#
+#objects = myenv.StaticObject([
+# "HistoryManager.cpp",
+# "SQLiteHistoryManager.cpp",
+# ])
+#swiften_env.Append(SWIFTEN_OBJECTS = [objects])