Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-18 10:34:41 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-18 10:41:11 (GMT) |
| commit | 362b2d147e4050e997104c24b2ed2e818adab5ed (patch) | |
| tree | 63340cf49072e2cc0d9d876859249eb22fd540d3 /Limber/SConscript | |
| parent | 0328d98d29b383ecfcb5ffb66df0a9b7b4d85654 (diff) | |
| parent | 7af8a078c57d94ff63eb81f26de2f55eca6b5c00 (diff) | |
| download | swift-362b2d147e4050e997104c24b2ed2e818adab5ed.zip swift-362b2d147e4050e997104c24b2ed2e818adab5ed.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Moving unused server code out of Swiften into Limber.
Conflicts:
Limber/Server/ServerFromClientSession.cpp
Limber/Server/ServerSession.cpp
Limber/Server/ServerStanzaRouter.cpp
Limber/Server/SimpleUserRegistry.cpp
Limber/Server/SimpleUserRegistry.h
Limber/Server/UnitTest/ServerStanzaRouterTest.cpp
Limber/Server/UserRegistry.cpp
Limber/main.cpp
Slimber/Server.cpp
Slimber/Server.h
Diffstat (limited to 'Limber/SConscript')
| -rw-r--r-- | Limber/SConscript | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/Limber/SConscript b/Limber/SConscript index e2fadac..bc05f7f 100644 --- a/Limber/SConscript +++ b/Limber/SConscript @@ -1,8 +1,26 @@ Import("env") -if env["SCONS_STAGE"] == "build" : +if env["SCONS_STAGE"] == "flags" : + env["LIMBER_FLAGS"] = { + "LIBPATH": [Dir(".")], + "LIBS": ["Limber"], + } + +elif env["SCONS_STAGE"] == "build" : + libenv = env.Clone() + libenv.MergeFlags(env["BOOST_FLAGS"]) + libenv.MergeFlags(env["SWIFTEN_FLAGS"]) + libenv.StaticLibrary("Limber", [ + "Server/ServerFromClientSession.cpp", + "Server/ServerSession.cpp", + "Server/ServerStanzaRouter.cpp", + "Server/SimpleUserRegistry.cpp", + "Server/UserRegistry.cpp", + ]) + myenv = env.Clone() myenv.BuildVersion("BuildVersion.h", project = "limber") + myenv.UseFlags(env["LIMBER_FLAGS"]) myenv.UseFlags(env["SWIFTEN_FLAGS"]) myenv.UseFlags(env["LIBIDN_FLAGS"]) myenv.UseFlags(env.get("LIBXML_FLAGS", "")) @@ -10,5 +28,8 @@ if env["SCONS_STAGE"] == "build" : myenv.UseFlags(env["OPENSSL_FLAGS"]) myenv.UseFlags(env["BOOST_FLAGS"]) myenv.UseFlags(myenv["PLATFORM_FLAGS"]) - myenv.Program("limber", ["main.cpp"]) + + env.Append(UNITTEST_SOURCES = [ + File("Server/UnitTest/ServerStanzaRouterTest.cpp"), + ]) |