glibmm r556 - in trunk: . build_shared tools/pm

[murrayc svn gnome org]

Author: murrayc
Date: Sat Feb  2 13:21:47 2008
New Revision: 556
URL: http://svn.gnome.org/viewvc/glibmm?rev=556&view=rev

Log:
2008-02-02  Murray Cumming  <murrayc murrayc com>

* build_shared/Makefile_gensrc.am_fragment: Use the local .pm files 
for gmmproc instead of installed ones. This was a regression that I 
introduced when I added gio to the build.
* tools/pm/DocsParser.pm: append_parameter_docs(): Ignore error 
parameters because they are almost always wrapped as exceptions.

Modified:
   trunk/ChangeLog
   trunk/build_shared/Makefile_gensrc.am_fragment
   trunk/tools/pm/DocsParser.pm

Modified: trunk/build_shared/Makefile_gensrc.am_fragment
==============================================================================
--- trunk/build_shared/Makefile_gensrc.am_fragment	(original)
+++ trunk/build_shared/Makefile_gensrc.am_fragment	Sat Feb  2 13:21:47 2008
@@ -37,7 +37,7 @@
 # We use our own m4 and pm files as well as the ones installed by gtkmm:
 # Our override m4 include seems to need to be before the default one.
 gmmproc_args	= -I $(tools_dir_m4) --defs $(srcdir)
-run_gmmproc	= $(PERL_PATH) $(gmmproc_path) $(gmmproc_args)
+run_gmmproc	= $(PERL_PATH) -I$(tools_dir_pm) $(gmmproc_path) $(gmmproc_args)
 
 
 gen_wrap_init_in   = $(top_srcdir)/tools/generate_wrap_init.pl.in

Modified: trunk/tools/pm/DocsParser.pm
==============================================================================
--- trunk/tools/pm/DocsParser.pm	(original)
+++ trunk/tools/pm/DocsParser.pm	Sat Feb  2 13:21:47 2008
@@ -291,14 +291,17 @@
 
   foreach my $param (@param_names)
   {
-    my $desc = $$param_descriptions->{$param};
-    
-    $param =~ s/([a-zA-Z0-9]*(_[a-zA-Z0-9]+)*)_?/$1/g;
-    DocsParser::convert_docs_to_cpp($obj_function, \$desc);
-    if(length($desc) > 0)
+    if ($param ne "error" ) #We wrap GErrors as exceptions, so ignore these.
     {
-      $desc  .= '.' unless($desc =~ /(?:^|\.)$/);
-      $$text .= "\n\ param ${param} \u${desc}";
+      my $desc = $$param_descriptions->{$param};
+    
+      $param =~ s/([a-zA-Z0-9]*(_[a-zA-Z0-9]+)*)_?/$1/g;
+      DocsParser::convert_docs_to_cpp($obj_function, \$desc);
+      if(length($desc) > 0)
+      {
+        $desc  .= '.' unless($desc =~ /(?:^|\.)$/);
+        $$text .= "\n\ param ${param} \u${desc}";
+      }
     }
   }
 }