--- a/bindings/python/ns3modulegen-modular.py	Fri Mar 11 15:55:38 2011 +0000
+++ b/bindings/python/ns3modulegen-modular.py	Sat Mar 12 18:34:30 2011 +0000
@@ -3,8 +3,14 @@
 import os
 import pybindgen.settings
 from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
+from pybindgen.module import MultiSectionFactory
 import ns3modulegen_core_customizations
 
+
+
+
+pybindgen.settings.wrapper_registry = pybindgen.settings.StdMapWrapperRegistry
+
 class ErrorHandler(pybindgen.settings.ErrorHandler):
     def handle_error(self, wrapper, exception, traceback_):
         warnings.warn("exception %r in wrapper %s" % (exception, wrapper))
@@ -14,37 +20,73 @@
 
 
 
+class MyMultiSectionFactory(MultiSectionFactory):
+    def __init__(self, main_file_name):
+        super(MyMultiSectionFactory, self).__init__()
+        self.main_file_name = main_file_name
+        self.main_sink = FileCodeSink(open(main_file_name, "wt"))
+        self.header_name = "ns3module.h"
+        header_file_name = os.path.join(os.path.dirname(self.main_file_name), self.header_name)
+        #print >> sys.stderr, ">>>>>>>>>>>>>>>>>", header_file_name, main_file_name
+        self.header_sink = FileCodeSink(open(header_file_name, "wt"))
+    def get_section_code_sink(self, section_name):
+        return self.main_sink
+    def get_main_code_sink(self):
+        return self.main_sink
+    def get_common_header_code_sink(self):
+        return self.header_sink
+    def get_common_header_include(self):
+        return '"%s"' % self.header_name
+    def close(self):
+        self.header_sink.file.close()
+        self.main_sink.file.close()
+
+
+
 def main(argv):
-    assert len(argv) == 3
-    module_abs_src_path, target = argv[1], argv[2]
+    module_abs_src_path, target, output_cc_file_name = argv[1:]
     module_name = os.path.basename(module_abs_src_path)
+    out = MyMultiSectionFactory(output_cc_file_name)
 
     sys.path.insert(0, os.path.join(module_abs_src_path, "bindings"))
     try:
         module_apidefs = __import__("modulegen__%s" % target)
         del sys.modules["modulegen__%s" % target]
         try:
-            module_customization = __import__("modulegen_local")
-            del sys.modules["modulegen_local"]
+            module_customization = __import__("modulegen_customizations")
+            del sys.modules["modulegen_customizations"]
         except ImportError:
-            module_customization = None
+            module_customization = object()
     finally:
         sys.path.pop(0)
     
-    out = FileCodeSink(sys.stdout)
     root_module = module_apidefs.module_init()
     root_module.add_include('"ns3/%s-module.h"' % module_name)
+
+    # -----------
     module_apidefs.register_types(root_module)
 
+    if hasattr(module_customization, 'post_register_types'):
+        module_customization.post_register_types(root_module)
+
+    # -----------
     module_apidefs.register_methods(root_module)
-    module_apidefs.register_functions(root_module)
-    
+
+    if hasattr(module_customization, 'post_register_methods'):
+        module_customization.post_register_methods(root_module)
+
     ns3modulegen_core_customizations.Object_customizations(root_module)
     ns3modulegen_core_customizations.Attribute_customizations(root_module)
 
-    if module_customization is not None:
-        module_customization.customize(root_module)
 
+    # -----------
+    module_apidefs.register_functions(root_module)
+    
+    if hasattr(module_customization, 'post_register_functions'):
+        module_customization.post_register_functions(root_module)
+
+
+    # -----------
     root_module.generate(out)
 
 if __name__ == '__main__':