[iOS] Remove project support for iOS 8
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 10 Oct 2015 08:40:34 +0000 (08:40 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 10 Oct 2015 08:40:34 +0000 (08:40 +0000)
https://bugs.webkit.org/show_bug.cgi?id=149993

Reviewed by Alexey Proskuryakov.

Source/bmalloc:

* Configurations/Base.xcconfig:
* Configurations/bmalloc.xcconfig:
* Configurations/mbmalloc.xcconfig:

Source/JavaScriptCore:

* Configurations/Base.xcconfig:
* Configurations/JSC.xcconfig:
* Configurations/JavaScriptCore.xcconfig:
* Configurations/LLVMForJSC.xcconfig:
* Configurations/ToolExecutable.xcconfig:

Source/ThirdParty/ANGLE:

* Configurations/ANGLE.xcconfig:
* Configurations/Base.xcconfig:

Source/WebCore:

* Configurations/WebCore.xcconfig:
* Configurations/WebCoreTestSupport.xcconfig:

Source/WebKit/mac:

* Configurations/WebKitLegacy.xcconfig:

Source/WebKit2:

* Configurations/Base.xcconfig:
* Configurations/BaseLegacyProcess.xcconfig:
* Configurations/BaseXPCService.xcconfig:
* Configurations/PluginProcessShim.xcconfig:
* Configurations/SecItemShim.xcconfig:
* Configurations/WebKit.xcconfig:
* Configurations/WebKit2.xcconfig:
* Configurations/WebProcessShim.xcconfig:

Source/WTF:

* Configurations/Base.xcconfig:
* Configurations/WTF.xcconfig:
* Configurations/mbmalloc.xcconfig:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190837 268f45cc-cd09-0410-ab3c-d52691b4dbfc

31 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/Base.xcconfig
Source/JavaScriptCore/Configurations/JSC.xcconfig
Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
Source/JavaScriptCore/Configurations/LLVMForJSC.xcconfig
Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig
Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig
Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
Source/WTF/ChangeLog
Source/WTF/Configurations/Base.xcconfig
Source/WTF/Configurations/WTF.xcconfig
Source/WTF/Configurations/mbmalloc.xcconfig
Source/WebCore/ChangeLog
Source/WebCore/Configurations/WebCore.xcconfig
Source/WebCore/Configurations/WebCoreTestSupport.xcconfig
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/Base.xcconfig
Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig
Source/WebKit2/Configurations/BaseXPCService.xcconfig
Source/WebKit2/Configurations/PluginProcessShim.xcconfig
Source/WebKit2/Configurations/SecItemShim.xcconfig
Source/WebKit2/Configurations/WebKit.xcconfig
Source/WebKit2/Configurations/WebKit2.xcconfig
Source/WebKit2/Configurations/WebProcessShim.xcconfig
Source/bmalloc/ChangeLog
Source/bmalloc/Configurations/Base.xcconfig
Source/bmalloc/Configurations/bmalloc.xcconfig
Source/bmalloc/Configurations/mbmalloc.xcconfig

index 87d1906a6b348f21e17e94c93fd6b91a3aeef9e8..aa696c45e8fdda78830e2b859db95caf0aab26fa 100644 (file)
@@ -1,3 +1,16 @@
+2015-10-10  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove project support for iOS 8
+        https://bugs.webkit.org/show_bug.cgi?id=149993
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/JSC.xcconfig:
+        * Configurations/JavaScriptCore.xcconfig:
+        * Configurations/LLVMForJSC.xcconfig:
+        * Configurations/ToolExecutable.xcconfig:
+
 2015-10-09  Joseph Pecoraro  <pecoraro@apple.com>
 
         Modernize and cleanup an NSNumber constant
index 69eea6fd95d4cc257f4cec470ea3fb246d4f34be..2631215eb2f245cd22de34508a52b46f70800bc7 100644 (file)
@@ -135,12 +135,6 @@ DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
 
 SDKROOT = macosx.internal;
 
-INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
-
-LD_DYLIB_INSTALL_NAME[sdk=iphonesimulator8.*]=$(LD_DYLIB_INSTALL_NAME_$(MACH_O_TYPE));
-LD_DYLIB_INSTALL_NAME_mh_dylib=$(INSTALL_PATH_ACTUAL)/$(EXECUTABLE_PATH);
-
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
index d1d32ef73ec166a0f3b6711b15ae5d7f4e9c379b..e21d8a8cb7a9bb2a045c7214f15cfb6227706d93 100644 (file)
@@ -24,7 +24,7 @@
 #include "FeatureDefines.xcconfig"
 #include "Version.xcconfig"
 
-INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/$(JAVASCRIPTCORE_RESOURCES_DIR);
+INSTALL_PATH = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/$(JAVASCRIPTCORE_RESOURCES_DIR);
 PRODUCT_NAME = jsc;
 CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = entitlements.plist;
 
index 0cb895f47837675fb24b9c830f9cfa08db98923a..1c2e45939f0a59a695f07b9738f9b468c2f6cbf8 100644 (file)
@@ -48,7 +48,7 @@ GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" $(HEADER_SEARCH_PATHS);
 INFOPLIST_FILE = Info.plist;
-INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_FRAMEWORKS_DIR);
+INSTALL_PATH = $(JAVASCRIPTCORE_FRAMEWORKS_DIR);
 DYLIB_INSTALL_NAME_BASE = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
 PRODUCT_NAME = JavaScriptCore;
 
index 9b4c44bd88270c2b7b4a3fa828badba6f2c823f7..3c45478449fb5f541311777d97b50ede269784f8 100644 (file)
@@ -50,7 +50,7 @@ HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore" $(HE
 PRODUCT_NAME = llvmForJSC;
 EXECUTABLE_PREFIX = lib;
 
-INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/$(JAVASCRIPTCORE_LIBRARIES_DIR);
+INSTALL_PATH = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/$(JAVASCRIPTCORE_LIBRARIES_DIR);
 
 // FIXME: This can be removed once <rdar://problem/17164789> is fixed.
 DEAD_CODE_STRIPPING = YES;
index 6ffcc873076e8f426e798d696380e77b99070831..1002a4fefe9e1c2b66e624f7aa948fa0179fbd0a 100644 (file)
@@ -24,7 +24,7 @@
 #include "FeatureDefines.xcconfig"
 #include "Version.xcconfig"
 
-INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/$(JAVASCRIPTCORE_RESOURCES_DIR);
+INSTALL_PATH = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/$(JAVASCRIPTCORE_RESOURCES_DIR);
 PRODUCT_NAME = $(TARGET_NAME);
 CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = $(CODE_SIGN_ENTITLEMENTS_ios_$(TARGET_NAME));
 CODE_SIGN_ENTITLEMENTS_ios_minidom = entitlements.plist;
index 745de19c2726f6b10079e2251ec5fce07a94eeba..42eca0de3b6fb2ed0241b35f9884501f70fb9415 100644 (file)
@@ -1,3 +1,13 @@
+2015-10-10  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove project support for iOS 8
+        https://bugs.webkit.org/show_bug.cgi?id=149993
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/ANGLE.xcconfig:
+        * Configurations/Base.xcconfig:
+
 2015-08-20  Alex Christensen  <achristensen@webkit.org>
 
         Clean up CMake build after r188673
index e01e6fdbc0ba7908d7c0a51e283ee2a68065b473..f7027dbff7fd316771a7890615148f1b40ee3a12 100644 (file)
@@ -6,7 +6,5 @@ CLANG_WARN_INT_CONVERSION = YES;
 COMBINE_HIDPI_IMAGES = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 HEADER_SEARCH_PATHS = include src;
-INSTALL_PATH_ACTUAL = /usr/local/lib;
-PUBLIC_HEADERS_FOLDER_PATH = $(PUBLIC_HEADERS_FOLDER_PATH_$(DEPLOYMENT_LOCATION));
-PUBLIC_HEADERS_FOLDER_PATH_NO = /usr/local/include/ANGLE;
-PUBLIC_HEADERS_FOLDER_PATH_YES = $(INSTALL_PATH_PREFIX)/usr/local/include/ANGLE;
+INSTALL_PATH = /usr/local/lib;
+PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/ANGLE;
index 5efaff87b4d18bea020f6a727504a716a7bba92b..d51d08d1ac1640c02dbb05d28cf2b56a391d9cd5 100644 (file)
@@ -51,9 +51,6 @@ SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
-INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
-
 SDKROOT = macosx.internal;
 
 TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
index 3bd352c3f289f66180b5393daae71b9e3c9d8a13..49b962bdbc57d6de8233ea7217420763fedc5999 100644 (file)
@@ -1,3 +1,14 @@
+2015-10-10  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove project support for iOS 8
+        https://bugs.webkit.org/show_bug.cgi?id=149993
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/WTF.xcconfig:
+        * Configurations/mbmalloc.xcconfig:
+
 2015-10-08  Joseph Pecoraro  <pecoraro@apple.com>
 
         Clean up Marked classes
index 0c55e71f2555cb905e9fd7f4c566b6838319779a..8b83c7e04d30951bfb712ac95491bce5004a5da7 100644 (file)
@@ -84,7 +84,7 @@ GCC_WARN_UNUSED_VARIABLE = YES;
 LINKER_DISPLAYS_MANGLED_NAMES = YES;
 PREBINDING = NO;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/$(INSTALL_PATH_PREFIX)/usr/local/include icu $(HEADER_SEARCH_PATHS);
+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include icu $(HEADER_SEARCH_PATHS);
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
@@ -110,9 +110,6 @@ DEAD_CODE_STRIPPING_debug = NO;
 DEAD_CODE_STRIPPING_normal = YES;
 DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
 
-INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
-
 SDKROOT = macosx.internal;
 
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
index 9c795a4ed49002a54d98dbb8432f32240ab42a7e..421efd961c1468cd20ddc5bbf889620ee1cf58dc 100644 (file)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 EXECUTABLE_PREFIX = lib;
-INSTALL_PATH_ACTUAL = /usr/local/lib;
+INSTALL_PATH = /usr/local/lib;
 PRODUCT_NAME = WTF;
 
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
index 70974fe5c7eab7d865d9225f69622a0f2706ca2e..513686e98d49985846fdbbe3b25ba1110deedf9c 100644 (file)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 EXECUTABLE_PREFIX = lib;
-INSTALL_PATH_ACTUAL = /usr/local/lib;
+INSTALL_PATH = /usr/local/lib;
 PRODUCT_NAME = mbmalloc;
 
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
index 1cd698257b1fa6138b71687e7ea9c0c04725f587..71a3f42c8deabb338fe584f80ad64ad395b50d4f 100644 (file)
@@ -1,3 +1,13 @@
+2015-10-10  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove project support for iOS 8
+        https://bugs.webkit.org/show_bug.cgi?id=149993
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/WebCore.xcconfig:
+        * Configurations/WebCoreTestSupport.xcconfig:
+
 2015-10-09  Zalan Bujtas  <zalan@apple.com>
 
         Check if start and end positions are still valid after updating them through VisibleSelection.
index eabf14333af3af426596dc3e8ce83bcde9162c99..6fa29d6fe05dbbffdc82732460fe343e07ba04d6 100644 (file)
@@ -42,8 +42,7 @@ WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/We
 
 HEADER_SEARCH_PATHS = ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
 INFOPLIST_FILE = Info.plist;
-INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 INSTALL_PATH[sdk=macosx*] = $(WEBCORE_FRAMEWORKS_DIR);
 DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_PLATFORM);
 DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
index 39699bbff5d67f7c99a6e2ad3c0532aa552fffd7..464ed5d21b317da83670b266c55ef1f4ced14971 100644 (file)
 PRIVATE_HEADERS_FOLDER_PATH = $(PRIVATE_HEADERS_FOLDER_PATH_$(CONFIGURATION));
 PRIVATE_HEADERS_FOLDER_PATH_Debug = WebCoreTestSupport;
 PRIVATE_HEADERS_FOLDER_PATH_Release = $(PRIVATE_HEADERS_FOLDER_PATH_Debug);
-PRIVATE_HEADERS_FOLDER_PATH_Production = $(INSTALL_PATH_PREFIX)/usr/local/include/WebCoreTestSupport;
+PRIVATE_HEADERS_FOLDER_PATH_Production = /usr/local/include/WebCoreTestSupport;
 
-// Use [sdk=] selectors to override settings in WebCore.xcconfig.
-INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
-INSTALL_PATH[sdk=iphone*] = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
-INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
-INSTALL_PATH_ACTUAL = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
+INSTALL_PATH = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
+// Using [sdk=macosx*] to override the setting in WebCore.xcconfig.
+INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
 INSTALL_PATH_WebCoreTestSupport_Production = /usr/local/lib;
 
 SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
@@ -43,7 +41,6 @@ SKIP_INSTALL_YES = NO;
 
 DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(CONFIGURATION));
 DYLIB_INSTALL_NAME_BASE_Production = $(INSTALL_PATH);
-DYLIB_INSTALL_NAME_BASE_Production[sdk=iphonesimulator*] = $(INSTALL_PATH_ACTUAL);
 DYLIB_INSTALL_NAME_BASE_Debug = @rpath;
 DYLIB_INSTALL_NAME_BASE_Release = $(DYLIB_INSTALL_NAME_BASE_Debug);
 
