Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (183928 => 183929)
--- trunk/Source/_javascript_Core/ChangeLog 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-05-07 16:26:59 UTC (rev 183929)
@@ -1,3 +1,13 @@
+2015-05-07 Dan Bernstein <m...@apple.com>
+
+ <rdar://problem/19317140> [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+ https://bugs.webkit.org/show_bug.cgi?id=144727
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
+ INSTALL_PATH_PREFIX and LD_DYLIB_INSTALL_NAME for the iOS 8.x Simulator.
+
2015-05-07 Andreas Kling <akl...@apple.com>
Special-case Int32 values in JSON.stringify().
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (183928 => 183929)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2015-05-07 16:26:59 UTC (rev 183929)
@@ -21,7 +21,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
@@ -134,8 +133,12 @@
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);
Modified: trunk/Source/PAL/ChangeLog (183928 => 183929)
--- trunk/Source/PAL/ChangeLog 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/PAL/ChangeLog 2015-05-07 16:26:59 UTC (rev 183929)
@@ -1,3 +1,13 @@
+2015-05-07 Dan Bernstein <m...@apple.com>
+
+ <rdar://problem/19317140> [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+ https://bugs.webkit.org/show_bug.cgi?id=144727
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
+ INSTALL_PATH_PREFIX for the iOS 8.x Simulator.
+
2015-04-02 Myles C. Maxfield <mmaxfi...@apple.com>
Introducing the Platform Abstraction Layer (PAL)
Modified: trunk/Source/PAL/Configurations/Base.xcconfig (183928 => 183929)
--- trunk/Source/PAL/Configurations/Base.xcconfig 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/PAL/Configurations/Base.xcconfig 2015-05-07 16:26:59 UTC (rev 183929)
@@ -21,7 +21,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
@@ -110,6 +109,7 @@
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;
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (183928 => 183929)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-05-07 16:26:59 UTC (rev 183929)
@@ -1,3 +1,13 @@
+2015-05-07 Dan Bernstein <m...@apple.com>
+
+ <rdar://problem/19317140> [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+ https://bugs.webkit.org/show_bug.cgi?id=144727
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
+ INSTALL_PATH_PREFIX and LD_DYLIB_INSTALL_NAME for the iOS 8.x Simulator.
+
2015-04-01 Alex Christensen <achristen...@webkit.org>
Progress towards CMake on Windows and Mac.
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (183928 => 183929)
--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2015-05-07 16:26:59 UTC (rev 183929)
@@ -1,4 +1,3 @@
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
@@ -48,6 +47,7 @@
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;
Modified: trunk/Source/ThirdParty/ChangeLog (183928 => 183929)
--- trunk/Source/ThirdParty/ChangeLog 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/ThirdParty/ChangeLog 2015-05-07 16:26:59 UTC (rev 183929)
@@ -1,3 +1,12 @@
+2015-05-07 Dan Bernstein <m...@apple.com>
+
+ <rdar://problem/19317140> [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+ https://bugs.webkit.org/show_bug.cgi?id=144727
+
+ Reviewed by Darin Adler.
+
+ * gtest/xcode/Config/General.xcconfig: Don’t include AspenFamily.xcconfig.
+
2015-04-01 Gyuyoung Kim <gyuyoung....@webkit.org>
[CMake] Make gtest/CMakeLists.txt more readable
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (183928 => 183929)
--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2015-05-07 16:26:59 UTC (rev 183929)
@@ -7,8 +7,6 @@
// http://code.google.com/p/google-toolbox-for-mac/
//
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
-
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
ARCHS = $(ARCHS_STANDARD_32_64_BIT);
Modified: trunk/Source/WTF/ChangeLog (183928 => 183929)
--- trunk/Source/WTF/ChangeLog 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WTF/ChangeLog 2015-05-07 16:26:59 UTC (rev 183929)
@@ -1,3 +1,13 @@
+2015-05-07 Dan Bernstein <m...@apple.com>
+
+ <rdar://problem/19317140> [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+ https://bugs.webkit.org/show_bug.cgi?id=144727
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
+ INSTALL_PATH_PREFIX and LD_DYLIB_INSTALL_NAME for the iOS 8.x Simulator.
+
2015-05-07 Žan Doberšek <zdober...@igalia.com>
[GTK] Clean up RunLoop implementation
Modified: trunk/Source/WTF/Configurations/Base.xcconfig (183928 => 183929)
--- trunk/Source/WTF/Configurations/Base.xcconfig 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WTF/Configurations/Base.xcconfig 2015-05-07 16:26:59 UTC (rev 183929)
@@ -21,7 +21,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
@@ -110,6 +109,7 @@
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;
Modified: trunk/Source/WebCore/ChangeLog (183928 => 183929)
--- trunk/Source/WebCore/ChangeLog 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebCore/ChangeLog 2015-05-07 16:26:59 UTC (rev 183929)
@@ -1,3 +1,17 @@
+2015-05-07 Dan Bernstein <m...@apple.com>
+
+ <rdar://problem/19317140> [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+ https://bugs.webkit.org/show_bug.cgi?id=144727
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig.
+ * Configurations/WebCore.xcconfig: For iOS, define INSTALL_PATH in terms of
+ INSTALL_PATH_PREFIX, and set INSTALL_PATH_PREFIX for the iOS 8.x Simulator.
+ * Configurations/WebCoreTestSupport.xcconfig: Define INSTALL_PATH in terms of
+ INSTALL_PATH_PREFIX and INSTALL_PATH_ACTUAL, and define INSTALL_PATH_PREFIX for the iOS 8.x
+ Simulator.
+
2015-05-07 Eric Carlson <eric.carl...@apple.com>
[Mac] Playback target isn't set on new element
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (183928 => 183929)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2015-05-07 16:26:59 UTC (rev 183929)
@@ -21,7 +21,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (183928 => 183929)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2015-05-07 16:26:59 UTC (rev 183929)
@@ -42,9 +42,9 @@
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[sdk=iphoneos*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+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[sdk=macosx*] = $(WEBCORE_FRAMEWORKS_DIR);
-INSTALL_PATH_ACTUAL[sdk=iphonesimulator*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_PLATFORM);
DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=macosx*] = $(NORMAL_WEBCORE_FRAMEWORKS_DIR);
Modified: trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig (183928 => 183929)
--- trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2015-05-07 16:26:59 UTC (rev 183929)
@@ -27,13 +27,12 @@
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[sdk=iphonesimulator*] = $(INDIGO_INSTALL_PATH_PREFIX)/usr/local/include/WebCoreTestSupport;
-PRIVATE_HEADERS_FOLDER_PATH_Production = /usr/local/include/WebCoreTestSupport;
+PRIVATE_HEADERS_FOLDER_PATH_Production = $(INSTALL_PATH_PREFIX)/usr/local/include/WebCoreTestSupport;
// Use [sdk=] selectors to override settings in WebCore.xcconfig.
-INSTALL_PATH[sdk=iphoneos*] = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
-INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
-INSTALL_PATH_ACTUAL[sdk=iphonesimulator*] = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
+INSTALL_PATH_PREFIX[sdk=iphonesimulator8.*] = $(DEVELOPER_INSTALL_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/$(SDK_DIR:file);
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
+INSTALL_PATH_ACTUAL = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
INSTALL_PATH_WebCoreTestSupport_Production = /usr/local/lib;
SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
Modified: trunk/Source/WebKit/mac/ChangeLog (183928 => 183929)
--- trunk/Source/WebKit/mac/ChangeLog 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-07 16:26:59 UTC (rev 183929)
@@ -1,3 +1,15 @@
+2015-05-07 Dan Bernstein <m...@apple.com>
+
+ <rdar://problem/19317140> [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+ https://bugs.webkit.org/show_bug.cgi?id=144727
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig.
+ * Configurations/WebKitLegacy.xcconfig: Define INSTALL_PATH in terms of
+ INSTALL_PATH_PREFIX and INSTALL_PATH_ACTUAL, and define INSTALL_PATH_PREFIX for the iOS 8.x
+ Simulator.
+
2015-04-02 Myles C. Maxfield <mmaxfi...@apple.com>
Introducing the Platform Abstraction Layer (PAL)
Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (183928 => 183929)
--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2015-05-07 16:26:59 UTC (rev 183929)
@@ -21,7 +21,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (183928 => 183929)
--- trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2015-05-07 16:26:59 UTC (rev 183929)
@@ -56,10 +56,9 @@
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
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[sdk=iphoneos*] = $(INSTALL_PATH_ios);
+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[sdk=macosx*] = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
-INSTALL_PATH_ACTUAL[sdk=iphonesimulator*] = $(INSTALL_PATH_ios);
-INSTALL_PATH_ios = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
DYLIB_INSTALL_NAME_BASE[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME)_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_$(WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING));
Modified: trunk/Source/WebKit2/ChangeLog (183928 => 183929)
--- trunk/Source/WebKit2/ChangeLog 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-07 16:26:59 UTC (rev 183929)
@@ -1,3 +1,16 @@
+2015-05-07 Dan Bernstein <m...@apple.com>
+
+ <rdar://problem/19317140> [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+ https://bugs.webkit.org/show_bug.cgi?id=144727
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Don’t include AspenFamily.xcconfig, and define
+ INSTALL_PATH_PREFIX and LD_DYLIB_INSTALL_NAME for the iOS 8.x Simulator.
+ * Configurations/WebKit2.xcconfig: Define INSTALL_PATH_ACTUAL and let INSTALL_PATH be
+ derived from it and INSTALL_PATH_PREFIX. Don’t override DYLIB_INSTALL_NAME_BASE for iOS,
+ because we define LD_DYLIB_INSTALL_NAME directly where needed.
+
2015-05-07 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.9.1 release.
Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (183928 => 183929)
--- trunk/Source/WebKit2/Configurations/Base.xcconfig 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebKit2/Configurations/Base.xcconfig 2015-05-07 16:26:59 UTC (rev 183929)
@@ -21,7 +21,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
@@ -98,8 +97,12 @@
// 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 = -;
Modified: trunk/Source/WebKit2/Configurations/WebKit2.xcconfig (183928 => 183929)
--- trunk/Source/WebKit2/Configurations/WebKit2.xcconfig 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/WebKit2/Configurations/WebKit2.xcconfig 2015-05-07 16:26:59 UTC (rev 183929)
@@ -28,12 +28,9 @@
OTHER_LDFLAGS = $(inherited) -framework WebKit -sub_umbrella WebKit;
-INSTALL_PATH[sdk=iphoneos*] = $(INSTALL_PATH_ios);
-INSTALL_PATH[sdk=macosx*] = $(WEBKIT2_FRAMEWORKS_DIR);
-INSTALL_PATH_ACTUAL[sdk=iphonesimulator*] = $(INSTALL_PATH_ios);
-INSTALL_PATH_ios = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH_ACTUAL = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH_ACTUAL[sdk=macosx*] = $(WEBKIT2_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
SKIP_INSTALL = YES;
Modified: trunk/Source/bmalloc/ChangeLog (183928 => 183929)
--- trunk/Source/bmalloc/ChangeLog 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/bmalloc/ChangeLog 2015-05-07 16:26:59 UTC (rev 183929)
@@ -1,3 +1,13 @@
+2015-05-07 Dan Bernstein <m...@apple.com>
+
+ <rdar://problem/19317140> [Xcode] Remove usage of AspenFamily.xcconfig in Source/
+ https://bugs.webkit.org/show_bug.cgi?id=144727
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Dont’s include AspenFamily.xcconfig, and define
+ INSTALL_PATH_PREFIX for the iOS 8.x Simulator.
+
2015-04-01 Alex Christensen <achristen...@webkit.org>
Progress towards CMake on Windows and Mac.
Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (183928 => 183929)
--- trunk/Source/bmalloc/Configurations/Base.xcconfig 2015-05-07 15:56:40 UTC (rev 183928)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig 2015-05-07 16:26:59 UTC (rev 183929)
@@ -21,7 +21,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
@@ -105,6 +104,7 @@
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;
