Bug 556783 - namespace/prefix rework

svn path=/trunk/; revision=746

1 files changed, 7 insertions, 4 deletions

diff --git a/tools/g-ir-scanner b/tools/g-ir-scanner
index 8c284f94..f1ad7eb2 100755
--- a/tools/g-ir-scanner
+++ b/tools/g-ir-scanner
@@ -62,13 +62,13 @@ def _get_option_parser():
                       help="directories to search for libraries")
     parser.add_option("-n", "--namespace",
                       action="store", dest="namespace_name",
-                      help="name of namespace for this unit")
+                      help="name of namespace for this unit, also used as --strip-prefix default")
     parser.add_option("", "--nsversion",
                       action="store", dest="namespace_version",
                       help="version of namespace for this unit")
     parser.add_option("", "--strip-prefix",
-                      action="store", dest="strip_prefix", default="",
-                      help="prefix to strip from functions, like g_")
+                      action="store", dest="strip_prefix", default=None,
+                      help="remove this prefix from objects and functions")
     parser.add_option("-o", "--output",
                       action="store", dest="output",
                       help="output to writeout, defaults to stdout")
@@ -252,7 +252,10 @@ def main(args):
 
     # Transform the C symbols into AST nodes
     transformer = Transformer(ss, options.namespace_name, options.namespace_version)
-    transformer.set_strip_prefix(options.strip_prefix)
+    if options.strip_prefix:
+        transformer.set_strip_prefix(options.strip_prefix)
+    else:
+        transformer.set_strip_prefix(options.namespace_name)
     transformer.set_include_paths(options.include_paths)
     shown_include_warning = False
     for include in options.includes: