[webkit-changes] [164576] trunk/Source/WebKit2

Sun, 23 Feb 2014 21:24:22 -0800

Title: [164576] trunk/Source/WebKit2
Revision
164576
Author
m...@apple.com
Date
2014-02-23 21:29:33 -0800 (Sun, 23 Feb 2014)

Log Message

<rdar://problem/16144508> [iOS] Some definitions of INSTALL_PATH don’t account for INSTALL_PATH_PREFIX
https://bugs.webkit.org/show_bug.cgi?id=129241

Reviewed by Mark Rowe.

* Configurations/Base.xcconfig: Define INSTALL_PATH here in terms of INSTALL_PATH_ACTUAL.
* Configurations/BaseLegacyProcess.xcconfig: Define only INSTALL_PATH_ACTUAL.
* Configurations/BaseTarget.xcconfig: Simplify the definition of
NORMAL_WEBKIT2_FRAMEWORKS_DIR, now that it shouldn’t include SDKROOT for the Simulator.
* Configurations/BaseXPCService.xcconfig: Define only INSTALL_PATH_ACTUAL.
* Configurations/WebKit2.xcconfig: Ditto.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (164575 => 164576)


--- trunk/Source/WebKit2/ChangeLog	2014-02-24 02:24:36 UTC (rev 164575)
+++ trunk/Source/WebKit2/ChangeLog	2014-02-24 05:29:33 UTC (rev 164576)
@@ -1,3 +1,17 @@
+2014-02-23  Dan Bernstein  <m...@apple.com>
+
+        <rdar://problem/16144508> [iOS] Some definitions of INSTALL_PATH don’t account for INSTALL_PATH_PREFIX
+        https://bugs.webkit.org/show_bug.cgi?id=129241
+
+        Reviewed by Mark Rowe.
+
+        * Configurations/Base.xcconfig: Define INSTALL_PATH here in terms of INSTALL_PATH_ACTUAL.
+        * Configurations/BaseLegacyProcess.xcconfig: Define only INSTALL_PATH_ACTUAL.
+        * Configurations/BaseTarget.xcconfig: Simplify the definition of
+        NORMAL_WEBKIT2_FRAMEWORKS_DIR, now that it shouldn’t include SDKROOT for the Simulator.
+        * Configurations/BaseXPCService.xcconfig: Define only INSTALL_PATH_ACTUAL.
+        * Configurations/WebKit2.xcconfig: Ditto.
+
 2014-02-23  Sam Weinig  <s...@webkit.org>
 
         Update FeatureDefines.xcconfig

Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (164575 => 164576)


--- trunk/Source/WebKit2/Configurations/Base.xcconfig	2014-02-24 02:24:36 UTC (rev 164575)
+++ trunk/Source/WebKit2/Configurations/Base.xcconfig	2014-02-24 05:29:33 UTC (rev 164576)
@@ -94,6 +94,8 @@
 
 SECTORDER_FLAGS = -Wl,-order_file,mac/WebKit2.order;
 
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
+
 SDKROOT = macosx.internal;
 
 CODE_SIGN_IDENTITY = -;

Modified: trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig (164575 => 164576)


--- trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig	2014-02-24 02:24:36 UTC (rev 164575)
+++ trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig	2014-02-24 05:29:33 UTC (rev 164576)
@@ -24,12 +24,7 @@
 #include "BaseTarget.xcconfig"
 
 GCC_ENABLE_OBJC_GC = NO;
-INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
-INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebKit2.framework;
-INSTALL_PATH_iphonesimulator = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
-INSTALL_PATH_macosx = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework;
-INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
-INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
+INSTALL_PATH_ACTUAL = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework;
 
 APP_ICON = $(APP_ICON_$(CONFIGURATION));
 APP_ICON_Debug = WebKit.icns;

Modified: trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig (164575 => 164576)


--- trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig	2014-02-24 02:24:36 UTC (rev 164575)
+++ trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig	2014-02-24 05:29:33 UTC (rev 164576)
@@ -32,10 +32,7 @@
 OTHER_CFLAGS = $(inherited) -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;
 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
 
-NORMAL_WEBKIT2_FRAMEWORKS_DIR = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-NORMAL_WEBKIT2_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphonesimulator = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_WEBKIT2_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 
 WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
 WEBKIT2_FRAMEWORKS_DIR_macosx = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));

Modified: trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig (164575 => 164576)


--- trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig	2014-02-24 02:24:36 UTC (rev 164575)
+++ trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig	2014-02-24 05:29:33 UTC (rev 164576)
@@ -25,13 +25,13 @@
 
 GCC_ENABLE_OBJC_GC = NO;
 
-INSTALL_PATH = $(INSTALL_PATH_$(WK_XPC_SERVICE_VARIANT));
+INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(WK_XPC_SERVICE_VARIANT));
 
-INSTALL_PATH_Normal = $(INSTALL_PATH_Normal_$(PLATFORM_NAME));
-INSTALL_PATH_Normal_macosx = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
-INSTALL_PATH_Normal_iphoneos = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/XPCServices;
+INSTALL_PATH_ACTUAL_Normal = $(INSTALL_PATH_ACTUAL_Normal_$(PLATFORM_NAME));
+INSTALL_PATH_ACTUAL_Normal_macosx = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
+INSTALL_PATH_ACTUAL_Normal_iphoneos = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/XPCServices;
 
-INSTALL_PATH_Development = $(APPLE_INTERNAL_DIR)/WebKit/XPCServicesForDevelopment;
+INSTALL_PATH_ACTUAL_Development = $(APPLE_INTERNAL_DIR)/WebKit/XPCServicesForDevelopment;
 
 APP_ICON = $(APP_ICON_$(CONFIGURATION));
 APP_ICON_Debug = WebKit.icns;
@@ -44,5 +44,4 @@
 WRAPPER_EXTENSION = xpc;
 MACH_O_TYPE = mh_execute;
 
-
 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);

Modified: trunk/Source/WebKit2/Configurations/WebKit2.xcconfig (164575 => 164576)


--- trunk/Source/WebKit2/Configurations/WebKit2.xcconfig	2014-02-24 02:24:36 UTC (rev 164575)
+++ trunk/Source/WebKit2/Configurations/WebKit2.xcconfig	2014-02-24 05:29:33 UTC (rev 164576)
@@ -26,9 +26,7 @@
 PRODUCT_NAME = WebKit2;
 INFOPLIST_FILE = Info.plist;
 
-INSTALL_PATH = $(WEBKIT2_FRAMEWORKS_DIR);
-INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
-INSTALL_PATH_ACTUAL_iphonesimulator = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphoneos);
+INSTALL_PATH_ACTUAL = $(WEBKIT2_FRAMEWORKS_DIR);
 DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
 
 FRAMEWORK_AND_LIBRARY_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_$(PLATFORM_NAME));

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to