Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (171211 => 171212)
--- trunk/Source/_javascript_Core/ChangeLog 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,3 +1,18 @@
+2014-07-17 David Kilzer <[email protected]>
+
+ SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
+ <http://webkit.org/b/135006>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Move SECTORDER_FLAGS to
+ _javascript_Core.xcconfig.
+ * Configurations/CompileRuntimeToLLVMIR.xcconfig: Remove empty
+ SECTORDER_FLAGS definition.
+ * Configurations/DebugRelease.xcconfig: Ditto.
+ * Configurations/_javascript_Core.xcconfig: Use $(CONFIGURATION)
+ so SECTORDER_FLAGS is only set on Production builds.
+
2014-07-17 Juergen Ributzka <[email protected]>
Disable live-out calculation for stackmap intrinsics.
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (171211 => 171212)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2011, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2011, 2013, 2014 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -144,10 +144,6 @@
DEAD_CODE_STRIPPING_normal = YES;
DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
-SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME));
-SECTORDER_FLAGS_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/_javascript_Core.order;
-SECTORDER_FLAGS_macosx = -Wl,-order_file,_javascript_Core.order;
-
SDKROOT = macosx.internal;
INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
Modified: trunk/Source/_javascript_Core/Configurations/CompileRuntimeToLLVMIR.xcconfig (171211 => 171212)
--- trunk/Source/_javascript_Core/Configurations/CompileRuntimeToLLVMIR.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/_javascript_Core/Configurations/CompileRuntimeToLLVMIR.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -34,8 +34,6 @@
HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core" $(HEADER_SEARCH_PATHS);
-SECTORDER_FLAGS = ;
-
OTHER_CFLAGS = -c -flto;
OTHER_CPLUSPLUSFLAGS = -c -flto;
OTHER_LDFLAGS = ;
Modified: trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig (171211 => 171212)
--- trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2013, 2014 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -38,8 +38,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-SECTORDER_FLAGS = ;
-
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (171211 => 171212)
--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2014 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -41,6 +41,11 @@
OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE);
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -framework CoreServices;
+
+SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION)_$(PLATFORM_NAME));
+SECTORDER_FLAGS_Production_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/_javascript_Core.order;
+SECTORDER_FLAGS_Production_macosx = -Wl,-order_file,_javascript_Core.order;
+
GCC_PREFIX_HEADER = _javascript_CorePrefix.h;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core" $(HEADER_SEARCH_PATHS);
Modified: trunk/Source/WebCore/ChangeLog (171211 => 171212)
--- trunk/Source/WebCore/ChangeLog 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebCore/ChangeLog 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,3 +1,19 @@
+2014-07-17 David Kilzer <[email protected]>
+
+ SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
+ <http://webkit.org/b/135006>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Move SECTORDER_FLAGS to
+ WebCore.xcconfig.
+ * Configurations/DebugRelease.xcconfig: Remove empty
+ SECTORDER_FLAGS definition.
+ * Configurations/WebCoreTestShim.xcconfig: Ditto.
+ * Configurations/WebCoreTestSupport.xcconfig: Ditto.
+ * Configurations/WebCore.xcconfig: Use $(CONFIGURATION) so
+ SECTORDER_FLAGS is only set on Production builds.
+
2014-07-17 Zalan Bujtas <[email protected]>
Subpixel rendering: Embedded non-compositing rotate transform paints to wrong position.
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (171211 => 171212)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2013, 2014 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -108,10 +108,6 @@
DEAD_CODE_STRIPPING_normal = YES;
DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
-SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME));
-SECTORDER_FLAGS_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebCore.order;
-SECTORDER_FLAGS_macosx = -Wl,-order_file,WebCore.order;
-
WEBCORE_SQLITE3_HEADER_SEARCH_PATHS = $(NEXT_ROOT)/usr/local/include/WebCoreSQLite3;
SQLITE3_HEADER_SEARCH_PATHS = $(SQLITE3_HEADER_SEARCH_PATHS_$(PLATFORM_NAME));
SQLITE3_HEADER_SEARCH_PATHS_macosx = $(SQLITE3_HEADER_SEARCH_PATHS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (171211 => 171212)
--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2013, 2014 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -38,8 +38,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-SECTORDER_FLAGS = ;
-
WEBCORE_SQLITE3_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/WebCoreSQLite3;
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (171211 => 171212)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2014 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -75,6 +75,10 @@
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -lMobileGestalt;
OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework IOSurface -framework OpenGL;
+SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION)_$(PLATFORM_NAME));
+SECTORDER_FLAGS_Production_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebCore.order;
+SECTORDER_FLAGS_Production_macosx = -Wl,-order_file,WebCore.order;
+
NORMAL_WEBCORE_FRAMEWORKS_DIR = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
NORMAL_WEBCORE_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
NORMAL_WEBCORE_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
Modified: trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig (171211 => 171212)
--- trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,4 +1,4 @@
-// Copyright (C) 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -39,4 +39,3 @@
EXPORTED_SYMBOLS_FILE = ;
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
OTHER_LDFLAGS[sdk=macosx*] = $(ASAN_OTHER_LDFLAGS) -framework Carbon;
-SECTORDER_FLAGS = ;
Modified: trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig (171211 => 171212)
--- trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,4 +1,5 @@
// Copyright (C) 2011 Google Inc. All rights reserved.
+// Copyright (C) 2014 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -51,4 +52,3 @@
EXPORTED_SYMBOLS_FILE = ;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-SECTORDER_FLAGS = ;
Modified: trunk/Source/WebKit/ChangeLog (171211 => 171212)
--- trunk/Source/WebKit/ChangeLog 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebKit/ChangeLog 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,3 +1,13 @@
+2014-07-17 David Kilzer <[email protected]>
+
+ SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
+ <http://webkit.org/b/135006>
+
+ Reviewed by Darin Adler.
+
+ * WebKit.xcodeproj/project.pbxproj: Remove references to unused
+ WebKit.xcconfig file.
+
2014-07-09 Brent Fulgham <[email protected]>
[Win] Remove uses of 'bash' in build system
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (171211 => 171212)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-07-18 03:59:47 UTC (rev 171212)
@@ -501,7 +501,6 @@
1AAF5FBE0EDE3A92008D883D /* WebHostedNetscapePluginView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebHostedNetscapePluginView.mm; sourceTree = "<group>"; };
1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewGroup.mm; sourceTree = "<group>"; };
1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewGroup.h; sourceTree = "<group>"; };
- 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEventHandler.h; sourceTree = "<group>"; };
1AEA66D30DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNetscapePluginEventHandler.mm; sourceTree = "<group>"; };
1AEA66D60DC6B209003D12BF /* WebNetscapePluginEventHandlerCarbon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEventHandlerCarbon.h; sourceTree = "<group>"; };
@@ -1057,7 +1056,6 @@
FEE7D6910D99B06A005351F6 /* iOS.xcconfig */,
1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */,
1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */,
- 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */,
);
name = Configurations;
path = mac/Configurations;
Modified: trunk/Source/WebKit/mac/ChangeLog (171211 => 171212)
--- trunk/Source/WebKit/mac/ChangeLog 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,3 +1,18 @@
+2014-07-17 David Kilzer <[email protected]>
+
+ SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
+ <http://webkit.org/b/135006>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Move SECTORDER_FLAGS to
+ WebKitLegacy.xcconfig.
+ * Configurations/DebugRelease.xcconfig: Remove empty
+ SECTORDER_FLAGS definition.
+ * Configurations/WebKit.xcconfig: Removed. Unused.
+ * Configurations/WebKitLegacy.xcconfig: Use $(CONFIGURATION) so
+ SECTORDER_FLAGS is only set on Production builds.
+
2014-07-17 Timothy Hatcher <[email protected]>
Make console.profile record to the Timeline.
Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (171211 => 171212)
--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2013, 2014 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -101,10 +101,6 @@
// building the MiG bindings for WebKitPluginClient even when the functions that the bindings wrap are not built.
DEAD_CODE_STRIPPING = YES;
-SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME));
-SECTORDER_FLAGS_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKitLegacy.order;
-SECTORDER_FLAGS_macosx = -Wl,-order_file,mac/WebKit.order;
-
SDKROOT = macosx.internal;
SUPPORTED_PLATFORMS = iphonesimulator iphoneos macosx;
Modified: trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig (171211 => 171212)
--- trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2013, 2014 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -38,8 +38,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-SECTORDER_FLAGS = ;
-
WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterface;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos);
Deleted: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (171211 => 171212)
--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,99 +0,0 @@
-// Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (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 "FeatureDefines.xcconfig"
-#include "Version.xcconfig"
-
-FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME));
-FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
-FRAMEWORK_SEARCH_PATHS_iphoneos_Debug = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
-FRAMEWORK_SEARCH_PATHS_iphoneos_Release = $(FRAMEWORK_SEARCH_PATHS_iphoneos_Debug);
-FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(PRODUCTION_FRAMEWORKS_DIR);
-FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
-FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(UMBRELLA_FRAMEWORKS_DIR) $(WEBKIT2_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS);
-UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
-
-STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
-STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-
-INFOPLIST_FILE = mac/WebKitLegacy/Info.plist;
-INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
-INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/Frameworks;
-INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
-INSTALL_PATH_macosx = $(WEBKIT_FRAMEWORKS_DIR);
-INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
-INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
-
-DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
-DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/Frameworks;
-DYLIB_INSTALL_NAME_BASE_iphonesimulator = $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos);
-DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT_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_FRAMEWORKS_DIR_macosx = $(WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
-WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
-WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-
-NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
-NORMAL_WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
-NORMAL_WEBKIT_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;
-
-NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
-
-PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
-PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR_iphoneos);
-PRODUCTION_FRAMEWORKS_DIR_macosx = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx);
-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-
-WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(CONFIGURATION));
-WEBKIT2_FRAMEWORKS_DIR_Release = $(WEBKIT2_FRAMEWORKS_DIR_engineering);
-WEBKIT2_FRAMEWORKS_DIR_Debug = $(WEBKIT2_FRAMEWORKS_DIR_engineering);
-WEBKIT2_FRAMEWORKS_DIR_Production = $(SDKROOT)$(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_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)
-
-INSTALLHDRS_COPY_PHASE = YES;
-INSTALLHDRS_SCRIPT_PHASE = YES;
-PRODUCT_NAME = WebKit;
-
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = -framework WebKitLegacy -sub_umbrella WebKitLegacy
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
-OTHER_LDFLAGS_macosx = -framework WebCore -sub_umbrella WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy -framework WebKit2 -sub_umbrella WebKit2
-
-PRODUCTION_ROOT = $(PRODUCTION_ROOT_$(REAL_PLATORM_NAME));
-PRODUCTION_ROOT_iphoneos = $(SDKROOT);
-PRODUCTION_ROOT_iphonesimulator = $(SDKROOT);
-PRODUCTION_ROOT_macosx = $(NEXT_ROOT);
Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (171211 => 171212)
--- trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2014 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -89,6 +89,10 @@
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL;
+SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION)_$(PLATFORM_NAME));
+SECTORDER_FLAGS_Production_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKitLegacy.order;
+SECTORDER_FLAGS_Production_macosx = -Wl,-order_file,mac/WebKit.order;
+
NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_$(PLATFORM_NAME));
NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
Modified: trunk/Source/WebKit2/ChangeLog (171211 => 171212)
--- trunk/Source/WebKit2/ChangeLog 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,3 +1,17 @@
+2014-07-17 David Kilzer <[email protected]>
+
+ SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
+ <http://webkit.org/b/135006>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Move SECTORDER_FLAGS to
+ WebKit.xcconfig.
+ * Configurations/DebugRelease.xcconfig: Remove empty
+ SECTORDER_FLAGS definition.
+ * Configurations/WebKit.xcconfig: Use $(CONFIGURATION) so
+ SECTORDER_FLAGS is only set on Production builds.
+
2014-07-17 Alexey Proskuryakov <[email protected]>
REGRESSION (r171167): LoaderClient processDidCrash call is made after load state changes
Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (171211 => 171212)
--- trunk/Source/WebKit2/Configurations/Base.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebKit2/Configurations/Base.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,4 +1,4 @@
-// Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2010, 2013, 2014 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -99,10 +99,6 @@
// building the MiG bindings for WebKitPluginClient even when the functions that the bindings wrap are not built.
DEAD_CODE_STRIPPING = YES;
-SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME));
-SECTORDER_FLAGS_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKit.order;
-SECTORDER_FLAGS_macosx = -Wl,-order_file,mac/WebKit2.order;
-
INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
SDKROOT = macosx.internal;
Modified: trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig (171211 => 171212)
--- trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2013, 2014 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -35,8 +35,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-SECTORDER_FLAGS = ;
-
WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterface;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos);
Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (171211 => 171212)
--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2014-07-18 02:16:00 UTC (rev 171211)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2014-07-18 03:59:47 UTC (rev 171212)
@@ -42,6 +42,10 @@
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
OTHER_LDFLAGS_macosx = $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -sub_umbrella WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy;
+SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION)_$(PLATFORM_NAME));
+SECTORDER_FLAGS_Production_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKit.order;
+SECTORDER_FLAGS_Production_macosx = -Wl,-order_file,mac/WebKit2.order;
+
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
