Add and adopt WK_ALTERNATE_FRAMEWORKS_DIR in WTF and bmalloc
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Mar 2018 23:18:41 +0000 (23:18 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Mar 2018 23:18:41 +0000 (23:18 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229591 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WTF/ChangeLog
Source/WTF/Configurations/Base.xcconfig
Source/WTF/Configurations/CopyWTFHeaders.xcconfig
Source/WTF/Configurations/WTF.xcconfig
Source/WTF/Configurations/mbmalloc.xcconfig
Source/bmalloc/ChangeLog
Source/bmalloc/Configurations/Base.xcconfig
Source/bmalloc/Configurations/bmalloc.xcconfig
Source/bmalloc/Configurations/mbmalloc.xcconfig

index b2e6f3f..6fe35b9 100644 (file)
@@ -1,3 +1,16 @@
+2018-03-13  Tim Horton  <timothy_horton@apple.com>
+
+        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:
+        * Configurations/CopyWTFHeaders.xcconfig:
+        * Configurations/WTF.xcconfig:
+        * Configurations/mbmalloc.xcconfig:
+
 2018-03-13  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         Unreviewed, fix typo in a comment
index 1a1dfb6..b10e5d1 100644 (file)
@@ -90,7 +90,9 @@ GCC_WARN_UNUSED_FUNCTION = YES;
 GCC_WARN_UNUSED_VARIABLE = YES;
 PREBINDING = NO;
 WARNING_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;
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include $(HEADER_SEARCH_PATHS);
+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(DSTROOT)$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(inherited);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(inherited);
+LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/lib $(inherited);
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
@@ -126,3 +128,12 @@ SDKROOT = macosx.internal;
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+WTF_INSTALL_PATH_PREFIX = $(WTF_INSTALL_PATH_PREFIX_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WTF_INSTALL_PATH_PREFIX_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
index d4e18b9..80e68f6 100644 (file)
@@ -21,6 +21,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
-PRIVATE_HEADERS_FOLDER_PATH = usr/local/include/wtf;
-ICU_PRIVATE_HEADERS_FOLDER_PATH = usr/local/include;
+PRIVATE_HEADERS_FOLDER_PATH = $(WTF_INSTALL_PATH_PREFIX)usr/local/include/wtf;
+ICU_PRIVATE_HEADERS_FOLDER_PATH = $(WTF_INSTALL_PATH_PREFIX)usr/local/include;
 INSTALLHDRS_SCRIPT_PHASE = YES;
index e396a61..390a4ec 100644 (file)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 EXECUTABLE_PREFIX = lib;
-INSTALL_PATH = /usr/local/lib;
+INSTALL_PATH = $(WTF_INSTALL_PATH_PREFIX)/usr/local/lib;
 PRODUCT_NAME = WTF;
 
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
index 513686e..3b75fb5 100644 (file)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 EXECUTABLE_PREFIX = lib;
-INSTALL_PATH = /usr/local/lib;
+INSTALL_PATH = $(WTF_INSTALL_PATH_PREFIX)/usr/local/lib;
 PRODUCT_NAME = mbmalloc;
 
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
index 13cad61..2162d4f 100644 (file)
@@ -1,3 +1,15 @@
+2018-03-13  Tim Horton  <timothy_horton@apple.com>
+
+        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:
+        * Configurations/bmalloc.xcconfig:
+        * Configurations/mbmalloc.xcconfig:
+
 2018-03-10  Filip Pizlo  <fpizlo@apple.com>
 
         PerProcess<> should be safe by default
index 70bfedd..939c7d5 100644 (file)
@@ -122,3 +122,12 @@ SDKROOT = macosx.internal;
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+BMALLOC_INSTALL_PATH_PREFIX = $(BMALLOC_INSTALL_PATH_PREFIX_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+BMALLOC_INSTALL_PATH_PREFIX_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
index 747bcb6..c637273 100644 (file)
@@ -22,8 +22,8 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 EXECUTABLE_PREFIX = lib;
-INSTALL_PATH = /usr/local/lib;
-PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/bmalloc;
+INSTALL_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)/usr/local/lib;
+PRIVATE_HEADERS_FOLDER_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)/usr/local/include/bmalloc;
 PRODUCT_NAME = bmalloc;
 
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
index 513686e..affa0e0 100644 (file)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 EXECUTABLE_PREFIX = lib;
-INSTALL_PATH = /usr/local/lib;
+INSTALL_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)/usr/local/lib;
 PRODUCT_NAME = mbmalloc;
 
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;