1 files changed, 75 insertions, 51 deletions
diff --git a/Sluift/SConscript b/Sluift/SConscript
index f6388a0..a2b6748 100644
--- a/Sluift/SConscript
+++ b/Sluift/SConscript
@@ -1,64 +1,88 @@
 import Version, os.path
 
-Import(["env", "conf_env"])
+Import(["env"])
 
-if env["SCONS_STAGE"] == "build" :
-	lib_env = env.Clone()
-	lib_env.UseFlags(env["LUA_FLAGS"])
-	lib_env.UseFlags(env["SWIFTEN_FLAGS"])
-	lib_env.UseFlags(env["SWIFTEN_DEP_FLAGS"])
-	sluift_lib = lib_env.StaticLibrary("SluiftCore", [
+if env["SCONS_STAGE"] == "build" and not GetOption("help") and not env.get("HAVE_LUA", 0) :
+	print "Warning: Lua was not found. Sluift will not be built."
+	if "Sluift" in env["PROJECTS"] :
+		env["PROJECTS"].remove("Sluift")
+		
+elif env["SCONS_STAGE"] == "build" :
+	sluift_sources = [
 		"Lua/Value.cpp",
+		"Lua/Exception.cpp",
+		"Lua/Check.cpp",
+		"Lua/FunctionRegistration.cpp",
+		"Lua/FunctionRegistry.cpp",
+		"Lua/LuaUtils.cpp",
+		"LuaElementConvertors.cpp",
+		"LuaElementConvertor.cpp",
+		"Response.cpp",
+		"ElementConvertors/BodyConvertor.cpp",
+		"ElementConvertors/VCardUpdateConvertor.cpp",
+		"ElementConvertors/PubSubEventConvertor.cpp",
+		"ElementConvertors/RawXMLElementConvertor.cpp",
+		"ElementConvertors/DOMElementConvertor.cpp",
+		"ElementConvertors/DefaultElementConvertor.cpp",
+		"ElementConvertors/DiscoInfoConvertor.cpp",
+		"ElementConvertors/DiscoItemsConvertor.cpp",
+		"ElementConvertors/FormConvertor.cpp",
+		"ElementConvertors/SoftwareVersionConvertor.cpp",
+		"ElementConvertors/VCardConvertor.cpp",
+		"ElementConvertors/CommandConvertor.cpp",
+		"ElementConvertors/StatusConvertor.cpp",
+		"ElementConvertors/StatusShowConvertor.cpp",
+		"ElementConvertors/DelayConvertor.cpp",
+		"Helpers.cpp",
+		"SluiftClient.cpp",
+		"SluiftComponent.cpp",
+		"Watchdog.cpp",
+		"core.c",
+		"client.cpp",
+		"component.cpp",
 		"sluift.cpp"
-		]);
+	]
+	sluift_sources += env.SConscript("ElementConvertors/SConscript")
+
+
 
-	myenv = env.Clone()
-	myenv.Append(LIBS = sluift_lib)
-	myenv.UseFlags(env.get("LUA_FLAGS", {}))
-	myenv.UseFlags(env["SWIFTEN_FLAGS"])
-	myenv.UseFlags(env["SWIFTEN_DEP_FLAGS"])
-	myenv["SHLIBPREFIX"] = ""
-	if myenv["PLATFORM"] == "win32" :
-		myenv.Append(CPPDEFINES = ["SLUIFT_BUILD_DLL"])
-	elif myenv["PLATFORM"] == "darwin" :
-		myenv["SHLIBSUFFIX"] = ".so"
-	if env["PLATFORM"] == "win32" :
-		myenv.Append(CFLAGS = ["/TP"])
-	else :
-		myenv.Append(CFLAGS = ["-x", "c++"])
+	sluift_env = env.Clone()
+	sluift_env.UseFlags(env.get("LUA_FLAGS", {}))
+	sluift_env.UseFlags(env["SWIFTEN_FLAGS"])
+	sluift_env.UseFlags(env["SWIFTEN_DEP_FLAGS"])
+	# Support compilation on both Lua 5.1 and Lua 5.2
+	sluift_env.Append(CPPDEFINES = ["LUA_COMPAT_ALL"])
+	if sluift_env["PLATFORM"] == "win32" :
+		sluift_env.Append(CPPDEFINES = ["SLUIFT_BUILD_DLL"])
 