index 4d1dc7964ce32e7addb41b206c4d1cc58373a4e0..28bc3cbc5538536d642e4261d440e3490e93bde1 100644 (file)
@@ -1,3 +1,12 @@
+2015-10-10  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove project support for iOS 8
+        https://bugs.webkit.org/show_bug.cgi?id=149993
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/WebKitLegacy.xcconfig:
+
 2015-10-06  Daniel Bates  <dbates@webkit.org>
 
         Enable XSLT when building WebKit for iOS using the public iOS SDK
index b46765065cad9a7019518d1c0f6ca770e32ac816..2c442d3b127b64dce948832d75b1e1538b0d27d6 100644 (file)
@@ -56,8 +56,7 @@ GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy $(inherited);
 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);
 INFOPLIST_FILE = mac/Info.plist;
-INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 INSTALL_PATH[sdk=macosx*] = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
 
 DYLIB_INSTALL_NAME_BASE[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
index 145b30b0782e6dd9b4ac73a57849df077c2bac69..286a6f6f29d35cbaad43b9a6046182a28c73875c 100644 (file)
@@ -1,3 +1,19 @@
+2015-10-10  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove project support for iOS 8
+        https://bugs.webkit.org/show_bug.cgi?id=149993
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/BaseLegacyProcess.xcconfig:
+        * Configurations/BaseXPCService.xcconfig:
+        * Configurations/PluginProcessShim.xcconfig:
+        * Configurations/SecItemShim.xcconfig:
+        * Configurations/WebKit.xcconfig:
+        * Configurations/WebKit2.xcconfig:
+        * Configurations/WebProcessShim.xcconfig:
+
 2015-10-09  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Unreviewed, rolling out r190689
index b4edcc03f95babb8a7d34667dbd8b3ad56d05fd9..55818e1717d530760a2de0c9c73499cee8336273 100644 (file)
@@ -98,12 +98,6 @@ COPY_PHASE_STRIP = NO;
 // building the MiG bindings for WebKitPluginClient even when the functions that the bindings wrap are not built.
 DEAD_CODE_STRIPPING = YES;
 
-INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
-
-LD_DYLIB_INSTALL_NAME[sdk=iphonesimulator8.*]=$(LD_DYLIB_INSTALL_NAME_$(MACH_O_TYPE));
-LD_DYLIB_INSTALL_NAME_mh_dylib=$(INSTALL_PATH_ACTUAL)/$(EXECUTABLE_PATH);
-
 SDKROOT = macosx.internal;
 
 CODE_SIGN_IDENTITY = -;
index 338a2322a4ab00059843b3858b24359fc88abec9..dcb753eb050179dd743852a58f5e0a9ea4af084d 100644 (file)
@@ -24,7 +24,7 @@
 #include "BaseTarget.xcconfig"
 
 GCC_ENABLE_OBJC_GC = NO;
-INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/$(FRAMEWORK_CONTENT_DIRECTORY);
+INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/$(FRAMEWORK_CONTENT_DIRECTORY);
 
 APP_ICON = $(APP_ICON_$(CONFIGURATION));
 APP_ICON_Debug = WebKit.icns;
index 510526a4d0e30c0447894b2da69dcd7dd2951d18..67f594f40b46152efaa44b61fa1fe7e1ef3ba8c2 100644 (file)
 
 GCC_ENABLE_OBJC_GC = NO;
 
-INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(WK_XPC_SERVICE_VARIANT));
+INSTALL_PATH = $(INSTALL_PATH_$(WK_XPC_SERVICE_VARIANT));
 
-INSTALL_PATH_ACTUAL_Normal[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
-INSTALL_PATH_ACTUAL_Normal[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/XPCServices;
+INSTALL_PATH_Normal[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
+INSTALL_PATH_Normal[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/XPCServices;
 
-INSTALL_PATH_ACTUAL_Development = $(APPLE_INTERNAL_DIR)/WebKit/XPCServicesForDevelopment;
+INSTALL_PATH_Development = $(APPLE_INTERNAL_DIR)/WebKit/XPCServicesForDevelopment;
 
 APP_ICON = $(APP_ICON_$(CONFIGURATION));
 APP_ICON_Debug = WebKit.icns;
index 3486aa386e99e960d4a13d503bdbc9d847c18afe..9fa117d26d9d9076ffa6b2ad107fd4a84926dbbd 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "Shim.xcconfig"
 
-INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/PluginProcess.app/Contents/MacOS;
+INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/PluginProcess.app/Contents/MacOS;
 DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/PluginProcess.app/Contents/MacOS;
 
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
index a6c06fea47683cc9395e6f5ed3336753f93bcdaa..ad13634ccbb77cb8395add4bb4eca63429589416 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "Shim.xcconfig"
 
-INSTALL_PATH_ACTUAL[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/NetworkProcess.app/Contents/MacOS;
+INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/NetworkProcess.app/Contents/MacOS;
 DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/NetworkProcess.app/Contents/MacOS;
 
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
index 0b5698588a703fcc2a7f86308bbad3181ae374be..2dd22345fff6ebac3461fe0d83955adaab78c781 100644 (file)
@@ -30,7 +30,7 @@ DEFINES_MODULE=YES;
 MODULEMAP_FILE[sdk=macosx*]=Modules/OSX.modulemap;
 MODULEMAP_FILE[sdk=iphone*]=Modules/iOS.modulemap;
 
-INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR);
+INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR);
 DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
 
 FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileCoreServices -lMobileGestalt;
@@ -52,9 +52,6 @@ EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.pdf Resources/mac/* com.apple.WebKit
 
 INSTALLHDRS_SCRIPT_PHASE = YES;
 
-WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphoneos8.*] = YES;
-WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphonesimulator8.*] = YES;
-
 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_$(MAC_OS_X_VERSION_MAJOR));
 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_1090 = YES;
 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101000 = YES;
index 4ce985b0430bf4202d14b5e40d0ff22c75910e4f..cd274d435e3af1ec62fe618972f526ba9dedc48e 100644 (file)
@@ -28,8 +28,7 @@ INFOPLIST_FILE = mac/Info-WebKit2.plist;
 
 OTHER_LDFLAGS = $(inherited) -framework WebKit -sub_umbrella WebKit;
 
-INSTALL_PATH_ACTUAL = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-INSTALL_PATH_ACTUAL[sdk=macosx*] = $(WEBKIT2_FRAMEWORKS_DIR);
+INSTALL_PATH = $(WEBKIT2_FRAMEWORKS_DIR);
 
 DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
 
index 2b3255ae8c0b49bc0ded14d333f8bc975238cee6..3197fe61b043f56325415d747364db3858a6e5b9 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "Shim.xcconfig"
 
-INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/WebProcess.app/Contents/MacOS;
+INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/WebProcess.app/Contents/MacOS;
 DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/WebProcess.app/Contents/MacOS;
 
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
index 566177b4d47d0e37b9b0bd8346bc0bbb8e8500e0..e294d32c7bfc6e5bca23dfc9428ef8bdd04d53d3 100644 (file)
@@ -1,3 +1,14 @@
+2015-10-10  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove project support for iOS 8
+        https://bugs.webkit.org/show_bug.cgi?id=149993
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/bmalloc.xcconfig:
+        * Configurations/mbmalloc.xcconfig:
+
 2015-08-31  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         Implement bmalloc::isASanEnabled for generic Unix
index 4327a305fc43be963f11d07788c59fee886fc777..a439fa7270710b8db79643a13a999e2c2c580609 100644 (file)
@@ -106,9 +106,6 @@ DEAD_CODE_STRIPPING_debug = NO;
 DEAD_CODE_STRIPPING_normal = YES;
 DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
 
-INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
-
 SDKROOT = macosx.internal;
 
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
index a0138cc394ce48c4d25b3b24d920914a1f5271c8..747bcb6836b58f9283f3ec46c751cbb131f9d411 100644 (file)
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 EXECUTABLE_PREFIX = lib;
-INSTALL_PATH_ACTUAL = /usr/local/lib;
-PRIVATE_HEADERS_FOLDER_PATH = $(PRIVATE_HEADERS_FOLDER_PATH_$(DEPLOYMENT_LOCATION));
-PRIVATE_HEADERS_FOLDER_PATH_NO = /usr/local/include/bmalloc;
-PRIVATE_HEADERS_FOLDER_PATH_YES = $(INSTALL_PATH_PREFIX)/usr/local/include/bmalloc;
+INSTALL_PATH = /usr/local/lib;
+PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/bmalloc;
 PRODUCT_NAME = bmalloc;
 
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
index 70974fe5c7eab7d865d9225f69622a0f2706ca2e..513686e98d49985846fdbbe3b25ba1110deedf9c 100644 (file)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 EXECUTABLE_PREFIX = lib;
-INSTALL_PATH_ACTUAL = /usr/local/lib;
+INSTALL_PATH = /usr/local/lib;
 PRODUCT_NAME = mbmalloc;
 
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;