Changeset 229591 in webkit


Ignore:
Timestamp:
Mar 13, 2018 4:18:41 PM (6 years ago)
Author:
timothy_horton@apple.com
Message:

Add and adopt WK_ALTERNATE_FRAMEWORKS_DIR in WTF and bmalloc
​https://bugs.webkit.org/show_bug.cgi?id=183576
<rdar://problem/38396766>

Reviewed by Dan Bernstein.

  • Configurations/Base.xcconfig:

Source/bmalloc:

  • Configurations/bmalloc.xcconfig:
  • Configurations/mbmalloc.xcconfig:

Source/WTF:

  • Configurations/CopyWTFHeaders.xcconfig:
  • Configurations/WTF.xcconfig:
  • Configurations/mbmalloc.xcconfig:
Location:
trunk/Source
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r229584 r229591  
     12018-03-13  Tim Horton  <timothy_horton@apple.com>
     2
     3        Add and adopt WK_ALTERNATE_FRAMEWORKS_DIR in WTF and bmalloc
     4        https://bugs.webkit.org/show_bug.cgi?id=183576
     5        <rdar://problem/38396766>
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * Configurations/Base.xcconfig:
     10        * Configurations/CopyWTFHeaders.xcconfig:
     11        * Configurations/WTF.xcconfig:
     12        * Configurations/mbmalloc.xcconfig:
     13
    1142018-03-13  Michael Catanzaro  <mcatanzaro@igalia.com>
    215

  • trunk/Source/WTF/Configurations/Base.xcconfig

    r227215 r229591  
    9191PREBINDING = NO;
    9292WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
    93 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include $(HEADER_SEARCH_PATHS);
     93HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(DSTROOT)$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(inherited);
     94SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(inherited);
     95LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/lib $(inherited);
    9496
    9597TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    … …  
    127129OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
    128130OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
     131
     132WK_EMPTY_ = YES;
     133WK_NOT_ = YES;
     134WK_NOT_YES = NO;
     135
     136WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
     137
     138WTF_INSTALL_PATH_PREFIX = $(WTF_INSTALL_PATH_PREFIX_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
     139WTF_INSTALL_PATH_PREFIX_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;

  • trunk/Source/WTF/Configurations/CopyWTFHeaders.xcconfig

    r219155 r229591  
    2222// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323
    24 PRIVATE_HEADERS_FOLDER_PATH = usr/local/include/wtf;
    25 ICU_PRIVATE_HEADERS_FOLDER_PATH = usr/local/include;
     24PRIVATE_HEADERS_FOLDER_PATH = $(WTF_INSTALL_PATH_PREFIX)usr/local/include/wtf;
     25ICU_PRIVATE_HEADERS_FOLDER_PATH = $(WTF_INSTALL_PATH_PREFIX)usr/local/include;
    2626INSTALLHDRS_SCRIPT_PHASE = YES;

  • trunk/Source/WTF/Configurations/WTF.xcconfig

    r219537 r229591  
    2323
    2424EXECUTABLE_PREFIX = lib;
    25 INSTALL_PATH = /usr/local/lib;
     25INSTALL_PATH = $(WTF_INSTALL_PATH_PREFIX)/usr/local/lib;
    2626PRODUCT_NAME = WTF;
    2727

  • trunk/Source/WTF/Configurations/mbmalloc.xcconfig

    r190837 r229591  
    2323
    2424EXECUTABLE_PREFIX = lib;
    25 INSTALL_PATH = /usr/local/lib;
     25INSTALL_PATH = $(WTF_INSTALL_PATH_PREFIX)/usr/local/lib;
    2626PRODUCT_NAME = mbmalloc;
    2727

  • trunk/Source/bmalloc/ChangeLog

    r229516 r229591  
     12018-03-13  Tim Horton  <timothy_horton@apple.com>
     2
     3        Add and adopt WK_ALTERNATE_FRAMEWORKS_DIR in WTF and bmalloc
     4        https://bugs.webkit.org/show_bug.cgi?id=183576
     5        <rdar://problem/38396766>
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * Configurations/Base.xcconfig:
     10        * Configurations/bmalloc.xcconfig:
     11        * Configurations/mbmalloc.xcconfig:
     12
    1132018-03-10  Filip Pizlo  <fpizlo@apple.com>
    214

  • trunk/Source/bmalloc/Configurations/Base.xcconfig

    r227215 r229591  
    123123OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
    124124OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
     125
     126WK_EMPTY_ = YES;
     127WK_NOT_ = YES;
     128WK_NOT_YES = NO;
     129
     130WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
     131
     132BMALLOC_INSTALL_PATH_PREFIX = $(BMALLOC_INSTALL_PATH_PREFIX_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
     133BMALLOC_INSTALL_PATH_PREFIX_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;

  • trunk/Source/bmalloc/Configurations/bmalloc.xcconfig

    r190837 r229591  
    2323
    2424EXECUTABLE_PREFIX = lib;
    25 INSTALL_PATH = /usr/local/lib;
    26 PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/bmalloc;
     25INSTALL_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)/usr/local/lib;
     26PRIVATE_HEADERS_FOLDER_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)/usr/local/include/bmalloc;
    2727PRODUCT_NAME = bmalloc;
    2828

  • trunk/Source/bmalloc/Configurations/mbmalloc.xcconfig

    r190837 r229591  
    2323
    2424EXECUTABLE_PREFIX = lib;
    25 INSTALL_PATH = /usr/local/lib;
     25INSTALL_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)/usr/local/lib;
    2626PRODUCT_NAME = mbmalloc;
    2727
Note: See TracChangeset for help on using the changeset viewer.