Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (240667 => 240668)
--- trunk/Source/_javascript_Core/ChangeLog 2019-01-29 19:54:32 UTC (rev 240667)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-01-29 20:05:47 UTC (rev 240668)
@@ -1,3 +1,24 @@
+2019-01-29 Keith Rollin <[email protected]>
+
+ Add .xcfilelists to Run Script build phases
+ https://bugs.webkit.org/show_bug.cgi?id=193792
+ <rdar://problem/47201785>
+
+ Reviewed by Alex Christensen.
+
+ As part of supporting XCBuild, update the necessary Run Script build
+ phases in their Xcode projects to refer to their associated
+ .xcfilelist files.
+
+ Note that the addition of these files bumps the Xcode project version
+ number to something that's Xcode 10 compatible. This change means that
+ older versions of the Xcode IDE can't read these projects. Nor can it
+ fully load workspaces that refer to these projects (the updated
+ projects are shown as non-expandable placeholders). `xcodebuild` can
+ still build these projects; it's just that the IDE can't open them.
+
+ * _javascript_Core.xcodeproj/project.pbxproj:
+
2019-01-29 Dominik Infuehr <[email protected]>
[ARM] Check for negative zero instead of just zero
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (240667 => 240668)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2019-01-29 19:54:32 UTC (rev 240667)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2019-01-29 20:05:47 UTC (rev 240668)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 51;
objects = {
/* Begin PBXAggregateTarget section */
@@ -10280,10 +10280,14 @@
buildActionMask = 2147483647;
files = (
);
+ inputFileListPaths = (
+ "$(SRCROOT)/UnifiedSources-input.xcfilelist",
+ );
inputPaths = (
);
name = "Generate Unified Sources";
outputFileListPaths = (
+ "$(SRCROOT)/UnifiedSources-output.xcfilelist",
);
outputPaths = (
);
@@ -10389,10 +10393,14 @@
buildActionMask = 2147483647;
files = (
);
+ inputFileListPaths = (
+ "$(SRCROOT)/DerivedSources-input.xcfilelist",
+ );
inputPaths = (
);
name = "Generate Derived Sources";
outputFileListPaths = (
+ "$(SRCROOT)/DerivedSources-output.xcfilelist",
);
outputPaths = (
);
Modified: trunk/Source/WebCore/ChangeLog (240667 => 240668)
--- trunk/Source/WebCore/ChangeLog 2019-01-29 19:54:32 UTC (rev 240667)
+++ trunk/Source/WebCore/ChangeLog 2019-01-29 20:05:47 UTC (rev 240668)
@@ -1,3 +1,31 @@
+2019-01-29 Keith Rollin <[email protected]>
+
+ Add .xcfilelists to Run Script build phases
+ https://bugs.webkit.org/show_bug.cgi?id=193792
+ <rdar://problem/47201785>
+
+ Reviewed by Alex Christensen.
+
+ As part of supporting XCBuild, update the necessary Run Script build
+ phases in their Xcode projects to refer to their associated
+ .xcfilelist files.
+
+ Note that the addition of these files bumps the Xcode project version
+ number to something that's Xcode 10 compatible. This change means that
+ older versions of the Xcode IDE can't read these projects. Nor can it
+ fully load workspaces that refer to these projects (the updated
+ projects are shown as non-expandable placeholders). `xcodebuild` can
+ still build these projects; it's just that the IDE can't open them.
+
+ Make special accommodations for incorporating .xcfilelists from
+ WebKitAdditions.
+
+ No new tests since there should be no observable behavior difference.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/DebugRelease.xcconfig:
+ * WebCore.xcodeproj/project.pbxproj:
+
2019-01-29 John Wilander <[email protected]>
Add data abstraction and validation for Ad Click Attribution
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (240667 => 240668)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2019-01-29 19:54:32 UTC (rev 240667)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2019-01-29 20:05:47 UTC (rev 240668)
@@ -138,6 +138,11 @@
WK_COCOA_TOUCH_appletvsimulator = cocoatouch;
WK_IS_COCOA_TOUCH = $(WK_NOT_$(WK_EMPTY_$(WK_COCOA_TOUCH)));
+WK_WEBKITADDITIONS_INSTALL_PATH = /usr/local/include/WebKitAdditions
+WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH = $(SDKROOT)/$(WK_WEBKITADDITIONS_INSTALL_PATH)
+WK_WEBCORE_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/WebCore/DerivedSources-input.xcfilelist
+WK_WEBCORE_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/WebCore/DerivedSources-output.xcfilelist
+
// Attempting to build WebCore with full LTO for i386 results in the following
// linker error, so we drop down to "thin" for that architecture if we were to
// otherwise attempt to use "full".
Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (240667 => 240668)
--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2019-01-29 19:54:32 UTC (rev 240667)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2019-01-29 20:05:47 UTC (rev 240668)
@@ -49,3 +49,11 @@
WK_CCACHE_DIR = $(SRCROOT)/../../Tools/ccache;
#include "../../../Tools/ccache/ccache.xcconfig"
+
+WK_WEBCORE_ADDITIONS_PATH = ../../../Internal/WebKit/WebKitAdditions/Additions/WebCore
+WK_WEBCORE_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS = $(WK_WEBCORE_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS_$(USE_INTERNAL_SDK))
+WK_WEBCORE_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS_ =
+WK_WEBCORE_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS_YES = $(WK_WEBCORE_ADDITIONS_PATH)/DerivedSources-input.xcfilelist
+WK_WEBCORE_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS = $(WK_WEBCORE_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS_$(USE_INTERNAL_SDK))
+WK_WEBCORE_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS_ =
+WK_WEBCORE_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS_YES = $(WK_WEBCORE_ADDITIONS_PATH)/DerivedSources-output.xcfilelist
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (240667 => 240668)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2019-01-29 19:54:32 UTC (rev 240667)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2019-01-29 20:05:47 UTC (rev 240668)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 51;
objects = {
/* Begin PBXAggregateTarget section */
@@ -32632,10 +32632,14 @@
buildActionMask = 2147483647;
files = (
);
+ inputFileListPaths = (
+ "$(SRCROOT)/UnifiedSources-input.xcfilelist",
+ );
inputPaths = (
);
name = "Generate Unified Sources";
outputFileListPaths = (
+ "$(SRCROOT)/UnifiedSources-output.xcfilelist",
);
outputPaths = (
);
@@ -32754,10 +32758,16 @@
buildActionMask = 2147483647;
files = (
);
+ inputFileListPaths = (
+ "$(SRCROOT)/DerivedSources-input.xcfilelist",
+ "$(WK_WEBCORE_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS)",
+ );
inputPaths = (
);
name = "Generate Derived Sources";
outputFileListPaths = (
+ "$(SRCROOT)/DerivedSources-output.xcfilelist",
+ "$(WK_WEBCORE_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS)",
);
outputPaths = (
);
Modified: trunk/Source/WebKit/ChangeLog (240667 => 240668)
--- trunk/Source/WebKit/ChangeLog 2019-01-29 19:54:32 UTC (rev 240667)
+++ trunk/Source/WebKit/ChangeLog 2019-01-29 20:05:47 UTC (rev 240668)
@@ -1,3 +1,29 @@
+2019-01-29 Keith Rollin <[email protected]>
+
+ Add .xcfilelists to Run Script build phases
+ https://bugs.webkit.org/show_bug.cgi?id=193792
+ <rdar://problem/47201785>
+
+ Reviewed by Alex Christensen.
+
+ As part of supporting XCBuild, update the necessary Run Script build
+ phases in their Xcode projects to refer to their associated
+ .xcfilelist files.
+
+ Note that the addition of these files bumps the Xcode project version
+ number to something that's Xcode 10 compatible. This change means that
+ older versions of the Xcode IDE can't read these projects. Nor can it
+ fully load workspaces that refer to these projects (the updated
+ projects are shown as non-expandable placeholders). `xcodebuild` can
+ still build these projects; it's just that the IDE can't open them.
+
+ Make special accommodations for incorporating .xcfilelists from
+ WebKitAdditions.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/DebugRelease.xcconfig:
+ * WebKit.xcodeproj/project.pbxproj:
+
2019-01-29 Antti Koivisto <[email protected]>
REGRESSION (PSON): Flash on link navigation on Mac
Modified: trunk/Source/WebKit/Configurations/Base.xcconfig (240667 => 240668)
--- trunk/Source/WebKit/Configurations/Base.xcconfig 2019-01-29 19:54:32 UTC (rev 240667)
+++ trunk/Source/WebKit/Configurations/Base.xcconfig 2019-01-29 20:05:47 UTC (rev 240668)
@@ -152,6 +152,11 @@
WK_USE_RESTRICTED_ENTITLEMENTS = $(USE_INTERNAL_SDK);
+WK_WEBKITADDITIONS_INSTALL_PATH = /usr/local/include/WebKitAdditions
+WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH = $(SDKROOT)/$(WK_WEBKITADDITIONS_INSTALL_PATH)
+WK_WEBKIT_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/WebKit/DerivedSources-input.xcfilelist
+WK_WEBKIT_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/WebKit/DerivedSources-output.xcfilelist
+
LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
WK_LLVM_LTO_NO = NO;
WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
Modified: trunk/Source/WebKit/Configurations/DebugRelease.xcconfig (240667 => 240668)
--- trunk/Source/WebKit/Configurations/DebugRelease.xcconfig 2019-01-29 19:54:32 UTC (rev 240667)
+++ trunk/Source/WebKit/Configurations/DebugRelease.xcconfig 2019-01-29 20:05:47 UTC (rev 240668)
@@ -60,3 +60,11 @@
WK_CCACHE_DIR = $(SRCROOT)/../../Tools/ccache;
#include "../../../Tools/ccache/ccache.xcconfig"
+
+WK_WEBKIT_ADDITIONS_PATH = ../../../Internal/WebKit/WebKitAdditions/Additions/WebKit
+WK_WEBKIT_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS = $(WK_WEBKIT_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS_$(USE_INTERNAL_SDK))
+WK_WEBKIT_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS_ =
+WK_WEBKIT_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS_YES = $(WK_WEBKIT_ADDITIONS_PATH)/DerivedSources-input.xcfilelist
+WK_WEBKIT_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS = $(WK_WEBKIT_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS_$(USE_INTERNAL_SDK))
+WK_WEBKIT_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS_ =
+WK_WEBKIT_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS_YES = $(WK_WEBKIT_ADDITIONS_PATH)/DerivedSources-output.xcfilelist
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (240667 => 240668)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-01-29 19:54:32 UTC (rev 240667)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-01-29 20:05:47 UTC (rev 240668)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 51;
objects = {
/* Begin PBXAggregateTarget section */
@@ -10336,9 +10336,15 @@
buildActionMask = 2147483647;
files = (
);
+ inputFileListPaths = (
+ "$(SRCROOT)/UnifiedSources-input.xcfilelist",
+ );
inputPaths = (
);
name = "Generate Unified Sources";
+ outputFileListPaths = (
+ "$(SRCROOT)/UnifiedSources-output.xcfilelist",
+ );
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
@@ -10717,9 +10723,17 @@
buildActionMask = 2147483647;
files = (
);
+ inputFileListPaths = (
+ "$(SRCROOT)/DerivedSources-input.xcfilelist",
+ "$(WK_WEBKIT_INPUT_XCFILELIST_ADDITIONS)",
+ );
inputPaths = (
);
name = "Generate Derived Sources";
+ outputFileListPaths = (
+ "$(SRCROOT)/DerivedSources-output.xcfilelist",
+ "$(WK_WEBKIT_OUTPUT_XCFILELIST_ADDITIONS)",
+ );
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Modified: trunk/Tools/ChangeLog (240667 => 240668)
--- trunk/Tools/ChangeLog 2019-01-29 19:54:32 UTC (rev 240667)
+++ trunk/Tools/ChangeLog 2019-01-29 20:05:47 UTC (rev 240668)
@@ -1,3 +1,25 @@
+2019-01-29 Keith Rollin <[email protected]>
+
+ Add .xcfilelists to Run Script build phases
+ https://bugs.webkit.org/show_bug.cgi?id=193792
+ <rdar://problem/47201785>
+
+ Reviewed by Alex Christensen.
+
+ As part of supporting XCBuild, update the necessary Run Script build
+ phases in their Xcode projects to refer to their associated
+ .xcfilelist files.
+
+ Note that the addition of these files bumps the Xcode project version
+ number to something that's Xcode 10 compatible. This change means that
+ older versions of the Xcode IDE can't read these projects. Nor can it
+ fully load workspaces that refer to these projects (the updated
+ projects are shown as non-expandable placeholders). `xcodebuild` can
+ still build these projects; it's just that the IDE can't open them.
+
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
+
2019-01-29 John Wilander <[email protected]>
Add data abstraction and validation for Ad Click Attribution
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (240667 => 240668)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2019-01-29 19:54:32 UTC (rev 240667)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2019-01-29 20:05:47 UTC (rev 240668)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 51;
objects = {
/* Begin PBXAggregateTarget section */
@@ -1030,8 +1030,14 @@
buildActionMask = 2147483647;
files = (
);
+ inputFileListPaths = (
+ "$(SRCROOT)/DerivedSources-input.xcfilelist",
+ );
inputPaths = (
);
+ outputFileListPaths = (
+ "$(SRCROOT)/DerivedSources-output.xcfilelist",
+ );
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (240667 => 240668)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2019-01-29 19:54:32 UTC (rev 240667)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2019-01-29 20:05:47 UTC (rev 240668)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 51;
objects = {
/* Begin PBXAggregateTarget section */
@@ -1083,9 +1083,15 @@
buildActionMask = 2147483647;
files = (
);
+ inputFileListPaths = (
+ "$(SRCROOT)/DerivedSources-input.xcfilelist",
+ );
inputPaths = (
);
name = "Generate Derived Sources";
+ outputFileListPaths = (
+ "$(SRCROOT)/DerivedSources-output.xcfilelist",
+ );
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
