Bug 16850 – merged autotools and derivedssources.make

• Status: RESOLVED
• Resolution: WONTFIX
• Component: WebKitGTK

[Jan Alonzo]

The attached patch reuses DerivedSources.make as well as enabling -fvisibility-hidden and -fvisibility-inlines-hidden. We can't do this without a symbols defs file so the patch merges JSC into libWebKitGtk for the mean time. 

Cheers

[Jan Alonzo]

Created attachment 18406 [details]
patch to reuse DerivedSources.make and enabling of -fvisibility flags

[Alp Toker]

(In reply to comment #1)
> Created an attachment (id=18406) [edit]
> patch to reuse DerivedSources.make and enabling of -fvisibility flags
> 

We need to backport our fixes to DerivedSources.make, replace perl/flex/bison commands with $(PERL) etc. and elminate the global vpath in DerivedSources.make first.

We should only look at changing the GNUmakefile.ams only after that's done I think, otherwise we'll re-introduce all the regressions we fixed like make -j support.

[Jan Alonzo]

(In reply to comment #2)
> and elminate the global vpath in erivedSources.make first.

Hi alp! what do you mean by eliminating the global vpath?

Thanks

[Alp Toker]

(In reply to comment #3)
> (In reply to comment #2)
> > and elminate the global vpath in erivedSources.make first.
> 
> Hi alp! what do you mean by eliminating the global vpath?
> 
> Thanks
> 

WebCore/DerivedSources.make has:

VPATH = \
    $(WebCore) \
    $(WebCore)/bindings/js \
    $(WebCore)/bindings/objc \
    $(WebCore)/css \
    $(WebCore)/dom \
    $(WebCore)/html \
    $(WebCore)/page \
    $(WebCore)/storage \
    $(WebCore)/xml \
    $(WebCore)/svg

This modifies the global make search path -- not good.

Somewhat better:

vpath %.idl = \
    $(WebCore) \
    $(WebCore)/bindings/js \
    $(WebCore)/bindings/objc \
    $(WebCore)/css \
    $(WebCore)/dom \
    $(WebCore)/html \
    $(WebCore)/page \
    $(WebCore)/storage \
    $(WebCore)/svg \
    $(WebCore)/xml

[Jan Alonzo]

Created attachment 18411 [details]
DerivedSources.make improvements and backported fixes

This patch backports the fixes made in gtk/autotools for WebCore/DerivedSources.make as well as improvements to the JavaScriptCore/DerivedSources.make

[Jan Alonzo]

Created attachment 18412 [details]
Updated patch to reuse DerivedSources.make

Updated patch to reuse DerivedSources.make, merge libJavaScriptCore and libWebKitGtk, and usage of -fvisibility. This patch also removes changes to DerivedSources.make (see previous patch #18411).

[Alp Toker]

Comment on attachment 18411 [details]
DerivedSources.make improvements and backported fixes


> 
> # DOCTYPE strings
> 
>-DocTypeStrings.cpp : html/DocTypeStrings.gperf
>-	gperf -CEot -L ANSI-C -k "*" -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards $< > $@
>+DocTypeStrings.cpp : $(WebCore)/html/DocTypeStrings.gperf
>+	$(GPERF) -CEot -L ANSI-C -k "*" -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards \
>+	$(WebCore)/html/DocTypeStrings.gperf > $@

Why not just:
DocTypeStrings.cpp : $(WebCore)/html/DocTypeStrings.gperf
	$(GPERF) -CEot -L ANSI-C -k "*" -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards $< > $@

> 
> # HTML entity names
> 
>-HTMLEntityNames.c : html/HTMLEntityNames.gperf
>-	gperf -a -L ANSI-C -C -G -c -o -t -k '*' -N findEntity -D -s 2 $< > $@
>+HTMLEntityNames.c : $(WebCore)/html/HTMLEntityNames.gperf
>+	$(GPERF) -a -L ANSI-C -C -G -c -o -t -k '*' -N findEntity -D -s 2 \
>+	$(WebCore)/html/HTMLEntityNames.gperf > $@

Ditto.

> 
> # color names
> 
>-ColorData.c : platform/ColorData.gperf
>-	gperf -CDEot -L ANSI-C -k '*' -N findColor -D -s 2 $< > $@
>+ColorData.c : $(WebCore)/platform/ColorData.gperf
>+	$(GPERF) -CDEot -L ANSI-C -k '*' -N findColor -D -s 2 \
>+	$(WebCore)/platform/ColorData.gperf > $@

Ditto.

[Jan Alonzo]

(In reply to comment #7)
> (From update of attachment 18411 [details] [edit])

Alp, you're right. I got confused with the changes when backporting it to DerivedSources.make. Feel free to make the change.

Cheers.

[Alp Toker]

Comment on attachment 18411 [details]
DerivedSources.make improvements and backported fixes

I suspect the $(WebCore) changes will not actually be necessary when we include the DerivedSources.make files (but can't be sure till we try to do it). The other changes look good, except for my previous comments.

[Alp Toker]

Comment on attachment 18412 [details]
Updated patch to reuse DerivedSources.make

As discussed on IRC this isn't the right way to do things. I've enabled -fvisibility=hidden and -fvisibility-inlines-hidden using libtool modules in r29445.

We should aim to include DerivedSources.make, not invoke the make application on it, as this would lose any benefits of integrating the two.

[Alp Toker]

Comment on attachment 18411 [details]
DerivedSources.make improvements and backported fixes

Clearing request flag since there are issues present and the patch doesn't apply any more.

Jan, I'll take care of splitting this up and getting things fixed. Thanks for the initial patch.

[Jan Alonzo]

Renaming patch summary and adding Gtk keyword

[Martin Robinson]

It seems this work is long dead. If anyone wishes to resurrect it, please re-open the bug.