Bug 183576 – Add and adopt WK_ALTERNATE_FRAMEWORKS_DIR in WTF and bmalloc

• Component: New Bugs
• Status: RESOLVED FIXED

[Tim Horton]

Add and adopt WK_ALTERNATE_FRAMEWORKS_DIR in WTF

[Radar WebKit Bug Importer]

<rdar://problem/38396766>

[Tim Horton]

Created attachment 335664 [details]
Patch

[Tim Horton]

This isn’t quite sufficient.

[Lucas Forschler]

WKBI was failing to import smart quotes u2019. Attempted fix, let's see if this comment goes through now.

[Tim Horton]

Created attachment 335709 [details]
Patch

Comment on attachment 335709 [details]
Patch

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

> Source/WTF/Configurations/Base.xcconfig:137
> +WTF_INSTALL_PATH_PREFIX = $(WTF_INSTALL_PATH_PREFIX_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
> +WTF_INSTALL_PATH_PREFIX_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;

Is this going to be defined differently in other projects in the stack? If not, then maybe this can be WK_INSTALL_PATH_PREFIX?

[Tim Horton]

(In reply to mitz from comment #6)
> Comment on attachment 335709 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=335709&action=review
> 
> > Source/WTF/Configurations/Base.xcconfig:137
> > +WTF_INSTALL_PATH_PREFIX = $(WTF_INSTALL_PATH_PREFIX_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
> > +WTF_INSTALL_PATH_PREFIX_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
> 
> Is this going to be defined differently in other projects in the stack? If
> not, then maybe this can be WK_INSTALL_PATH_PREFIX?

The other projects will probably do some dance with WK_OVERRIDE_FRAMEWORKS_DIR instead of this.

Comment on attachment 335709 [details]
Patch

I think this is wrong for bmalloc reasons which we discussed in person.

[Tim Horton]

Created attachment 335733 [details]
Patch

Comment on attachment 335733 [details]
Patch

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

> Source/WTF/Configurations/Base.xcconfig:93
> +HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(DSTROOT)/$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(HEADER_SEARCH_PATHS);

I think you can count on WTF_INSTALL_PATH_PREFIX to begin with a / if it’s nonempty. And you may change $(HEADER_SEARCH_PATHS) to $(inherited)!

> Source/WTF/Configurations/Base.xcconfig:94
> +SYSTEM_HEADER_SEARCH_PATHS = $(inherited) $(SDK_DIR)/$(WTF_INSTALL_PATH_PREFIX)/usr/local/include;

Don’t we want to search in the alternate location first? Things may exist in both locations. Ditto about the leading /.

> Source/WTF/Configurations/Base.xcconfig:95
> +LIBRARY_SEARCH_PATHS = $(inherited) $(SDK_DIR)/$(WTF_INSTALL_PATH_PREFIX)/usr/local/lib;

Ditto on both counts.

[Tim Horton]

Created attachment 335740 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 335740 [details]
Patch

Clearing flags on attachment: 335740

Committed r229591: <https://trac.webkit.org/changeset/229591>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.