Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-07-10 07:58:49 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-07-10 10:56:44 (GMT) |
| commit | 3911f30a92ae971aebdbf1d733b4261aafde4950 (patch) | |
| tree | eaa21ace7c329130b1aa5ab8b7494156d6eed4b9 | |
| parent | 17721d86205828929e784ad35e5f07e8a7a71631 (diff) | |
| download | swift-3911f30a92ae971aebdbf1d733b4261aafde4950.zip swift-3911f30a92ae971aebdbf1d733b4261aafde4950.tar.bz2 | |
Fixed compilation problem on some compilers.
| -rw-r--r-- | 3rdParty/OpenSSL/.gitignore | 1 | ||||
| -rw-r--r-- | 3rdParty/OpenSSL/SConscript | 2 | ||||
| -rw-r--r-- | BuildTools/SCons/SConscript.boot | 15 | ||||
| -rw-r--r-- | BuildTools/SCons/SConstruct | 9 | ||||
| -rw-r--r-- | SConstruct | 5 | ||||
| -rw-r--r-- | Swiften/JID/JID.h | 3 | ||||
| -rw-r--r-- | Swiften/SConscript | 11 |
7 files changed, 27 insertions, 19 deletions
diff --git a/3rdParty/OpenSSL/.gitignore b/3rdParty/OpenSSL/.gitignore new file mode 100644 index 0000000..fa963ae --- /dev/null +++ b/3rdParty/OpenSSL/.gitignore @@ -0,0 +1 @@ +openssl diff --git a/3rdParty/OpenSSL/SConscript b/3rdParty/OpenSSL/SConscript index c19632c..dfe78b7 100644 --- a/3rdParty/OpenSSL/SConscript +++ b/3rdParty/OpenSSL/SConscript @@ -1,6 +1,6 @@ Import("env") -openssl_bundle_dir = "#/../openssl" +openssl_bundle_dir = "openssl" if env.get("OPENSSL_BUNDLED", False) : if env["SCONS_STAGE"] == "flags" : diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot index c57ba3c..e969def 100644 --- a/BuildTools/SCons/SConscript.boot +++ b/BuildTools/SCons/SConscript.boot @@ -50,6 +50,7 @@ vars.Add(PathVariable("avahi_libdir", "Avahi library location", None, PathVariab vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept)) vars.Add(PathVariable("docbook_xml", "DocBook XML", None, PathVariable.PathAccept)) vars.Add(PathVariable("docbook_xsl", "DocBook XSL", None, PathVariable.PathAccept)) +vars.Add(BoolVariable("build_examples", "Build example programs", "yes")) vars.Add(BoolVariable("enable_variants", "Build in a separate dir under build/, depending on compile flags", "no")) ################################################################################ @@ -81,12 +82,6 @@ if env["PLATFORM"] == "win32" : env['ENV']['TMP'] = os.environ['TMP'] env.Tool("SLOCCount", toolpath = ["#/BuildTools/SCons/Tools"]) -# Override SConscript to handle tests -oldSConscript = SConscript -def SConscript(*arguments, **keywords) : - if not keywords.get("test_only", False) or env["TEST"] : - return apply(oldSConscript, arguments, keywords) - # Max out the number of jobs if env["max_jobs"] : try : @@ -289,8 +284,12 @@ Export("conf_env") variant = "" if env["enable_variants"] : - fingerprint = "".join([flag for flag in env["CXXFLAGS"] + env["CCFLAGS"] if not flag.startswith("-W")]) + fingerprint = ",".join([flag for flag in env["CXXFLAGS"] + env["CCFLAGS"] if not flag.startswith("-W") and not flag.startswith("-fvisibility")]) variant = "build/" + fingerprint - + if not os.path.exists(Dir("#/build").abspath) : + os.mkdir(Dir("#/build").abspath) + if os.path.exists(Dir("#/build/current").abspath) : + os.unlink(Dir("#/build/current").abspath) + os.symlink(os.path.basename(variant), Dir("#/build/current").abspath) Return("variant") diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 90ea403..cc052ca 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -5,6 +5,13 @@ Import("env", "conf_env") root = Dir("../..").abspath +# Override SConscript to handle tests +oldSConscript = SConscript +def SConscript(*arguments, **keywords) : + if not keywords.get("test_only", False) or env["TEST"] : + return apply(oldSConscript, arguments, keywords) +env.SConscript = SConscript + ################################################################################ # Extend the default build environment (not affecting the configure env) # @@ -375,7 +382,7 @@ if use_openssl and openssl_conf.CheckCHeader("openssl/ssl.h") : if env["PLATFORM"] == "darwin" : if platform.mac_ver()[0].startswith("10.5") : env["OPENSSL_FLAGS"]["FRAMEWORKS"] = ["Security"] -elif target in ("iphone-device", "iphone-simulator", "xcode") : +elif env["target"] in ("iphone-device", "iphone-simulator", "xcode") : env["OPENSSL_BUNDLED"] = True env["HAVE_OPENSSL"] = True else : @@ -1,6 +1,5 @@ variant_dir = SConscript("BuildTools/SCons/SConscript.boot") -print "Variant dir: " + str(variant_dir) if variant_dir : - variant_dir = SConscript("BuildTools/SCons/SConstruct", variant_dir = variant_dir, src_dir = ".") + SConscript("BuildTools/SCons/SConstruct", variant_dir = variant_dir, src_dir = ".") else : - variant_dir = SConscript("BuildTools/SCons/SConstruct") + SConscript("BuildTools/SCons/SConstruct") diff --git a/Swiften/JID/JID.h b/Swiften/JID/JID.h index 876daa0..756db98 100644 --- a/Swiften/JID/JID.h +++ b/Swiften/JID/JID.h @@ -7,7 +7,8 @@ #pragma once #include <string> -#include <iosfwd> +//#include <iosfwd> +#include <iostream> namespace Swift { /** diff --git a/Swiften/SConscript b/Swiften/SConscript index d98c9b7..6d38717 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -201,15 +201,16 @@ if env["SCONS_STAGE"] == "build" : "LinkLocal", "StreamManagement", "Component", - "Config", "AdHoc" ]) - SConscript(test_only = True, dirs = [ + if env["build_examples"] : + SConscript(dirs = [ + "Config", + "Examples" + ]) + env.SConscript(test_only = True, dirs = [ "QA", ]) - SConscript(dirs = [ - "Examples" - ]) myenv = swiften_env.Clone() if myenv["PLATFORM"] != "darwin" and myenv["PLATFORM"] != "win32" and myenv.get("HAVE_GCONF", 0) : |