-	myenv["SLUIFT_VERSION"] = Version.getBuildVersion(env.Dir("#").abspath, "sluift")
-	def patchLua(env, target, source) :
+	if sluift_env["PLATFORM"] == "darwin" and os.path.isdir("/Applications/iTunes.app") :
+		sluift_env.Append(FRAMEWORKS = ["ScriptingBridge"])
+		sluift_env.Command("iTunes.h", "/Applications/iTunes.app", 
+				"sdef ${SOURCE} | sdp -fh --basename iTunes -o ${TARGET.dir}")
+		sluift_env.Append(CPPDEFINES = ["HAVE_ITUNES"])
+		sluift_sources += ["ITunesInterface.mm"]
+
+	# Generate Version.h
+	version_header = "#pragma once\n\n"
+	version_header += "#define SLUIFT_VERSION_STRING \"" + Version.getBuildVersion(env.Dir("#").abspath, "sluift") + "\"\n"
+	sluift_env.WriteVal("Version.h", sluift_env.Value(version_header))
+
+	# Generate core.c
+	def generate_embedded_lua(env, target, source) :
 		f = open(source[0].abspath, "r")
-		contents = f.read()
+		data = f.read()
 		f.close()
-		if env["PLATFORM"] == "win32" :
-			key = "Z"
-		else :
-			key = "D"
-		contents = contents.replace("LUA_RELEASE", "\"== Sluift XMPP Console (%(version)s) == \\nPress Ctrl-%(key)s to exit\"" % {"version": source[1].get_contents(), "key" : key})
-		contents = contents.replace("LUA_COPYRIGHT", "")
 		f = open(target[0].abspath, "w")
-		f.write(contents)
+		f.write('#include <stddef.h>\n')
+		f.write('const size_t ' + source[0].name.replace(".", "_") + "_size = " + str(len(data)) + ";\n")
+		f.write('const char ' + source[0].name.replace(".", "_") + "[] = {" + ", ".join([str(ord(c)) for c in data]) + "};\n")
 		f.close()
+	sluift_env.Command("core.c", ["core.lua"], env.Action(generate_embedded_lua, cmdstr="$GENCOMSTR"))
 
-	myenv.Command("lua.c", ["#/3rdParty/Lua/src/lua.c", myenv.Value(myenv["SLUIFT_VERSION"])], env.Action(patchLua, cmdstr = "$GENCOMSTR"))
-	if myenv.get("HAVE_READLINE", False) :
-		myenv.Append(CPPDEFINES = ["LUA_USE_READLINE"])
-		myenv.MergeFlags(myenv["READLINE_FLAGS"])
-	env["SLUIFT"] = myenv.Program("sluift", [
-			"lua.c",
-			"linit.c",
-		])
+	sluift_env.WriteVal("dll.c", sluift_env.Value(""))
 
-	myenv.WriteVal("dll.c", myenv.Value(""))
-	myenv.SharedLibrary("sluift", ["dll.c"])
-
-	if env["PLATFORM"] == "win32" :
-		ssl_libs = []
-		if myenv.get("OPENSSL_DIR", False) :
-			ssl_libs = [
-			os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),  
-			os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll")
-		]
-		myenv.WindowsBundle("Sluift", resources = {"": ssl_libs})
+	sluift_sources = [env.File(x) for x in sluift_sources]
+	for sluift_variant in ['dll', 'exe'] :
+		SConscript(["SConscript.variant"], variant_dir = sluift_variant,
+				duplicate = 0,
+				exports = ['sluift_sources', 'sluift_variant', 'sluift_env'])