Title: [168500] trunk/Source/WebKit/mac
- Revision
- 168500
- Author
- ander...@apple.com
- Date
- 2014-05-08 15:42:59 -0700 (Thu, 08 May 2014)
Log Message
Use a different install name for WebKitLegacy.framework for staged framework builds
https://bugs.webkit.org/show_bug.cgi?id=132711
<rdar://problem/16850620>
Reviewed by Dan Bernstein.
* Configurations/WebKitLegacy.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (168499 => 168500)
--- trunk/Source/WebKit/mac/ChangeLog 2014-05-08 22:29:22 UTC (rev 168499)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-05-08 22:42:59 UTC (rev 168500)
@@ -1,3 +1,13 @@
+2014-05-08 Anders Carlsson <ander...@apple.com>
+
+ Use a different install name for WebKitLegacy.framework for staged framework builds
+ https://bugs.webkit.org/show_bug.cgi?id=132711
+ <rdar://problem/16850620>
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/WebKitLegacy.xcconfig:
+
2014-05-08 Brady Eidson <beid...@apple.com>
Wrap a new class definition with __has_include()
Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (168499 => 168500)
--- trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2014-05-08 22:29:22 UTC (rev 168499)
+++ trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2014-05-08 22:42:59 UTC (rev 168500)
@@ -57,6 +57,10 @@
OTHER_CFLAGS_macosx = $(OTHER_CFLAGS) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
+WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING = $(WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_1080 = YES;
+WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_1090 = YES;
+
GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(HEADER_SEARCH_PATHS);
@@ -67,10 +71,14 @@
INSTALL_PATH_macosx = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
+
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
-DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
+DYLIB_INSTALL_NAME_BASE_macosx = $(DYLIB_INSTALL_NAME_BASE_macosx_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_$(WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING));
+DYLIB_INSTALL_NAME_BASE_macosx_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_ = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
+DYLIB_INSTALL_NAME_BASE_macosx_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_YES = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
DYLIB_INSTALL_NAME_BASE_iphonesimulator = $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos);
+
INSTALLHDRS_COPY_PHASE = YES;
INSTALLHDRS_SCRIPT_PHASE = YES;
PRODUCT_NAME = WebKitLegacy;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
