Title: [165291] trunk/Source/WebKit/mac
- Revision
- 165291
- Author
- [email protected]
- Date
- 2014-03-07 14:06:57 -0800 (Fri, 07 Mar 2014)
Log Message
Tweak the WebKit2 frameworks directories
https://bugs.webkit.org/show_bug.cgi?id=129910
<rdar://problem/15920020>
Reviewed by Dan Bernstein.
Use an SDK relative directory for production builds.
* Configurations/WebKit.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (165290 => 165291)
--- trunk/Source/WebKit/mac/ChangeLog 2014-03-07 22:01:03 UTC (rev 165290)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-03-07 22:06:57 UTC (rev 165291)
@@ -1,5 +1,17 @@
2014-03-07 Anders Carlsson <[email protected]>
+ Tweak the WebKit2 frameworks directories
+ https://bugs.webkit.org/show_bug.cgi?id=129910
+ <rdar://problem/15920020>
+
+ Reviewed by Dan Bernstein.
+
+ Use an SDK relative directory for production builds.
+
+ * Configurations/WebKit.xcconfig:
+
+2014-03-07 Anders Carlsson <[email protected]>
+
Link WebKit.framework against WebKit2.framework and re-export all WebKit2 symbols
https://bugs.webkit.org/show_bug.cgi?id=129901
<rdar://problem/15920020>
Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (165290 => 165291)
--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-03-07 22:01:03 UTC (rev 165290)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-03-07 22:06:57 UTC (rev 165291)
@@ -86,16 +86,15 @@
NORMAL_WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
NORMAL_WEBKIT_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;
-NORMAL_WEBKIT2_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORK_DIR_$(CONFIGURATION));
+WEBKIT2_FRAMEWORKS_DIR_Release = $(WEBKIT2_FRAMEWORK_DIR_engineering);
+WEBKIT2_FRAMEWORKS_DIR_Debug = $(WEBKIT2_FRAMEWORK_DIR_engineering);
+WEBKIT2_FRAMEWORKS_DIR_Production = $(SDKROOT)$(WEBKIT2_FRAMEWORK_DIR_Production_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORK_DIR_Production_USE_STAGING_INSTALL_PATH_NO);
+WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO = /System/Library/PrivateFrameworks;
+WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR);
+WEBKIT2_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR)
-WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-WEBKIT2_FRAMEWORKS_DIR_macosx = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
-WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
-WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-WEBKIT2_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
-WEBKIT2_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
-
WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
WEBKIT_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos);
WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(WEBKIT_FRAMEWORKS_DIR_iphoneos);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
