Title: [204627] trunk/Source
- Revision
- 204627
- Author
- [email protected]
- Date
- 2016-08-18 20:07:15 -0700 (Thu, 18 Aug 2016)
Log Message
Ld warns of non-existent PrivateFrameworks directory when building WebKit with the public iOS 9.3 SDK
https://bugs.webkit.org/show_bug.cgi?id=160979
Rubber-stamped by Simon Fraser.
Only add the SDK PrivateFrameworks directory to the FRAMEWORK_SEARCH_PATH when building for
iOS Simulator, building with an iOS SDK that does not support text-based stubs, or building
an Apple-internal build.
Source/WebCore:
* Configurations/Base.xcconfig: Define WK_TARGET_IOS_VERSION_MAJOR.
* Configurations/WebCore.xcconfig:
Source/WebKit/mac:
* Configurations/WebKitLegacy.xcconfig:
Source/WebKit2:
* Configurations/BaseTarget.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (204626 => 204627)
--- trunk/Source/WebCore/ChangeLog 2016-08-19 02:53:58 UTC (rev 204626)
+++ trunk/Source/WebCore/ChangeLog 2016-08-19 03:07:15 UTC (rev 204627)
@@ -1,3 +1,17 @@
+2016-08-18 Daniel Bates <[email protected]>
+
+ Ld warns of non-existent PrivateFrameworks directory when building WebKit with the public iOS 9.3 SDK
+ https://bugs.webkit.org/show_bug.cgi?id=160979
+
+ Rubber-stamped by Simon Fraser.
+
+ Only add the SDK PrivateFrameworks directory to the FRAMEWORK_SEARCH_PATH when building for
+ iOS Simulator, building with an iOS SDK that does not support text-based stubs, or building
+ an Apple-internal build.
+
+ * Configurations/Base.xcconfig: Define WK_TARGET_IOS_VERSION_MAJOR.
+ * Configurations/WebCore.xcconfig:
+
2016-08-18 Sam Weinig <[email protected]>
Re-landing:
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (204626 => 204627)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2016-08-19 02:53:58 UTC (rev 204626)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2016-08-19 03:07:15 UTC (rev 204627)
@@ -85,6 +85,8 @@
TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
+WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // iOS 9.3 => 9
+
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (204626 => 204627)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2016-08-19 02:53:58 UTC (rev 204626)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2016-08-19 03:07:15 UTC (rev 204627)
@@ -28,11 +28,15 @@
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(inherited);
WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(IPHONEOS_DEPLOYMENT_TARGET:base);
+WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphonesimulator*] = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
+WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_NO = $(PRODUCTION_FRAMEWORKS_DIR);
FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
-FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
+FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS_DIR);
FRAMEWORK_SEARCH_PATHS_ios_Release = $(FRAMEWORK_SEARCH_PATHS_ios_Debug);
FRAMEWORK_SEARCH_PATHS_ios_Production = $(PRODUCTION_FRAMEWORKS_DIR);
FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
Modified: trunk/Source/WebKit/mac/ChangeLog (204626 => 204627)
--- trunk/Source/WebKit/mac/ChangeLog 2016-08-19 02:53:58 UTC (rev 204626)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-08-19 03:07:15 UTC (rev 204627)
@@ -1,3 +1,16 @@
+2016-08-18 Daniel Bates <[email protected]>
+
+ Ld warns of non-existent PrivateFrameworks directory when building WebKit with the public iOS 9.3 SDK
+ https://bugs.webkit.org/show_bug.cgi?id=160979
+
+ Rubber-stamped by Simon Fraser.
+
+ Only add the SDK PrivateFrameworks directory to the FRAMEWORK_SEARCH_PATH when building for
+ iOS Simulator, building with an iOS SDK that does not support text-based stubs, or building
+ an Apple-internal build.
+
+ * Configurations/WebKitLegacy.xcconfig:
+
2016-08-18 Anders Carlsson <[email protected]>
Move an NPAPI-only function from WebCore to WebKit
Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (204626 => 204627)
--- trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2016-08-19 02:53:58 UTC (rev 204626)
+++ trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2016-08-19 03:07:15 UTC (rev 204627)
@@ -38,11 +38,15 @@
EXPORTED_SYMBOLS_FILE_x86_64[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp;
WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphonesimulator*] = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
+WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_NO = $(PRODUCTION_FRAMEWORKS_DIR);
FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
-FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
+FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS_DIR);
FRAMEWORK_SEARCH_PATHS_ios_Release = $(FRAMEWORK_SEARCH_PATHS_ios_Debug);
FRAMEWORK_SEARCH_PATHS_ios_Production = $(PRODUCTION_FRAMEWORKS_DIR);
FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) "$(UMBRELLA_FRAMEWORKS_DIR)" $(inherited);
Modified: trunk/Source/WebKit2/ChangeLog (204626 => 204627)
--- trunk/Source/WebKit2/ChangeLog 2016-08-19 02:53:58 UTC (rev 204626)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-19 03:07:15 UTC (rev 204627)
@@ -1,3 +1,16 @@
+2016-08-18 Daniel Bates <[email protected]>
+
+ Ld warns of non-existent PrivateFrameworks directory when building WebKit with the public iOS 9.3 SDK
+ https://bugs.webkit.org/show_bug.cgi?id=160979
+
+ Rubber-stamped by Simon Fraser.
+
+ Only add the SDK PrivateFrameworks directory to the FRAMEWORK_SEARCH_PATH when building for
+ iOS Simulator, building with an iOS SDK that does not support text-based stubs, or building
+ an Apple-internal build.
+
+ * Configurations/BaseTarget.xcconfig:
+
2016-08-18 Hunseop Jeong <[email protected]>
Unreviewed, Fix CMake build after r204614
Modified: trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig (204626 => 204627)
--- trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2016-08-19 02:53:58 UTC (rev 204626)
+++ trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2016-08-19 03:07:15 UTC (rev 204627)
@@ -25,11 +25,15 @@
#include "Version.xcconfig"
WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphonesimulator*] = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
+WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_NO = $(PRODUCTION_FRAMEWORKS_DIR);
FRAMEWORK_SEARCH_PATHS_base = "$(UMBRELLA_FRAMEWORKS_DIR)" $(FRAMEWORK_SEARCH_PATHS);
-FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_base) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_base) $(WK_PRIVATE_FRAMEWORKS_DIR);
FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_base);
GCC_PREFIX_HEADER = WebKit2Prefix.h;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
