Title: [231032] trunk/Source/WebCore
- Revision
- 231032
- Author
- wenson_hs...@apple.com
- Date
- 2018-04-25 16:23:00 -0700 (Wed, 25 Apr 2018)
Log Message
Missing closing parenthesis when determining INSTALL_PATH build setting in WebCore.xcconfig
https://bugs.webkit.org/show_bug.cgi?id=184999
Reviewed by Tim Horton.
Tweaks a line in WebCore.xcconfig that computes INSTALL_PATH, so that it doesn't use WK_NOT or WK_EMPTY.
* Configurations/WebCore.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (231031 => 231032)
--- trunk/Source/WebCore/ChangeLog 2018-04-25 23:17:31 UTC (rev 231031)
+++ trunk/Source/WebCore/ChangeLog 2018-04-25 23:23:00 UTC (rev 231032)
@@ -1,3 +1,14 @@
+2018-04-25 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Missing closing parenthesis when determining INSTALL_PATH build setting in WebCore.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=184999
+
+ Reviewed by Tim Horton.
+
+ Tweaks a line in WebCore.xcconfig that computes INSTALL_PATH, so that it doesn't use WK_NOT or WK_EMPTY.
+
+ * Configurations/WebCore.xcconfig:
+
2018-04-25 Zalan Bujtas <za...@apple.com>
[LFC] Implement LayoutContexet::layout() and its dependencies.
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (231031 => 231032)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2018-04-25 23:17:31 UTC (rev 231031)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2018-04-25 23:23:00 UTC (rev 231032)
@@ -50,9 +50,9 @@
HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
INFOPLIST_FILE = Info.plist;
-INSTALL_PATH = $(INSTALL_PATH_COCOA_TOUCH_$(WK_NOT_$(WK_EMPTY_$(WK_COCOA_TOUCH)));
-INSTALL_PATH_COCOA_TOUCH_YES = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-INSTALL_PATH_COCOA_TOUCH_NO = $(WEBCORE_FRAMEWORKS_DIR);
+INSTALL_PATH = $(INSTALL_PATH_$(WK_COCOA_TOUCH));
+INSTALL_PATH_cocoatouch = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH_ = $(WEBCORE_FRAMEWORKS_DIR);
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_PLATFORM);
DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes