gtk-doc r581 - trunk

[stefkost svn gnome org]

Author: stefkost
Date: Mon Jun 16 14:21:57 2008
New Revision: 581
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=581&view=rev

Log:
	* gtkdoc-mktmpl.in:
	  Don't reuse file var, fixes warning context.
	* gtkdoc-scan.in:
	  Also accept *.hh as headers suffix.



Modified:
   trunk/ChangeLog
   trunk/gtkdoc-mktmpl.in
   trunk/gtkdoc-scan.in

Modified: trunk/gtkdoc-mktmpl.in
==============================================================================
--- trunk/gtkdoc-mktmpl.in	(original)
+++ trunk/gtkdoc-mktmpl.in	Mon Jun 16 14:21:57 2008
@@ -225,6 +225,7 @@
 	    || die "Can't create directory: $TMPL_DIR";
     }
 
+    my $filename = "";
     my $title = "";
     my $subsection = "";
     my $output;
@@ -245,21 +246,21 @@
 #	    print "Section: $title\n";
 
 	} elsif (m/^<FILE>(.*)<\/FILE>/) {
-	    $file = $1;
+	    $filename = $1;
 
 	} elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
 	    next;
 
 	} elsif (m/^<\/SECTION>/) {
 	    if ($title eq "") {
-		$title = $file;
+		$title = $filename;
 	    }
 #	    print "End of section: $title\n";
 
-	    $file =~ s/\s/_/g;
-	    $file .= ".sgml";
+	    $filename =~ s/\s/_/g;
+	    $filename .= ".sgml";
 
-	    if (&OutputTemplateFile ($file, $title, \$output)) {
+	    if (&OutputTemplateFile ($filename, $title, \$output)) {
 	      $changed = 1;
 	    }
 

Modified: trunk/gtkdoc-scan.in
==============================================================================
--- trunk/gtkdoc-scan.in	(original)
+++ trunk/gtkdoc-scan.in	Mon Jun 16 14:21:57 2008
@@ -251,7 +251,7 @@
 
     my $deprecated = "";
 
-    if ($input_file =~ m/^.*[\/\\](.*)\.h$/) {
+    if ($input_file =~ m/^.*[\/\\](.*)\.h+$/) {
 	$file_basename = $1;
     } else {
 	print "WARNING: Can't find basename of file $input_file\n";
@@ -265,7 +265,7 @@
     }
 
     if (! -f $input_file) {
-	print "File doesn't exist: $input_file\n";
+	print "WARNING: File doesn't exist: $input_file\n";
 	return;
     }