Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-04-30 16:51:00 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-04-30 16:51:00 (GMT) |
| commit | 1bbf5a4f431ce3aab4c851c71438f3d2e468a866 (patch) | |
| tree | 0c3c1b3a7357add1d0ba965e9be981258390290f /Swiften | |
| parent | d0c3cf701102d08afd253f515df74f33ffeed3cc (diff) | |
| parent | 0fe3d2b3f37bcd2fa2cf66979e236e993823390f (diff) | |
| download | swift-contrib-1bbf5a4f431ce3aab4c851c71438f3d2e468a866.zip swift-contrib-1bbf5a4f431ce3aab4c851c71438f3d2e468a866.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Filter out some extra headers in install dir.
Split off libswiften package.
Only install the necessary files in the Debian package.
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/SConscript | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript index c8508d3..c45da6e 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -360,27 +360,31 @@ if env["SCONS_STAGE"] == "build" : swiften_header = "#pragma once\n" swiften_includes = [] top_path = env.Dir("..").abspath - public_dirs = ["Avatars", "Base", "Chat", "Client", "Component", "Disco", "Entity", "Elements", "JID", "MUC", "Network", "Parser", "Presence", "Queries", "Roster", "Serializer", "StringCodecs", "TLS", "VCards"] - for public_dir in public_dirs : - for root, dirs, files in os.walk(env.Dir(public_dir).abspath) : - if root.endswith("UnitTest") : + for root, dirs, files in os.walk(env.Dir(".").abspath) : + if root.endswith("UnitTest") : + continue + for file in files : + if not file.endswith(".h") : continue - for file in files : - if not file.endswith(".h") : - continue - include = os.path.relpath(os.path.join(root, file), top_path) - swiften_includes.append(include) - if root.endswith("OpenSSL") : - continue - if file.startswith("CAres") or file.startswith("LibXML") or file.startswith("Expat") or file.startswith("foreach") or file.startswith("Log.h") or file.startswith("format.h") : - continue - if file.find("ProxyProvider") != -1 : - continue - swiften_header += "#include <" + include + ">\n" - swiften_includes.append(include) - for file in ["EventLoop/SimpleEventLoop.h"] : - swiften_header += "#include <Swiften/" + file + ">\n" - swiften_includes.append("Swiften/" + file) + include = os.path.relpath(os.path.join(root, file), top_path) + swiften_includes.append(include) + # Private modules + if root.endswith("Config") or root.endswith("Compress") : + continue + + # Library-specfifc private modules + if root.endswith("OpenSSL") or root.endswith("Cocoa") or root.endswith("Qt") or root.endswith("IDN") or root.endswith("Avahi") or root.endswith("Bonjour") : + continue + + # Library-specific files + if file.startswith("CAres") or file.startswith("LibXML") or file.startswith("Expat") : + continue + + # Specific headers we don't want to globally include + if file == "Swiften.h" or file == "foreach.h" or file == "Log.h" or file == "format.h" : + continue + swiften_header += "#include <" + include + ">\n" + swiften_includes.append(include) swiften_env.WriteVal("Swiften.h", swiften_env.Value(swiften_header)) swiften_includes.append("Swiften/Swiften.h") |