Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-04-22 20:31:22 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-04-22 20:31:22 (GMT) |
| commit | 65264ae8017d5a3cf1432078cd4eaa4257645662 (patch) | |
| tree | 46836deb4c17a0ec756236d59699f921abd5b5bb /BuildTools | |
| parent | 618bfa7276fe46f308a7ab8f003c785bf863c7e8 (diff) | |
| download | swift-65264ae8017d5a3cf1432078cd4eaa4257645662.zip swift-65264ae8017d5a3cf1432078cd4eaa4257645662.tar.bz2 | |
Don't build Slimber if no zeroconf is available.
Diffstat (limited to 'BuildTools')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 0cfa211..1735073 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -374,10 +374,6 @@ if env.Dir("#/.git").exists() : ################################################################################ # Project files -# FIXME: We need to explicitly list the order of libraries here, because of -# the exported FLAGS. We should put FLAGS in separate SConscript files, and -# read these in before anything else, such that we don't need to manually -# list modules in order. ################################################################################ # Modules @@ -398,6 +394,7 @@ for dir in os.listdir(Dir("#/3rdParty").abspath) : modules.append("3rdParty/" + dir) # Flags +env["PROJECTS"] = [m for m in modules if m not in ["Documentation", "QA", "SwifTools"] and not m.startswith("3rdParty")] for stage in ["flags", "build", "test"] : env["SCONS_STAGE"] = stage SConscript(dirs = map(lambda x : "#/" + x, modules)) @@ -417,6 +414,8 @@ if env.get("HAVE_EXPAT", 0): parsers.append("Expat") if env.get("EXPAT_BUNDLED", False) : parsers.append("(Bundled)") +print " Projects: " + ' '.join(env["PROJECTS"]) +print "" print " XML Parsers: " + ' '.join(parsers) print " TLS Support: " + ("OpenSSL" if env.get("HAVE_OPENSSL",0) else "Disabled") |