gtk-doc r599 - trunk

[stefkost svn gnome org]

Author: stefkost
Date: Wed Sep 10 12:50:06 2008
New Revision: 599
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=599&view=rev

Log:
	* gtkdoc-mkdb.in:
	  Generate unique ids for properties, style and child properties.
	* gtk-doc.make:
	* gtk-doc.notmpl.make:
	* gtkdoc-scan.in:
	* gtkdoc-scangobj.in:
	  If we use libtool, run scanner under libtool to use uninstalled
	  libraries.



Modified:
   trunk/ChangeLog
   trunk/gtk-doc.make
   trunk/gtk-doc.notmpl.make
   trunk/gtkdoc-mkdb.in
   trunk/gtkdoc-scan.in
   trunk/gtkdoc-scangobj.in

Modified: trunk/gtk-doc.make
==============================================================================
--- trunk/gtk-doc.make	(original)
+++ trunk/gtk-doc.make	Wed Sep 10 12:50:06 2008
@@ -7,9 +7,11 @@
 if GTK_DOC_USE_LIBTOOL
 GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_RUN = $(LIBTOOL) --mode=execute
 else
 GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_RUN = sh -c
 endif
 
 # We set GPATH here; this gives us semantics for GNU make
@@ -61,7 +63,7 @@
 	cd $(srcdir) && \
 	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
 	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \

Modified: trunk/gtk-doc.notmpl.make
==============================================================================
--- trunk/gtk-doc.notmpl.make	(original)
+++ trunk/gtk-doc.notmpl.make	Wed Sep 10 12:50:06 2008
@@ -7,9 +7,11 @@
 if GTK_DOC_USE_LIBTOOL
 GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_RUN = $(LIBTOOL) --mode=execute
 else
 GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_RUN = 
 endif
 
 # We set GPATH here; this gives us semantics for GNU make
@@ -61,7 +63,7 @@
 	cd $(srcdir) && \
 	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
 	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \

Modified: trunk/gtkdoc-mkdb.in
==============================================================================
--- trunk/gtkdoc-mkdb.in	(original)
+++ trunk/gtkdoc-mkdb.in	Wed Sep 10 12:50:06 2008
@@ -2884,10 +2884,27 @@
 	if ($ArgObjects[$i] eq $object) {
 	    #print "Found arg: $ArgNames[$i]\n";
 	    my $name = $ArgNames[$i];
+	    my $flags = $ArgFlags[$i];
+	    my $flags_string = "";
+	    my $kind = "";
+	    my $id_sep = "";
+
+	    if ($flags =~ m/c/) {
+	        $kind = "child property";
+	        $id_sep = "c-";
+	    }
+	    elsif ($flags =~ m/s/) {
+	        $kind = "style property";
+	        $id_sep = "s-";
+	    }
+	    else {
+	        $kind = "property";
+	    }
+
 	    # Remember only one colon so we don't clash with signals.
 	    my $symbol = "${object}:${name}";
-	    # I've used two dashes here for the same reason.
-	    my $id = &CreateValidSGMLID ("$object--$name");
+	    # use two dashes and ev. an extra separator here for the same reason.
+	    my $id = &CreateValidSGMLID ("$object--$id_sep$name");
 
 	    my $type = $ArgTypes[$i];
 	    my $type_output;
@@ -2909,9 +2926,6 @@
 		$type_output = &MakeXRef ($type);
 	    }
 
-	    my $flags = $ArgFlags[$i];
-	    my $flags_string = "";
-
 	    if ($flags =~ m/r/) {
 		$flags_string = "Read";
 	    }
@@ -2944,17 +2958,6 @@
 
 	    my $pad1 = " " x (24 - length ($name));
 	    my $pad2 = " " x (20 - length ($type));
-	    my $kind = "";
-
-	    if ($flags =~ m/c/) {
-	        $kind = "child property";
-	    }
-	    elsif ($flags =~ m/s/) {
-	        $kind = "style property";
-	    }
-	    else {
-	        $kind = "property";
-	    }
 
  	    my $arg_synop = "  &quot;<link linkend=\"$id\">$name</link>&quot;$pad1 $type_output $pad2 : $flags_string\n";
 	    my $arg_desc = "<refsect2 id=\"$id\"><title>The <literal>&quot;$name&quot;</literal> $kind</title>\n";

Modified: trunk/gtkdoc-scan.in
==============================================================================
--- trunk/gtkdoc-scan.in	(original)
+++ trunk/gtkdoc-scan.in	Wed Sep 10 12:50:06 2008
@@ -360,7 +360,7 @@
 		$symbol = $5;
 		$decl = $';
 		$in_declaration = "user_function";
-		print "DEBUG: user function: $symbol\n";
+		#print "DEBUG: user function: $symbol\n";
 
 
 	    # ENUMS

Modified: trunk/gtkdoc-scangobj.in
==============================================================================
--- trunk/gtkdoc-scangobj.in	(original)
+++ trunk/gtkdoc-scangobj.in	Wed Sep 10 12:50:06 2008
@@ -1545,7 +1545,7 @@
 system($command) == 0 or die "Linking of scanner failed: $!\n";
 
 print "gtk-doc: Running scanner $MODULE-scan\n";
-system("sh -c ./$MODULE-scan") == 0 or die "Scan failed: $!\n";
+system("$ENV{RUN} ./$MODULE-scan") == 0 or die "Scan failed: $!\n";
 
 unlink "./$MODULE-scan.c", "./$MODULE-scan.o", "./$MODULE-scan.lo", "./$MODULE-scan";