Bug 118872 – Mac port should run bison as part of ANGLE build process

• Status: RESOLVED
• Resolution: FIXED
• Component: ANGLE

[Alex Christensen]

Updating ANGLE is a pain because we have to run an older version of bison before we commit changes to prevent GPLv3 files from being included in WebKit.  If this were part of the build process, we wouldn't have to worry about this step.

My DerivedSources.make currently runs bison twice, but it works.  I'm not a make expert, which is why my DerivedSources.make looks so simple.  Simplicity is a virtue.

[Alex Christensen]

Created attachment 207033 [details]
Patch

[Alex Christensen]

Created attachment 207035 [details]
Patch

[EFL EWS Bot]

Comment on attachment 207035 [details]
Patch

Attachment 207035 [details] did not pass efl-ews (efl):
Output: http://webkit-queues.appspot.com/results/1106706

[EFL EWS Bot]

Comment on attachment 207035 [details]
Patch

Attachment 207035 [details] did not pass efl-wk2-ews (efl-wk2):
Output: http://webkit-queues.appspot.com/results/1099687

[Alex Christensen]

Created attachment 207036 [details]
Patch

[Alex Christensen]

It looks like efl is not generating these files as part of the build process, either.  I don't think anybody (besides Mac after this patch) is generating ExpressionParser.cpp or Tokenizer.cpp.

[Mark Rowe (bdash)]

There's a ton of duplication in that Makefile. A lot of it could be removed if you transformed it to something like so:

SEARCH_PATH = $(ANGLE)/src/compiler $(ANGLE)/src/compiler/preprocessor

vpath %.l $(SEARCH_PATH)
vpath %.y $(SEARCH_PATH)

FLEX = flex --noline --nounistd
BISON = bison --no-lines --skeleton=yacc.c

all : glslang_lex.cpp glslang_tab.h glslang_tab.cpp ExpressionParser.cpp Tokenizer.cpp

glslang_tab%h glslang_tab%cpp : glslang.y
	$(eval OUTPUT = $(basename $@))
	$(BISON) --defines=$(OUTPUT).h --output=$(OUTPUT).cpp $<

ExpressionParser.cpp : ExpressionParser.y
	$(BISON) --output=$@ $<

glslang_lex.cpp : glslang.l
	$(FLEX) --outfile=$@ $<

Tokenizer.cpp : Tokenizer.l
	$(FLEX) --outfile=$@ $<


Most of the remaining duplication only exists because of the strange naming conventions of the files in question, but I'm guessing that updating those will cause more hassle than it's worth.


The makefile also needs a license header.

[Mark Rowe (bdash)]

Comment on attachment 207036 [details]
Patch

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

Marking as r- based on feedback above.

> Source/ThirdParty/ANGLE/ChangeLog:4
> +        ANGLE has 5 files that are generated.  These should generated as part of the build process to make updating easier.
> +        https://bugs.webkit.org/show_bug.cgi?id=118872

The first line here could be more succinct. Something like "Generate derived files in ANGLE at build time rather than when updating from upstream."

[Alex Christensen]

Created attachment 207139 [details]
Patch

[Alex Christensen]

Created attachment 207140 [details]
Patch

[Mark Rowe (bdash)]

Comment on attachment 207140 [details]
Patch

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

r=me with the two minor issues.

> Source/ThirdParty/ANGLE/ChangeLog:8
> +        * ANGLE.xcodeproj/project.pbxproj: Made Derived Sources target which calls DerivedSources.make, moved generated files into Derived Sources group.

It'd be good to wrap this line somewhere so it's not dramatically longer than the rest of the lines in this file.

> Source/ThirdParty/ANGLE/DerivedSources.make:15
> +#     documentation and/or other materials provided with the distribution.
> +# 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
> +#     its contributors may be used to endorse or promote products derived
> +#     from this software without specific prior written permission.
> +#

This is an old version of an old license we used to use. Take a look at Source/WebCore/LICENSE-APPLE for the current license.

[Alex Christensen]

Created attachment 207146 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 207146 [details]
Patch

Clearing flags on attachment: 207146

Committed r152929: <http://trac.webkit.org/changeset/152929>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Dean Jackson]

Rolled out in https://trac.webkit.org/r152946

[Alex Christensen]

Created attachment 207359 [details]
Patch

[Alex Christensen]

r153101