gtk-doc r559 - trunk

[stefkost svn gnome org]

Author: stefkost
Date: Tue Apr 22 15:36:40 2008
New Revision: 559
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=559&view=rev

Log:
	* HACKING:
	  We need to update the webpage.
	* TODO:
	* configure.in:
	  Planning.
	* gtkdoc-mkdb.in:
	  Hopefully now unbreak the docbuild, if one has template but not uses
	  them.



Modified:
   trunk/ChangeLog
   trunk/HACKING
   trunk/TODO
   trunk/configure.in
   trunk/gtkdoc-mkdb.in

Modified: trunk/HACKING
==============================================================================
--- trunk/HACKING	(original)
+++ trunk/HACKING	Tue Apr 22 15:36:40 2008
@@ -32,6 +32,8 @@
   configure.in
   help/manual/C/gtk-doc-manual.xml
 
+update web-pages (gtk-web/gtk-doc)
+
 if we want a icon on the newsfeed, we should copy a icon like on
   http://ftp.acc.umu.se/pub/GNOME/sources/rhythmbox/rhythmbox.png
-
+  e.g. /usr/share/icons/hicolor/48x48/apps/devhelp.png

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Tue Apr 22 15:36:40 2008
@@ -18,4 +18,8 @@
 * there is a bunch of #print statements for tracing
   => add a sub Trace() to gtkdoc-common.pl
   => use @TRACE@ "..." and depending on configure flag
-     turn that into "print" or "#" (should be a function still and the function should support loglevels and sourcefile/line logs);
+     turn that into
+       [print __FILE__ . ":" . __LINE__ . ":" . ] or [#]
+     should be a function and the function should support loglevels and an
+       envar to enable/disable conditionally;
+       

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Apr 22 15:36:40 2008
@@ -139,7 +139,7 @@
   [enable_debug="no"])
 AC_MSG_RESULT($enable_debug)
 if test "$enable_debug" = "yes"; then
-  TRACE="print"
+  TRACE="print __FILE__ . \":\" . __LINE__ . \":\" ."
 else
   TRACE="#"
 fi

Modified: trunk/gtkdoc-mkdb.in
==============================================================================
--- trunk/gtkdoc-mkdb.in	(original)
+++ trunk/gtkdoc-mkdb.in	Tue Apr 22 15:36:40 2008
@@ -377,7 +377,6 @@
     my $implementations = "";
     my $prerequisites = "";
     my $derived = "";
-    my $have_tmpl = 0;
     my @file_objects = ();
 
     # merge the source docs, in case there are no templates
@@ -392,7 +391,6 @@
 	    $details = "";
 	    $num_symbols = 0;
 	    $in_section = 1;
-	    $have_tmpl = 0;
 	    @file_objects = ();
 
 	} elsif (m/^<SUBSECTION\s*(.*)>/i) {
@@ -413,7 +411,9 @@
             my $sym;
 
 	    $filename = $1;
-	    $have_tmpl = &ReadTemplateFile ("$TMPL_DIR/$filename", 1);
+	    if (&ReadTemplateFile ("$TMPL_DIR/$filename", 1)) {
+                &MergeSourceDocumentation;
+            }
 
 	} elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
 	    if ($in_section) {
@@ -607,9 +607,6 @@
 
 		$synopsis =~ s/^\n*//g;
 		$synopsis =~ s/\n+$/\n/g;
-		if ($have_tmpl) {
-		    &MergeSourceDocumentation;
-		}
 		my $file_changed = &OutputSGMLFile ($filename, $title, $section_id,
 						    $section_includes,
 						    \$synopsis, \$details,
@@ -3403,6 +3400,7 @@
     if (scalar %SymbolDocs) {
         @Symbols=keys (%SymbolDocs);
         #print "num existing entries: ".(scalar @Symbols)."\n";
+        #print "  ",$Symbols[0], " ",$Symbols[1],"\n";
     }
     else {
         # filter scanned declarations, with what we suppress from -sections.txt
@@ -3416,10 +3414,10 @@
         foreach $symbol (keys (%SourceSymbolDocs)) {
             $tmp{$symbol}=1;
         }
-        @Symbols = keys (%tmp);       
+        @Symbols = keys (%tmp);
         #print "num source entries: ".(scalar @Symbols)."\n";
     }
-    foreach $symbol (@Symbols) {        
+    foreach $symbol (@Symbols) {
         $AllSymbols{$symbol} = 1;
 
 	my $have_tmpl_docs = 0;
@@ -3434,13 +3432,11 @@
             #print "## [$tmpl_doc]\n";
 	}
 
-	#print "merging [$symbol]\n";
-
 	if (exists ($SourceSymbolDocs{$symbol})) {
 	    my $src_doc = $SourceSymbolDocs{$symbol};
 	    my $type = $DeclarationTypes {$symbol};
 
-            #print "... from source\n";
+            #print "merging [$symbol] from source\n";
 
 	    my $item = "Parameter";
             if (defined ($type)) {
@@ -3562,9 +3558,10 @@
 	} else {
 	    if ($have_tmpl_docs) {
 		$AllDocumentedSymbols{$symbol} = 1;
+		#print "merging [$symbol] from template\n";
             }
             else {
-                #print "... undocumented\n";
+		#print "[$symbol] undocumented\n";
             }
         }
 
@@ -3881,11 +3878,11 @@
     my ($docsfile, $skip_unused_params) = @_;
 
     my $template = "$docsfile.sgml";
-    #print "Reading $template\n";
     if (! -f $template) {
 	#print "File doesn't exist: $template\n";
 	return 0;
     }
+    #print "Reading $template\n";
 
     # start with empty hashes, we merge the source comment for each file
     # afterwards