Bug 70447 - [GTK] Streamline wk1 documentation build
Summary: [GTK] Streamline wk1 documentation build
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Gustavo Noronha (kov)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-10-19 15:52 PDT by Gustavo Noronha (kov)
Modified: 2011-10-19 17:37 PDT (History)
0 users

See Also:

Attachments
Patch (15.45 KB, patch)
2011-10-19 15:58 PDT, Gustavo Noronha (kov) 		no flags Details | Formatted Diff | Diff
Patch I'll land (15.48 KB, patch)
2011-10-19 17:32 PDT, Gustavo Noronha (kov) 		no flags Details | Formatted Diff | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Gustavo Noronha (kov) 2011-10-19 15:52:10 PDT 
[GTK] Streamline wk1 documentation build
Comment 1 Gustavo Noronha (kov) 2011-10-19 15:58:55 PDT 
Created attachment 111686 [details]
Patch
Comment 2 Martin Robinson 2011-10-19 16:29:36 PDT 
Comment on attachment 111686 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=111686&action=review

This looks good to me. Would it make sense to just include the contents of gtk-doc.make in the GNUmakefile.am?

> Source/WebKit/gtk/gtk-doc.make:5
> +####################################
> +# Everything below here is generic #
> +####################################

I think this comment is inaccurate now?

> Source/WebKit/gtk/gtk-doc.make:15
> +if GTK_DOC_USE_LIBTOOL
> +GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
> +GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
> +GTKDOC_RUN = $(LIBTOOL) --mode=execute
> +else
> +GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
> +GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
> +GTKDOC_RUN =
> +endif

Can we remove this check?

> Source/WebKit/gtk/gtk-doc.make:32
> +EXTRA_DIST += 				\

This aberration from the norm tickles my obsessive side. :)

> autogen.sh:16
> -gtkdocize --copy > /dev/null 2>&1 || echo "Warning: not running gtk-docize."
> +# We do not call gtkdocize becase we use a custom version of the
> +# gtk-doc.make include

I think you can just omit this. We should let our newfound awesomeness stand alone.
Comment 3 Gustavo Noronha (kov) 2011-10-19 16:40:21 PDT 
(In reply to comment #2)
> This looks good to me. Would it make sense to just include the contents of gtk-doc.make in the GNUmakefile.am?
 
I thought of doing it that way but then realized we might want to adopt this for wk2. I prefer to leave it as it is right now, and we can move the contents into the GNUmakefile.am if we decided we really don't want wk2 docs to be buildable through the build system. I'll apply the other comments =)
Comment 4 Gustavo Noronha (kov) 2011-10-19 17:32:42 PDT 
Created attachment 111701 [details]
Patch I'll land
Comment 5 Gustavo Noronha (kov) 2011-10-19 17:37:09 PDT 
Committed r97901: <http://trac.webkit.org/changeset/97901>