Summary: | Lessen the reliance on VPATH in WebCore/DerivedSources.make | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Keith Rollin <krollin> | ||||||
Component: | Tools / Tests | Assignee: | Keith Rollin <krollin> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | ap, darin, sam, webkit-bug-importer | ||||||
Priority: | P2 | Keywords: | InRadar | ||||||
Version: | WebKit Nightly Build | ||||||||
Hardware: | Unspecified | ||||||||
OS: | Unspecified | ||||||||
See Also: |
https://bugs.webkit.org/show_bug.cgi?id=218378 https://bugs.webkit.org/show_bug.cgi?id=218480 |
||||||||
Attachments: |
|
Description
Keith Rollin
2020-10-13 22:36:49 PDT
Created attachment 411303 [details]
Patch
Sam, I think that this fixes the root cause of troubles in bug 216831. (In reply to Alexey Proskuryakov from comment #3) > Sam, I think that this fixes the root cause of troubles in bug 216831. Awesome. Comment on attachment 411303 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=411303&action=review I wonder if we should use $@ and $< more often to avoid repeating path names. > Source/WebCore/DerivedSources.make:1299 > +# in ADDITIONAL_BINDING_IDLS_PATHS and the existance of the IDL file at each existence misspelled here > Source/WebCore/DerivedSources.make:1316 > + $(path)/usr/local/include/WebKitAdditions/$(idl))))) Was there an explicit version of this /usr/local/include path already present elsewhere in this makefile? > Source/WebCore/DerivedSources.make:1850 > -WebCore_BUILTINS_SOURCES_LIST : $(JavaScriptCore_SCRIPTS_DIR)/UpdateContents.py DerivedSources.make > +WebCore_BUILTINS_SOURCES_LIST : $(JavaScriptCore_SCRIPTS_DIR)/UpdateContents.py $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES) I don’t think this is right. I plan to eventually replace FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES with a different approach; a single generated file. But specifically here, is the dependency really on feature and platform defines? Or is there some other reason to rebuild any time we touch the makefile? > Source/WebCore/DerivedSources.make:1853 > -WebCore_BUILTINS_DEPENDENCIES_LIST : $(JavaScriptCore_SCRIPTS_DIR)/UpdateContents.py DerivedSources.make > +WebCore_BUILTINS_DEPENDENCIES_LIST : $(JavaScriptCore_SCRIPTS_DIR)/UpdateContents.py $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES) Ditto. (In reply to Darin Adler from comment #5) > Comment on attachment 411303 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=411303&action=review > > I wonder if we should use $@ and $< more often to avoid repeating path names. > > > Source/WebCore/DerivedSources.make:1299 > > +# in ADDITIONAL_BINDING_IDLS_PATHS and the existance of the IDL file at each > > existence misspelled here Thanks. I thought I spell-checked that comment, but I guess I was thinking of a different comment. > > Source/WebCore/DerivedSources.make:1316 > > + $(path)/usr/local/include/WebKitAdditions/$(idl))))) > > Was there an explicit version of this /usr/local/include path already > present elsewhere in this makefile?\ The use of that path was derived from the following line (being removed in this patch: vpath %.idl $(BUILT_PRODUCTS_DIR)/usr/local/include $(SDKROOT)/usr/local/include > > Source/WebCore/DerivedSources.make:1850 > > -WebCore_BUILTINS_SOURCES_LIST : $(JavaScriptCore_SCRIPTS_DIR)/UpdateContents.py DerivedSources.make > > +WebCore_BUILTINS_SOURCES_LIST : $(JavaScriptCore_SCRIPTS_DIR)/UpdateContents.py $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES) > > I don’t think this is right. I plan to eventually replace > FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES with a different approach; a single > generated file. But specifically here, is the dependency really on feature > and platform defines? Or is there some other reason to rebuild any time we > touch the makefile? My attention was drawn to those instances of DerivedSources.make when I had to prefix them with $(WebCore). Since it looked like they were just overlooked or otherwise missed in the face of $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES), I just made the mindless substitution, making it consistent with other places where $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES) was used. I'll revert since it sounds like that change was inappropriate. Created attachment 411510 [details]
Patch
Committed r268566: <https://trac.webkit.org/changeset/268566> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411510 [details]. |