from:"emw"

[webkit-changes] [295755] trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

2022-06-22 Thread emw

Title: [295755] trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj








Revision 295755
Author e...@apple.com
Date 2022-06-22 16:33:57 -0700 (Wed, 22 Jun 2022)


Log Message
Fix CodeSign error caused by Product Dependencies phase
https://bugs.webkit.org/show_bug.cgi?id=241713

Unreviewed build fix.

Product Dependencies phases must be set to the "Products Directory"
destination. Otherwise, they unintentionally embed the dependencies into
their target's build product. This one must have been a default setting
that got overlooked.

* Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:

Canonical link: https://commits.webkit.org/251760@main

Modified Paths

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj




Diff

Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (295754 => 295755)

--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj	2022-06-22 23:01:03 UTC (rev 295754)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj	2022-06-22 23:33:57 UTC (rev 295755)
@@ -1721,7 +1721,7 @@
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
-			dstSubfolderSpec = 7;
+			dstSubfolderSpec = 16;
 			files = (
 DD42949F284BE0B7004D49ED /* WebKit.framework in Product Dependencies */,
 			);






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

[webkit-changes] [295752] trunk/Source

2022-06-22 Thread emw

Title: [295752] trunk/Source








Revision 295752
Author e...@apple.com
Date 2022-06-22 15:44:36 -0700 (Wed, 22 Jun 2022)


Log Message
[XCBuild] Fix validation errors caused by copying to symlink framework bundle directories

Unreviewed build fix.

Prefix a few destination paths with $(WK_FRAMEWORK_VERSION_PREFIX). The
build system needs to know the real paths these items are copied to for
it to be able to schedule them ahead of tasks which depend on them.

* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj: Remove
  "Copy Mig Files into Private Framework Headers" because it has no
  members. The files were removed in
  https://bugs.webkit.org/show_bug.cgi?id=232462.

Canonical link: https://commits.webkit.org/251757@main

Modified Paths

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (295751 => 295752)

--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2022-06-22 22:42:57 UTC (rev 295751)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2022-06-22 22:44:36 UTC (rev 295752)
@@ -5875,7 +5875,7 @@
 		3717D7E717ECC573003C276D /* Copy Scripts */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
-			dstPath = PrivateHeaders/Scripts;
+			dstPath = "$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders/Scripts";
 			dstSubfolderSpec = 1;
 			files = (
 F4BFB9851E1DDF9B00862C24 /* DumpEditingHistory.js in Copy Scripts */,


Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (295751 => 295752)

--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-06-22 22:42:57 UTC (rev 295751)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-06-22 22:44:36 UTC (rev 295752)
@@ -2668,7 +2668,7 @@
 		1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
-			dstPath = PrivateHeaders/Scripts/webkit;
+			dstPath = "$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders/Scripts/webkit";
 			dstSubfolderSpec = 1;
 			files = (
 1A07D2F81919B3A900ECDA16 /* __init__.py in Copy Message Generation Scripts */,


Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (295751 => 295752)

--- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj	2022-06-22 22:42:57 UTC (rev 295751)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj	2022-06-22 22:44:36 UTC (rev 295752)
@@ -722,19 +722,6 @@
 		};
 /* End PBXContainerItemProxy section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-		535E08CB2254637200DF00CA /* Copy Mig Files into Private Framework Headers */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = PrivateHeaders;
-			dstSubfolderSpec = 1;
-			files = (
-			);
-			name = "Copy Mig Files into Private Framework Headers";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
 		065AD5A10B0C32C7005A2B1D /* WebContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebContextMenuClient.h; sourceTree = ""; };
 		065AD5A20B0C32C7005A2B1D /* WebContextMenuClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMenuClient.mm; sourceTree = ""; };
@@ -3169,7 +3156,6 @@
 7C02321B251B9A8A00BA7BB6 /* Generate Preferences */,
 9398100D0824BF01008DF038 /* Headers */,
 DDF74CA027EE3E990011F633 /* (Legacy) Install Headers */,
-535E08CB2254637200DF00CA /* Copy Mig Files into Private Framework Headers */,
 939810B20824BF01008DF038 /* Resources */,
 1C395DE20C6BE8ED1E52 /* Generate Export Files */,
 939810BB0824BF01008DF038 /* Sources */,






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

[webkit-changes] [295605] trunk

2022-06-16 Thread emw

Title: [295605] trunk








Revision 295605
Author e...@apple.com
Date 2022-06-16 12:44:58 -0700 (Thu, 16 Jun 2022)


Log Message
Add lldbWebKitTester to WebKit.xcworkspace

Unreviewed test fix.

When we switched build-webkit to workspace builds in
https://commits.webkit.org/251501@main, we stopped building it.

lldbWebKitTester must only build on macOS. Add a "lldbWebKitTester
(Platform filters)" aggregate target that selectively builds
lldbWebKitTester on Mac only, like we did for MiniBrowser in
https://commits.webkit.org/251501@main. Update the relevant schemes to
build that aggregate.

We cannot rely on lldbWebKitTester's "SUPPORTED_PLATFORMS = macosx" as a
way to make it always build for Mac, because it depends on WTF and
therefore must only build if WTF is also being built for Mac.

* Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig: Claim to
  support every platform, so that the aggregate target is always
  buildable and able to apply a platform filter.
* Tools/lldb/lldbWebKitTester/Configurations/lldbWebKitTester.xcconfig:
  Move "SUPPORTED_PLATFORMS = macosx" here, because lldbWebKitTester
  really does need to be restricted to building for Mac.

* Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj:
* WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme:
* WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme:

Canonical link: https://commits.webkit.org/251610@main

Modified Paths

trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig
trunk/Tools/lldb/lldbWebKitTester/Configurations/lldbWebKitTester.xcconfig
trunk/Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj
trunk/WebKit.xcworkspace/contents.xcworkspacedata
trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme
trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme




Diff

Modified: trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig (295604 => 295605)

--- trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig	2022-06-16 19:33:07 UTC (rev 295604)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig	2022-06-16 19:44:58 UTC (rev 295605)
@@ -96,7 +96,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500
 
-SUPPORTED_PLATFORMS = macosx;
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
 DEAD_CODE_STRIPPING = YES;
 DEAD_CODE_STRIPPING[config=Debug] = NO;


Modified: trunk/Tools/lldb/lldbWebKitTester/Configurations/lldbWebKitTester.xcconfig (295604 => 295605)

--- trunk/Tools/lldb/lldbWebKitTester/Configurations/lldbWebKitTester.xcconfig	2022-06-16 19:33:07 UTC (rev 295604)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/lldbWebKitTester.xcconfig	2022-06-16 19:44:58 UTC (rev 295605)
@@ -26,6 +26,8 @@
 RELEASE_DEFINES = RELEASE_WITHOUT_OPTIMIZATIONS;
 RELEASE_DEFINES[config=Debug] = ;
 
+SUPPORTED_PLATFORMS = macosx;
+
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(RELEASE_DEFINES);
 GCC_OPTIMIZATION_LEVEL = 0;
 STRIP_INSTALLED_PRODUCT = NO;


Modified: trunk/Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj (295604 => 295605)

--- trunk/Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj	2022-06-16 19:33:07 UTC (rev 295604)
+++ trunk/Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj	2022-06-16 19:44:58 UTC (rev 295605)
@@ -6,6 +6,20 @@
 	objectVersion = 46;
 	objects = {
 
+/* Begin PBXAggregateTarget section */
+		DD1EB7BA285AB55600CD5D9C /* lldbWebKitTester (Platform filters) */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = DD1EB7BD285AB55600CD5D9C /* Build configuration list for PBXAggregateTarget "lldbWebKitTester (Platform filters)" */;
+			buildPhases = (
+			);
+			dependencies = (
+DD1EB7BF285AB55B00CD5D9C /* PBXTargetDependency */,
+			);
+			name = "lldbWebKitTester (Platform filters)";
+			productName = "lldbWebKitTester (Platform filters)";
+		};
+/* End PBXAggregateTarget section */
+
 /* Begin PBXBuildFile section */
 		0FC1C35420E5391E001E9FB0 /* DumpClassLayoutTesting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC1C35320E5391E001E9FB0 /* DumpClassLayoutTesting.cpp */; };
 		7CB6844B1AFA7978002B305C /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CB6844A1AFA7978002B305C /* main.cpp */; };
@@ -13,6 +27,16 @@
 		CE6C3B0120C0C444003E33D8 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6C3B0020C0C443003E33D8 /* libicucore.dylib */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		DD1EB7BE285AB55B00CD5D9C /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7C4AB3991AF0276C003FC8D1 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7C4AB3A01AF0276C003FC8D1;
+			remoteInfo = lldbWebKitTester;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		7C4AB

[webkit-changes] [295577] trunk/Tools/Scripts/build-webkit

2022-06-15 Thread emw

Title: [295577] trunk/Tools/Scripts/build-webkit








Revision 295577
Author e...@apple.com
Date 2022-06-15 15:46:32 -0700 (Wed, 15 Jun 2022)


Log Message
[build-webkit] Don't run build-imagediff when cleaning with Xcode
https://bugs.webkit.org/show_bug.cgi?id=241624

Reviewed by Jonathan Bedard.

Fixes "error: Unknown build action ' --clean'" from xcodebuild, as
build-webkit was passing the --clean argument to build-imagediff with an
extra space.

Since the move to XCBuild, cleaning deletes the whole build directory,
so there is nothing left for build-imagediff to clean and we skip this
step altogether.

* Tools/Scripts/build-webkit:

Canonical link: https://commits.webkit.org/251581@main

Modified Paths

trunk/Tools/Scripts/build-webkit




Diff

Modified: trunk/Tools/Scripts/build-webkit (295576 => 295577)

--- trunk/Tools/Scripts/build-webkit	2022-06-15 22:46:27 UTC (rev 295576)
+++ trunk/Tools/Scripts/build-webkit	2022-06-15 22:46:32 UTC (rev 295577)
@@ -384,6 +384,11 @@
 exit exitStatus($result);
 }
 
+if ($clean) {
+# No need to have build-imagediff do cleaning, the build directory has already been deleted.
+exit exitStatus($result);
+}
+
 # Build ImageDiff for host
 my @command = File::Spec->catfile(getcwd(), "/Tools/Scripts/build-imagediff");
 chdirWebKit();
@@ -391,9 +396,6 @@
 die "build-imagediff script not found";
 }
 
-if ($clean) {
-push @command, " --clean";
-}
 push @command, argumentsForConfiguration();
 push @command, @ARGV;
 @command = extractNonMacOSHostConfiguration(\@command);






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

[webkit-changes] [295543] trunk/Tools/CISupport/built-product-archive

2022-06-14 Thread emw

Title: [295543] trunk/Tools/CISupport/built-product-archive








Revision 295543
Author e...@apple.com
Date 2022-06-14 15:51:38 -0700 (Tue, 14 Jun 2022)


Log Message
Refactor built-product-archive to avoid deleting build products
https://bugs.webkit.org/show_bug.cgi?id=241586

Reviewed by Jonathan Bedard.

Deleting build products interferes with subsequent incremental builds.
Change the script to filter out what gets added to the archive, instead
of deleting from the directory being archived.

On Darwin-based platforms, this is done with mkbom and ditto's --bom
option, and surfaced in createZip via an `excludePatterns` argument.

Additionally, clean up the top-level logic before calling into
createZip, so that it doesn't need to know about the --minify option.

* Tools/CISupport/built-product-archive:

Canonical link: https://commits.webkit.org/251548@main

Modified Paths

trunk/Tools/CISupport/built-product-archive




Diff

Modified: trunk/Tools/CISupport/built-product-archive (295542 => 295543)

--- trunk/Tools/CISupport/built-product-archive	2022-06-14 22:22:40 UTC (rev 295542)
+++ trunk/Tools/CISupport/built-product-archive	2022-06-14 22:51:38 UTC (rev 295543)
@@ -26,6 +26,7 @@
 
 from __future__ import print_function
 import errno
+import fnmatch
 import optparse
 import os
 import shutil
@@ -146,10 +147,8 @@
 command = ['/usr/bin/zip', '-j', archiveFile, pathToLauncher, pathToReadme]
 return subprocess.call(command)
 
-def createZip(directoryToZip, configuration, embedParentDirectoryNameOnDarwin=False, minify=False):
+def createZip(directoryToZip, configuration, excludePatterns=None, embedParentDirectoryNameOnDarwin=False):
 archiveDir = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "WebKitBuild"))
-if minify:
-configuration = 'minified-' + configuration
 archiveFile = os.path.join(archiveDir, configuration + ".zip")
 
 try:
@@ -159,18 +158,50 @@
 raise
 
 if sys.platform == 'darwin':
-command = ['ditto', '-c', '-k', '--sequesterRsrc']
+command = ['ditto', '-ckv', '--sequesterRsrc']
 if embedParentDirectoryNameOnDarwin:
 command += ['--keepParent']
+if excludePatterns:
+bomFile = os.path.join(archiveDir, configuration + '.bom')
+mkbom = subprocess.Popen(('mkbom', '-s', '-i-', bomFile), stdin=subprocess.PIPE, text=True)
+for root, dirs, files in os.walk(directoryToZip):
+relativePath = root.replace(directoryToZip, '.', 1)
+mkbom.stdin.write(relativePath + '\n')
+for name in files:
+archiveMemberName = os.path.join(relativePath, name)
+if any(fnmatch.fnmatch(name, pattern) for pattern in excludePatterns):
+print('Ignoring:', archiveMemberName)
+else:
+mkbom.stdin.write(archiveMemberName + '\n')
+dirsToIgnore = {name for pattern in excludePatterns for name in fnmatch.filter(dirs, pattern)}
+for name in reversed(dirs):
+if name not in dirsToIgnore:
+continue
+print('Ignoring:', os.path.join(relativePath, name))
+dirs.remove(name)
+mkbom.stdin.close()
+if mkbom.wait():
+return 1
+command += ['--bom', bomFile]
 command += [directoryToZip, archiveFile]
-return subprocess.call(command) or addFilesToArchive(archiveFile, PATH_TO_LAUNCHER, PATH_TO_README) 
+return subprocess.call(command) or addFilesToArchive(archiveFile, PATH_TO_LAUNCHER, PATH_TO_README)
 elif sys.platform == 'cygwin':
-return subprocess.call(["zip", "-r", archiveFile, "bin64"], cwd=directoryToZip)
+zipCommand = ["zip", "-r", archiveFile, "bin64"]
+if excludePatterns:
+for excludePattern in excludePatterns:
+zipCommand += ['-x', excludePattern]
+return subprocess.call(zipCommand, cwd=directoryToZip)
 elif sys.platform == 'win32':
+if excludePatterns:
+raise NotImplementedError('win32 createZip does not support exclude patterns')
 createZipManually(directoryToZip, archiveFile)
 return 0
 elif sys.platform.startswith('linux'):
-return subprocess.call(["zip", "-y", "-r", archiveFile, "."], cwd=directoryToZip)
+zipCommand = ["zip", "-y", "-r", archiveFile, "."]
+if excludePatterns:
+for excludePattern in excludePatterns:
+zipCommand += ['-x', excludePattern]
+return subprocess.call(zipCommand, cwd=directoryToZip)
 
 
 def dirContainsdwo(directory):
@@ -181,21 +212,8 @@
 return True
 return False
 
+MINIFIED_EXCLUDED_PATTERNS = ('*.a', '*.dSYM', 'DerivedSources')
 
-def minifyDirectory(platform, directory):
-if platform in ['mac', 'ios', 'tvos', 'watchos']:
-

[webkit-changes] [295496] trunk

2022-06-13 Thread emw

Title: [295496] trunk








Revision 295496
Author e...@apple.com
Date 2022-06-13 12:20:59 -0700 (Mon, 13 Jun 2022)


Log Message
[Xcode] Use workspace builds by default in build-webkit
https://bugs.webkit.org/show_bug.cgi?id=241298

Reviewed by Alexey Proskuryakov.

Switch the default value of the --use-workspace flag, and add a warning
message indicating that non-workspace Xcode builds are deprecated.

Add product dependencies and disable SDK metadata parsing in tools
projects, to prevent watchOS/tvOS workspace builds from thinking we are
linking against system WebKit.

Add an aggregate "MiniBrowser (Platform filters)" target, which builds
MiniBrowser.app iff the workspace is building for a Mac destination.

* Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig: Fix
  an sdk xcconfig setting.
* Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig:
  Set DISABLE_SDK_METADATA_PARSING.
* Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig: Set
  DISABLE_SDK_METADATA_PARSING.
* Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj: Create the
  aggregate target mentioned above.
* Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj:
  Link MobileMiniBrowser.framework against WebKit.
* Tools/Scripts/build-webkit: Switch --use-workspace default.
* Tools/TestWebKitAPI/Configurations/InjectedBundle.xcconfig: Set
  DISABLE_SDK_METADATA_PARSING.
* Tools/TestWebKitAPI/Configurations/TestWTFLibrary.xcconfig: Set
  DISABLE_SDK_METADATA_PARSING.
* Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig: Set
  DISABLE_SDK_METADATA_PARSING.
* Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Add
  WebKit product dependency.
* Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig: Add
  DISABLE_SDK_METADATA_PARSING.
* Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig: Add
  DISABLE_SDK_METADATA_PARSING.
* WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme:
  Replace MiniBrowser.app with the aggregate target.
* WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme: Replace
  MiniBrowser.app with the aggregate target.

Canonical link: https://commits.webkit.org/251501@main

Modified Paths

trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig
trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig
trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig
trunk/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj
trunk/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj
trunk/Tools/Scripts/build-webkit
trunk/Tools/TestWebKitAPI/Configurations/InjectedBundle.xcconfig
trunk/Tools/TestWebKitAPI/Configurations/TestWTFLibrary.xcconfig
trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig
trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig
trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig
trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme
trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme




Diff

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig (295495 => 295496)

--- trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig	2022-06-13 18:51:54 UTC (rev 295495)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig	2022-06-13 19:20:59 UTC (rev 295496)
@@ -48,7 +48,7 @@
 #include "../../../../Tools/ccache/ccache.xcconfig"
 
 OTHER_LDFLAGS[config=Debug][sdk=iphone*] = $(inherited) -framework UIKit -framework CoreGraphics
-OTHER_LDFLAGS[config=Debug][sdk=tv*] = $(inherited) -framework UIKit -framework CoreGraphics
+OTHER_LDFLAGS[config=Debug][sdk=appletv*] = $(inherited) -framework UIKit -framework CoreGraphics
 OTHER_LDFLAGS[config=Debug][sdk=watch*] = $(inherited) -framework UIKit -framework CoreGraphics
 OTHER_LDFLAGS[config=Debug][sdk=macosx*] = $(inherited) $(OTHER_LDFLAGS_$(WK_IS_CATALYST))
 OTHER_LDFLAGS_YES = -framework UIKit -framework CoreGraphics


Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig (295495 => 295496)

--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig	2022-06-13 18:51:54 UTC (rev 295495)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig	2022-06-13 19:20:59 UTC (rev 295496)
@@ -28,6 +28,10 @@
 PRODUCT_NAME = DumpRenderTree;
 SKIP_INSTALL = YES;
 
+// Workaround for "WebKit is not available..." error (rdar://91668054)
+DISABLE_SDK_METADATA_PARSING[sdk=appletv*] = YES;
+DISABLE_SDK_METADATA_PARSING[sdk=watch*] = YES;
+
 OTHER_LDFLAGS = ;
 
 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_COCOA_TOUCH)) $(EXCLUDED_PRODUCT_DEPENDENCY_NAMES_$(WK_WHICH_BUILD_SYSTEM));


Modified: trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig (295495 => 295496)

--- trunk/Tools/DumpRenderTree/mac/Conf

[webkit-changes] [295259] trunk/Source/WebKit/Configurations/BaseTarget.xcconfig

2022-06-03 Thread emw

Title: [295259] trunk/Source/WebKit/Configurations/BaseTarget.xcconfig








Revision 295259
Author e...@apple.com
Date 2022-06-03 19:17:32 -0700 (Fri, 03 Jun 2022)


Log Message
Fix WebKit's PROFILE_DATA_PATH in internal release builds
https://bugs.webkit.org/show_bug.cgi?id=241297

Reviewed by Wenson Hsieh.

WebKit's PROFILE_DATA_PATH_INTERNAL_YES was missing `WebKitAdditions/`
in its path name. Just a typo here, WebCore and _javascript_Core have
correct paths.

* Source/WebKit/Configurations/BaseTarget.xcconfig:

Canonical link: https://commits.webkit.org/251305@main

Modified Paths

trunk/Source/WebKit/Configurations/BaseTarget.xcconfig




Diff

Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (295258 => 295259)

--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig	2022-06-04 02:09:18 UTC (rev 295258)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig	2022-06-04 02:17:32 UTC (rev 295259)
@@ -53,7 +53,7 @@
 
 PROFILE_DATA_PATH = $(PROFILE_DATA_PATH_INTERNAL_$(USE_INTERNAL_SDK));
 PROFILE_DATA_PATH_INTERNAL_ = $(SRCROOT)/../../Tools/Profiling/Empty.profdata;
-PROFILE_DATA_PATH_INTERNAL_YES = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/Profiling/WebKit.profdata.compressed;
+PROFILE_DATA_PATH_INTERNAL_YES = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions/Profiling/WebKit.profdata.compressed;
 PROFILE_DATA_PATH_INTERNAL_YES[config=Production] = $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions/Profiling/WebKit.profdata.compressed;
 
 PROFILE_DATA_FLAGS_ENABLED = -fprofile-instr-use=$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.profdata;






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

[webkit-changes] [295134] trunk/Source

2022-06-02 Thread emw

Title: [295134] trunk/Source








Revision 295134
Author e...@apple.com
Date 2022-06-02 11:29:45 -0700 (Thu, 02 Jun 2022)


Log Message
Fix build failures introduced in "[Xcode] Prevent STP and other self-contained builds from overwriting content in the macOS SDK"
https://bugs.webkit.org/show_bug.cgi?id=240408

Reviewed by Alexey Proskuryakov.

Revert "Revert "[Xcode] Prevent STP and other self-contained builds from overwriting content in the macOS SDK""
This reverts commit 680fe6580f261df69a607a33b6252f3e19704169.

Apply small fixups across xcconfig files to address regressions:

- Fix SYSTEM_HEADER_SEARCH_PATHS not referring to Catlyst's include
  directory.
- Replace /usr/local/include literal in PROFILE_DATA_PATH with
  WK_ALTERNATE_WEBKIT_SDK_PATH and WK_LIBRARY_HEADERS_FOLDER_PATH to
  select the correct profdata for Catalyst or self-contained builds.

* Source/_javascript_Core/Configurations/Base.xcconfig: Clean up an old
  WK_STATICLIB_INSTALL_PREFIX, replacing it with
  WK_LIBRARY_HEADERS_FOLDER_PATH.
* Source/_javascript_Core/Configurations/_javascript_Core.xcconfig:
* Source/WebCore/Configurations/WebCore.xcconfig:
* Source/WebCore/PAL/Configurations/PAL.xcconfig:
* Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj: PAL's
  SDKVariant.xcconfig was not included in the project for some reason.
  This is fine for building (as it's still includable) but prevents
  Xcode from indexing it. Add it.
* Source/WebGPU/Configurations/WGSL.xcconfig:
* Source/WebGPU/Configurations/WebGPU.xcconfig:
* Source/WebKit/Configurations/BaseTarget.xcconfig:
* Source/WebKit/Configurations/SandboxProfiles.xcconfig: Clean up an old
  WK_STATICLIB_INSTALL_PREFIX setting. We don't need to redirect sandbox
  profiles to a separate directory, like we do headers and static
  libraries, so leave these paths hard coded to /usr/local/include.
* Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig:

Canonical link: https://commits.webkit.org/251225@main

Modified Paths

trunk/Source/_javascript_Core/Configurations/Base.xcconfig
trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig
trunk/Source/_javascript_Core/DerivedSources.make
trunk/Source/_javascript_Core/Scripts/generate-unified-sources.sh
trunk/Source/_javascript_Core/offlineasm/config.rb
trunk/Source/_javascript_Core/offlineasm/parser.rb
trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig
trunk/Source/ThirdParty/ANGLE/Configurations/AngleMetalLib.xcconfig
trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig
trunk/Source/WTF/Configurations/Base.xcconfig
trunk/Source/WTF/Configurations/WTF.xcconfig
trunk/Source/WTF/Configurations/icu.xcconfig
trunk/Source/WebCore/Configurations/Base.xcconfig
trunk/Source/WebCore/Configurations/WebCore.xcconfig
trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig
trunk/Source/WebCore/DerivedSources.make
trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig
trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
trunk/Source/WebCore/Scripts/generate-unified-sources.sh
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebGPU/Configurations/Base.xcconfig
trunk/Source/WebGPU/Configurations/WGSL.xcconfig
trunk/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig
trunk/Source/WebGPU/Configurations/WebGPU.xcconfig
trunk/Source/WebKit/Configurations/Base.xcconfig
trunk/Source/WebKit/Configurations/BaseTarget.xcconfig
trunk/Source/WebKit/Scripts/generate-unified-sources.sh
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig
trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
trunk/Source/WebKitLegacy/scripts/generate-unified-sources.sh
trunk/Source/bmalloc/Configurations/Base.xcconfig
trunk/Source/bmalloc/Configurations/bmalloc.xcconfig
trunk/Source/bmalloc/Configurations/mbmalloc.xcconfig




Diff

Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (295133 => 295134)

--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2022-06-02 18:25:20 UTC (rev 295133)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2022-06-02 18:29:45 UTC (rev 295134)
@@ -108,8 +108,17 @@
 PREBINDING = NO;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uni

[webkit-changes] [295073] trunk/Source

2022-05-31 Thread emw

Title: [295073] trunk/Source








Revision 295073
Author e...@apple.com
Date 2022-05-31 16:42:14 -0700 (Tue, 31 May 2022)


Log Message
[Xcode] Prevent STP and other self-contained builds from overwriting content in the macOS SDK
https://bugs.webkit.org/show_bug.cgi?id=240408

Reviewed by Alexey Proskuryakov.

When building with WK_OVERRIDE_FRAMEWORKS_DIR, we assume that WebKit is
being built as part of a self-contained application, e.g. Safari
Technology Preview. This means that most content is installed to the
override directory, instead of the normal /System/Library/Frameworks
directory.

However, static library content (e.g. headers and archives
for bmalloc, webrtc, WTF) is _not_ installed to the override directory,
as it is not needed at runtime. It was being installed to the default
/usr/local prefix, where it would merge with and overwrite whatever
WebKit content was already present.

To prevent overwrites and other sorts of conflict with the
system-provided WebKit, introduce WK_LIBRARY_HEADERS_FOLDER_PATH and
WK_LIBRARY_INSTALL_PATH, which expand to /usr/local/include/safari-sdk
and /usr/local/lib/safari-sdk respectively when building in this mode.
Static library headers and archives are built to these locations, where
they're still in the expected SDK location, but won't clobber system
WebKit.

* Source/bmalloc/Configurations/Base.xcconfig:
* Source/bmalloc/Configurations/bmalloc.xcconfig:
* Source/bmalloc/Configurations/mbmalloc.xcconfig:
* Source/_javascript_Core/Configurations/Base.xcconfig:
* Source/_javascript_Core/Configurations/_javascript_Core.xcconfig:
* Source/_javascript_Core/DerivedSources.make:
* Source/_javascript_Core/Scripts/generate-unified-sources.sh:
* Source/_javascript_Core/offlineasm/config.rb:
* Source/_javascript_Core/offlineasm/parser.rb:
* Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig:
* Source/ThirdParty/ANGLE/Configurations/AngleMetalLib.xcconfig:
* Source/ThirdParty/ANGLE/Configurations/Base.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig:
* Source/WebCore/PAL/Configurations/Base.xcconfig:
* Source/WebCore/PAL/Configurations/PAL.xcconfig:
* Source/WebGPU/Configurations/Base.xcconfig:
* Source/WebGPU/Configurations/WGSL.xcconfig:
* Source/WebGPU/Configurations/WGSLUnitTests.xcconfig:
* Source/WebGPU/Configurations/WebGPU.xcconfig:
* Source/WebKit/Configurations/Base.xcconfig:
* Source/WebKit/Configurations/BaseTarget.xcconfig:
* Source/WebKit/Configurations/SandboxProfiles.xcconfig:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebKitLegacy/scripts/generate-unified-sources.sh:
* Source/WebKitLegacy/mac/Configurations/Base.xcconfig:
* Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig:
* Source/WTF/Configurations/Base.xcconfig:
* Source/WTF/Configurations/WTF.xcconfig:
* Source/WTF/Configurations/icu.xcconfig:
* Source/WebCore/Configurations/Base.xcconfig:
* Source/WebCore/Configurations/WebCore.xcconfig:
* Source/WebCore/Configurations/WebCoreTestSupport.xcconfig:
* Source/WebCore/DerivedSources.make:
* Source/WebCore/Scripts/generate-unified-sources.sh:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:

Canonical link: https://commits.webkit.org/251168@main

Modified Paths

trunk/Source/_javascript_Core/Configurations/Base.xcconfig
trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig
trunk/Source/_javascript_Core/DerivedSources.make
trunk/Source/_javascript_Core/Scripts/generate-unified-sources.sh
trunk/Source/_javascript_Core/offlineasm/config.rb
trunk/Source/_javascript_Core/offlineasm/parser.rb
trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig
trunk/Source/ThirdParty/ANGLE/Configurations/AngleMetalLib.xcconfig
trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig
trunk/

[webkit-changes] [295072] trunk/Source

2022-05-31 Thread emw

Title: [295072] trunk/Source








Revision 295072
Author e...@apple.com
Date 2022-05-31 16:05:25 -0700 (Tue, 31 May 2022)


Log Message
Fix whitespace paths in "Copy Profiling Data"
https://bugs.webkit.org/show_bug.cgi?id=240285

Unreviewed build fix. _javascript_CORE_PRIVATE_HEADERS_DIR may contain
spaces, so when we're invoking copy-profiling-data.sh from that
directory we need to defensively quote it.

* Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:

Canonical link: https://commits.webkit.org/251167@main

Modified Paths

trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (295071 => 295072)

--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2022-05-31 22:43:09 UTC (rev 295071)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2022-05-31 23:05:25 UTC (rev 295072)
@@ -12122,7 +12122,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\nexit 0;\nfi\n${SCRIPT_INPUT_FILE_2}\n";
+			shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\nexit 0;\nfi\n\"${SCRIPT_INPUT_FILE_2}\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 


Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (295071 => 295072)

--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2022-05-31 22:43:09 UTC (rev 295071)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2022-05-31 23:05:25 UTC (rev 295072)
@@ -38951,7 +38951,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\nexit 0;\nfi\n${SCRIPT_INPUT_FILE_2}\n";
+			shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\nexit 0;\nfi\n\"${SCRIPT_INPUT_FILE_2}\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 


Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (295071 => 295072)

--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-05-31 22:43:09 UTC (rev 295071)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-05-31 23:05:25 UTC (rev 295072)
@@ -16587,7 +16587,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\nexit 0;\nfi\n${SCRIPT_INPUT_FILE_2}\n";
+			shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\nexit 0;\nfi\n\"${SCRIPT_INPUT_FILE_2}\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 






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

[webkit-changes] [295067] trunk/Source/WebKit

2022-05-31 Thread emw

Title: [295067] trunk/Source/WebKit








Revision 295067
Author e...@apple.com
Date 2022-05-31 14:47:39 -0700 (Tue, 31 May 2022)


Log Message
[Xcode] Fix dependency cycles caused by Safari header imports
https://bugs.webkit.org/show_bug.cgi?id=240285

Reviewed by Tim Horton.

We were including headers produced by targets which depend on WebKit.
For Xcode engineering builds, this is not a valid dependency, because
an engineering build does not distinguish between a "header"
dependency and a regular target dependency. These errors have survived
in the codebase because:

- Xcode doesn't recognize header imports as "implicit dependencies",
so the build system hasn't traditionally known these dependencies
exist, except in some incremental builds.
- These headers are available in internal SDKs, so it's possible for
the targets to build out-of-order but build successfully (as long as
the first target to build can use a possibly-outdated version of the
code from the SDK).

When building targets in parallel, we are emitting more information to
recognize these as implicit dependencies (revealing the cycle) and the
build system is laying down framework bundle directories earlier on in
the build (preventing reliance on SDK frameworks).

* Source/WebKit/WebKit.xcodeproj/project.pbxproj: WebKit needs to build
  after AuthenticationServicesCore in internal builds. Add it as a
  product dependency.
* Source/WebKit/Configurations/WebKit.xcconfig: Because
  AuthenticationServicesCore.framework is not available externally, add
  it to EXCLUDED_SOURCE_FILE_NAMES. The build system still honors the
  product dependency ordering, but won't fail when it's missing.

* Source/WebKit/Platform/spi/ios/SafariServicesSPI.h: Added, contains
  interface declarations for needed SSReadingList API. Technically not
  SPI, but follows the convention of similar platform redeclaration
  headers.
* Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm: WebKit cannot
  depend on SafariServices. Replace the import of SSReadingList.h with
  SafariServicesSPI.h.
* Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:
  WebKit cannot depend on AuthenticationServices.framework. Thankfully,
  this import was unused. Delete it.
* Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm: WebKit cannot
  depend on SafariServices. Replace the import of SSReadingList.h with
  SafariServicesSPI.h.

Canonical link: https://commits.webkit.org/251162@main

Modified Paths

trunk/Source/WebKit/Configurations/WebKit.xcconfig
trunk/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm
trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj


Added Paths

trunk/Source/WebKit/Platform/spi/ios/SafariServicesSPI.h




Diff

Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (295066 => 295067)

--- trunk/Source/WebKit/Configurations/WebKit.xcconfig	2022-05-31 21:22:49 UTC (rev 295066)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig	2022-05-31 21:47:39 UTC (rev 295067)
@@ -190,7 +190,9 @@
 SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKit.order;
 SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order;
 
-EXCLUDED_SOURCE_FILE_NAMES = libWebKitAdditions.a $(EXCLUDED_IOS_RESOURCE_FILE_NAMES) $(EXCLUDED_MACOS_PLUGIN_FILE_NAMES) $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_WHICH_BUILD_SYSTEM)) $(EXCLUDED_MIGRATED_HEADERS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_PRODUCT_DEPENDENCY_NAMES) $(EXCLUDED_IOS_RESOURCE_FILE_NAMES) $(EXCLUDED_MACOS_PLUGIN_FILE_NAMES) $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_WHICH_BUILD_SYSTEM)) $(EXCLUDED_MIGRATED_HEADERS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
+// These are only available in internal builds, so they must be explicitly ignored for the open-source build to succeed.
+EXCLUDED_PRODUCT_DEPENDENCY_NAMES = libWebKitAdditions.a AuthenticationServicesCore.framework;
 EXCLUDED_IOS_RESOURCE_FILE_NAMES = Resources/ios/*;
 EXCLUDED_IOS_RESOURCE_FILE_NAMES[sdk=iphone*] = ;
 // The legacy build system does not install headers.


Added: trunk/Source/WebKit/Platform/spi/ios/SafariServicesSPI.h (0 => 295067)

--- trunk/Source/WebKit/Platform/spi/ios/SafariServicesSPI.h	(rev 0)
+++ trunk/Source/WebKit/Platform/spi/ios/SafariServicesSPI.h	2022-05-31 21:47:39 UTC (rev 295067)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2022 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 wit

[webkit-changes] [295065] trunk/Source

2022-05-31 Thread emw

Title: [295065] trunk/Source








Revision 295065
Author e...@apple.com
Date 2022-05-31 14:18:44 -0700 (Tue, 31 May 2022)


Log Message
Refer to correct profiling data in WebCore and WebKit
https://bugs.webkit.org/show_bug.cgi?id=239681

Reviewed by Alexey Proskuryakov.

Revert "Unreviewed, revert "[Xcode] Compute PGO profdata paths instead of searching for them at build time""
This reverts commit 2ee0d9d171e2ff7daa94d1a15727033a994e6414.

A bad copy-paste led to WebCore and WebKit's production builds using PGO
data from _javascript_Core. Fix it, and add back a check that ensures
production builds fail instead of falling back to stub profiling data.

* Source/WebCore/Configurations/WebCore.xcconfig:
* Source/WebKit/Configurations/BaseTarget.xcconfig:

Canonical link: https://commits.webkit.org/251160@main

Modified Paths

trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/WebCore/Configurations/WebCore.xcconfig
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebKit/Configurations/BaseTarget.xcconfig
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj


Added Paths

trunk/Source/_javascript_Core/Scripts/copy-profiling-data.sh




Diff

Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (295064 => 295065)

--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-05-31 21:13:16 UTC (rev 295064)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-05-31 21:18:44 UTC (rev 295065)
@@ -40,6 +40,11 @@
 SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/_javascript_Core.order;
 SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,_javascript_Core.order;
 
+PROFILE_DATA_PATH = $(PROFILE_DATA_PATH_INTERNAL_$(USE_INTERNAL_SDK));
+PROFILE_DATA_PATH_INTERNAL_ = $(SRCROOT)/../../Tools/Profiling/Empty.profdata;
+PROFILE_DATA_PATH_INTERNAL_YES = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed;
+PROFILE_DATA_PATH_INTERNAL_YES[config=Production] = $(SDK_DIR)/usr/local/include/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed;
+
 PROFILE_DATA_FLAGS_ENABLED = -fprofile-instr-use=$(BUILT_PRODUCTS_DIR)/DerivedSources/_javascript_Core/_javascript_Core.profdata;
 
 PROFILE_DATA_FLAGS = $(PROFILE_DATA_FLAGS_$(CONFIGURATION)_$(WK_PLATFORM_NAME));


Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (295064 => 295065)

--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2022-05-31 21:13:16 UTC (rev 295064)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2022-05-31 21:18:44 UTC (rev 295065)
@@ -1827,6 +1827,7 @@
 		DD41FA8627CDAD3200394D95 /* LowLevelInterpreter.asm in Sources */ = {isa = PBXBuildFile; fileRef = 86A054461556451B00445157 /* LowLevelInterpreter.asm */; };
 		DD41FA8727CDAD4300394D95 /* LowLevelInterpreter.asm in Sources */ = {isa = PBXBuildFile; fileRef = 86A054461556451B00445157 /* LowLevelInterpreter.asm */; };
 		DD41FA8927CDDDEF00394D95 /* LowLevelInterpreter.asm in Sources */ = {isa = PBXBuildFile; fileRef = 86A054461556451B00445157 /* LowLevelInterpreter.asm */; };
+		DD5F74F9283EF58D0027A8C6 /* copy-profiling-data.sh in Headers */ = {isa = PBXBuildFile; fileRef = DD5F74F8283EF4380027A8C6 /* copy-profiling-data.sh */; settings = {ATTRIBUTES = (Private, ); }; };
 		DDB04F41278E569A008D3678 /* libWTF.a in Product Dependencies */ = {isa = PBXBuildFile; fileRef = 1498CAD3214656C400710879 /* libWTF.a */; };
 		DDB04F42278E56A2008D3678 /* libWTF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1498CAD3214656C400710879 /* libWTF.a */; };
 		DDE99310278D087D00F60D26 /* libWebKitAdditions.a in Product Dependencies */ = {isa = PBXBuildFile; fileRef = DDE9930E278D086600F60D26 /* libWebKitAdditions.a */; };
@@ -5253,6 +5254,7 @@
 		DCF3D5681CD29468003D5C65 /* LazyPropertyInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LazyPropertyInlines.h; sourceTree = ""; };
 		DCFDFBD71D1F5D9800FE3D72 /* B3BottomProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = B3BottomProvider.h; path = b3/B3BottomProvider.h; sourceTree = ""; };
 		DCFDFBD81D1F5D9800FE3D72 /* B3TypeMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = B3TypeMap.h; path = b3/B3TypeMap.h; sourceTree = ""; };
+		DD5F74F8283EF4380027A8C6 /* copy-profiling-data.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "copy-profiling-data.sh"; sourceTree = ""; };
 		DDE9930E278D086600F60D26 /* libWebKitAdditions.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWebKitAdditions.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		DE26E9021CB5DD0500D2BE82 /* BuiltinExecutableCreator.h */ = {isa

[webkit-changes] [294952] trunk/Source

2022-05-27 Thread emw

Title: [294952] trunk/Source








Revision 294952
Author e...@apple.com
Date 2022-05-27 14:10:47 -0700 (Fri, 27 May 2022)


Log Message
[Xcode] Compute PGO profdata paths instead of searching for them at build time
https://bugs.webkit.org/show_bug.cgi?id=239681

Reviewed by Wenson Hsieh and Alexey Proskuryakov.

Production builds should always use profdata from the SDK, internal
release builds should use profdata from the local WebKitAdditions when
available, and open source builds should use the stub profdata. Add a
PROFILE_DATA_PATH build setting which implements these rules and replace
the script phases that checked those paths dynamically.

This fixes XCBuild validation issues in the open-source build, and
should prevent production builders from using stale profdata in
BUILT_PRODUCTS_DIR. Additionally, engineers can now build with custom
profile data by overriding PROFILE_DATA_PATH.

* Source/_javascript_Core/Configurations/_javascript_Core.xcconfig:
* Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj:
* Source/_javascript_Core/Scripts/copy-profiling-data.sh: Added. This file
  is part of _javascript_Core's private headers and replaces the "Copy
  Profiling Data" script phase logic all projects.
* Source/WebKit/Configurations/BaseTarget.xcconfig:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebCore/Configurations/WebCore.xcconfig:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:

Canonical link: https://commits.webkit.org/251060@main

Modified Paths

trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/WebCore/Configurations/WebCore.xcconfig
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebKit/Configurations/BaseTarget.xcconfig
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj


Added Paths

trunk/Source/_javascript_Core/Scripts/copy-profiling-data.sh




Diff

Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (294951 => 294952)

--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-05-27 20:52:05 UTC (rev 294951)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-05-27 21:10:47 UTC (rev 294952)
@@ -40,6 +40,11 @@
 SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/_javascript_Core.order;
 SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,_javascript_Core.order;
 
+PROFILE_DATA_PATH = $(PROFILE_DATA_PATH_INTERNAL_$(USE_INTERNAL_SDK));
+PROFILE_DATA_PATH_INTERNAL_ = $(SRCROOT)/../../Tools/Profiling/Empty.profdata;
+PROFILE_DATA_PATH_INTERNAL_YES = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed;
+PROFILE_DATA_PATH_INTERNAL_YES[config=Production] = $(SDK_DIR)/usr/local/include/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed;
+
 PROFILE_DATA_FLAGS_ENABLED = -fprofile-instr-use=$(BUILT_PRODUCTS_DIR)/DerivedSources/_javascript_Core/_javascript_Core.profdata;
 
 PROFILE_DATA_FLAGS = $(PROFILE_DATA_FLAGS_$(CONFIGURATION)_$(WK_PLATFORM_NAME));


Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (294951 => 294952)

--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2022-05-27 20:52:05 UTC (rev 294951)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2022-05-27 21:10:47 UTC (rev 294952)
@@ -1827,6 +1827,7 @@
 		DD41FA8627CDAD3200394D95 /* LowLevelInterpreter.asm in Sources */ = {isa = PBXBuildFile; fileRef = 86A054461556451B00445157 /* LowLevelInterpreter.asm */; };
 		DD41FA8727CDAD4300394D95 /* LowLevelInterpreter.asm in Sources */ = {isa = PBXBuildFile; fileRef = 86A054461556451B00445157 /* LowLevelInterpreter.asm */; };
 		DD41FA8927CDDDEF00394D95 /* LowLevelInterpreter.asm in Sources */ = {isa = PBXBuildFile; fileRef = 86A054461556451B00445157 /* LowLevelInterpreter.asm */; };
+		DD5F74F9283EF58D0027A8C6 /* copy-profiling-data.sh in Headers */ = {isa = PBXBuildFile; fileRef = DD5F74F8283EF4380027A8C6 /* copy-profiling-data.sh */; settings = {ATTRIBUTES = (Private, ); }; };
 		DDB04F41278E569A008D3678 /* libWTF.a in Product Dependencies */ = {isa = PBXBuildFile; fileRef = 1498CAD3214656C400710879 /* libWTF.a */; };
 		DDB04F42278E56A2008D3678 /* libWTF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1498CAD3214656C400710879 /* libWTF.a */; };
 		DDE99310278D087D00F60D26 /* libWebKitAdditions.a in Product Dependencies */ = {isa = PBXBuildFile; fileRef = DDE9930E278D086600F60D26 /* libWebKitAdditions.a */; };
@@ -5253,6 +5254,7 @@
 		DCF3D5681CD29468003D5C65 /* LazyPropertyInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LazyPropertyInlines.h; sourceTree = ""; };
 		DCFDFBD71D1F5D9800FE3D72 /* B3BottomProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =

[webkit-changes] [294767] trunk/Source

2022-05-24 Thread emw

Title: [294767] trunk/Source








Revision 294767
Author e...@apple.com
Date 2022-05-24 14:49:41 -0700 (Tue, 24 May 2022)


Log Message
WK_ALTERNATE_FRAMEWORKS_DIR should not affect WK_OVERRIDE_FRAMEWORKS_DIR
https://bugs.webkit.org/show_bug.cgi?id=240831

Reviewed by Tim Horton.

Resolve an inconsistency among projects regarding whether
WK_OVERRIDE_FRAMEWORKS_DIR is set for Mac Catalyst. Catalyst builds work
by setting WK_ALTERNATE_FRAMEWORKS_DIR. With this change, we update
projects so that an alternates directory never affects
WK_OVERRIDE_FRAMEWORKS_DIR.

This brings _javascript_Core and WebGPU in
line with build settings logic in ANGLE, libwebrtc, PAL, WebCore,
WebInspectorUI, WebKitLegacy, and WebKit. Some of these projects were
changed to have these semantics years ago in r230958>.

Separating WK_ALTERNATE_FRAMEWORKS_DIR from WK_OVERRIDE_FRAMEWORKS_DIR
is valuable for distinguishing between system-installed Mac Catalyst
WebKit and self-contained WebKit builds such as STP.

* Source/_javascript_Core/Configurations/Base.xcconfig:
* Source/WebGPU/Configurations/Base.xcconfig:

Canonical link: https://commits.webkit.org/250932@main

Modified Paths

trunk/Source/_javascript_Core/Configurations/Base.xcconfig
trunk/Source/WebGPU/Configurations/WebGPU.xcconfig




Diff

Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (294766 => 294767)

--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2022-05-24 21:37:22 UTC (rev 294766)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2022-05-24 21:49:41 UTC (rev 294767)
@@ -139,8 +139,10 @@
 NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/Frameworks;
 
 _javascript_CORE_FRAMEWORKS_DIR = $(_javascript_CORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-_javascript_CORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
+_javascript_CORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(_javascript_CORE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 _javascript_CORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
+_javascript_CORE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
+_javascript_CORE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)$(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
 
 _javascript_CORE_CONTENTS_DIR[sdk=iphone*] = _javascript_Core.framework;
 _javascript_CORE_CONTENTS_DIR[sdk=macosx*] = _javascript_Core.framework/Versions/A;
@@ -167,10 +169,7 @@
 WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
 
 WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_ = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO);
-WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/System/Library/Frameworks;
 
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";


Modified: trunk/Source/WebGPU/Configurations/WebGPU.xcconfig (294766 => 294767)

--- trunk/Source/WebGPU/Configurations/WebGPU.xcconfig	2022-05-24 21:37:22 UTC (rev 294766)
+++ trunk/Source/WebGPU/Configurations/WebGPU.xcconfig	2022-05-24 21:49:41 UTC (rev 294767)
@@ -67,16 +67,15 @@
 PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
 
 WEBGPU_FRAMEWORKS_DIR = $(WEBGPU_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-WEBGPU_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBGPU_FRAMEWORKS_DIR);
+WEBGPU_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBGPU_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 WEBGPU_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
+WEBGPU_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBGPU_FRAMEWORKS_DIR);
+WEBGPU_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 
 WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
 
 WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_ = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO);
-WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEW

[webkit-changes] [294519] trunk/Source

2022-05-19 Thread emw

Title: [294519] trunk/Source








Revision 294519
Author e...@apple.com
Date 2022-05-19 18:17:40 -0700 (Thu, 19 May 2022)


Log Message
Revert "[Xcode] Prevent STP and other self-contained builds from overwriting content in the macOS SDK"

This reverts commit ae2e942111f9f4f1a80c749a3f51ab0ae83b013a.

Seeing some new failures on internal post-commit builders.

Canonical link: https://commits.webkit.org/250775@main

Modified Paths

trunk/Source/_javascript_Core/Configurations/Base.xcconfig
trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig
trunk/Source/_javascript_Core/DerivedSources.make
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/_javascript_Core/Scripts/generate-unified-sources.sh
trunk/Source/_javascript_Core/offlineasm/config.rb
trunk/Source/_javascript_Core/offlineasm/parser.rb
trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig
trunk/Source/ThirdParty/ANGLE/Configurations/AngleMetalLib.xcconfig
trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig
trunk/Source/WTF/Configurations/Base.xcconfig
trunk/Source/WTF/Configurations/WTF.xcconfig
trunk/Source/WTF/Configurations/icu.xcconfig
trunk/Source/WebCore/Configurations/Base.xcconfig
trunk/Source/WebCore/Configurations/WebCore.xcconfig
trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig
trunk/Source/WebCore/DerivedSources.make
trunk/Source/WebCore/PAL/Configurations/Base.xcconfig
trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig
trunk/Source/WebCore/Scripts/generate-unified-sources.sh
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebGPU/Configurations/Base.xcconfig
trunk/Source/WebGPU/Configurations/WGSL.xcconfig
trunk/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig
trunk/Source/WebGPU/Configurations/WebGPU.xcconfig
trunk/Source/WebKit/Configurations/Base.xcconfig
trunk/Source/WebKit/Configurations/BaseTarget.xcconfig
trunk/Source/WebKit/Configurations/SandboxProfiles.xcconfig
trunk/Source/WebKit/Scripts/generate-unified-sources.sh
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig
trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
trunk/Source/WebKitLegacy/scripts/generate-unified-sources.sh
trunk/Source/bmalloc/Configurations/Base.xcconfig
trunk/Source/bmalloc/Configurations/bmalloc.xcconfig
trunk/Source/bmalloc/Configurations/mbmalloc.xcconfig




Diff

Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (294518 => 294519)

--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2022-05-20 01:15:56 UTC (rev 294518)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2022-05-20 01:17:40 UTC (rev 294519)
@@ -108,17 +108,8 @@
 PREBINDING = NO;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -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 -Wvla -Wliteral-conversion -Wthread-safety -Wno-profile-instr-out-of-date -Wno-profile-instr-unprofiled;
 
-HEADER_SEARCH_PATHS = . "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(HEADER_SEARCH_PATHS);
-LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_INSTALL_PATH) $(inherited);
-SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
+HEADER_SEARCH_PATHS = . "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
 
-WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;
-WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_YES = /usr/local/include/safari-sdk;
-WK_LIBRARY_INSTALL_PATH = $(WK_LIBRARY_INSTALL_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-WK_LIBRARY_INSTALL_PATH_OVERRIDE_NO = /usr/local/lib;
-WK_LIBRARY_INSTALL_PATH_OVERRIDE_YES = /usr/local/lib/safari-sdk;
-
 TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
 TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
 


Modifi

[webkit-changes] [294496] trunk/Source

2022-05-19 Thread emw

Title: [294496] trunk/Source








Revision 294496
Author e...@apple.com
Date 2022-05-19 11:32:41 -0700 (Thu, 19 May 2022)


Log Message
[Xcode] Prevent STP and other self-contained builds from overwriting content in the macOS SDK
https://bugs.webkit.org/show_bug.cgi?id=240408

Reviewed by Alexey Proskuryakov.

When building with WK_OVERRIDE_FRAMEWORKS_DIR, we assume that WebKit is
being built as part of a self-contained application, e.g. Safari
Technology Preview. This means that most content is installed to the
override directory, instead of the normal /System/Library/Frameworks
directory.

However, static library content (e.g. headers and archives
for bmalloc, webrtc, WTF) is _not_ installed to the override directory,
as it is not needed at runtime. It was being installed to the default
/usr/local prefix, where it would merge with and overwrite whatever
WebKit content was already present.

To prevent overwrites and other sorts of conflict with the
system-provided WebKit, introduce WK_LIBRARY_HEADERS_FOLDER_PATH and
WK_LIBRARY_INSTALL_PATH, which expand to /usr/local/include/safari-sdk
and /usr/local/lib/safari-sdk respectively when building in this mode.
Static library headers and archives are built to these locations, where
they're still in the expected SDK location, but won't clobber system
WebKit.

* Source/bmalloc/Configurations/Base.xcconfig:
* Source/bmalloc/Configurations/bmalloc.xcconfig:
* Source/bmalloc/Configurations/mbmalloc.xcconfig:
* Source/_javascript_Core/Configurations/Base.xcconfig:
* Source/_javascript_Core/Configurations/_javascript_Core.xcconfig:
* Source/_javascript_Core/DerivedSources.make:
* Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj:
* Source/_javascript_Core/Scripts/generate-unified-sources.sh:
* Source/_javascript_Core/offlineasm/config.rb:
* Source/_javascript_Core/offlineasm/parser.rb:
* Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig:
* Source/ThirdParty/ANGLE/Configurations/AngleMetalLib.xcconfig:
* Source/ThirdParty/ANGLE/Configurations/Base.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig:
* Source/WebCore/PAL/Configurations/Base.xcconfig:
* Source/WebCore/PAL/Configurations/PAL.xcconfig:
* Source/WebGPU/Configurations/Base.xcconfig:
* Source/WebGPU/Configurations/WGSL.xcconfig:
* Source/WebGPU/Configurations/WGSLUnitTests.xcconfig:
* Source/WebGPU/Configurations/WebGPU.xcconfig:
* Source/WebKit/Configurations/Base.xcconfig:
* Source/WebKit/Configurations/BaseTarget.xcconfig:
* Source/WebKit/Configurations/SandboxProfiles.xcconfig:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebKitLegacy/scripts/generate-unified-sources.sh:
* Source/WebKitLegacy/mac/Configurations/Base.xcconfig:
* Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig:
* Source/WTF/Configurations/Base.xcconfig:
* Source/WTF/Configurations/WTF.xcconfig:
* Source/WTF/Configurations/icu.xcconfig:
* Source/WebCore/Configurations/Base.xcconfig:
* Source/WebCore/Configurations/WebCore.xcconfig:
* Source/WebCore/Configurations/WebCoreTestSupport.xcconfig:
* Source/WebCore/DerivedSources.make:
* Source/WebCore/Scripts/generate-unified-sources.sh:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:

Canonical link: https://commits.webkit.org/250755@main

Modified Paths

trunk/Source/_javascript_Core/Configurations/Base.xcconfig
trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig
trunk/Source/_javascript_Core/DerivedSources.make
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/_javascript_Core/Scripts/generate-unified-sources.sh
trunk/Source/_javascript_Core/offlineasm/config.rb
trunk/Source/_javascript_Core/offlineasm/parser.rb
trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig
trunk/Source/ThirdParty/ANGLE/Configurations/AngleMetalLib.xcconfig
trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.

[webkit-changes] [293486] trunk/Source

2022-04-26 Thread emw

Title: [293486] trunk/Source








Revision 293486
Author e...@apple.com
Date 2022-04-26 17:23:35 -0700 (Tue, 26 Apr 2022)


Log Message
Unreviewed, reverting "[Xcode] Compute PGO profdata paths instead of searching for them at build time"
https://bugs.webkit.org/show_bug.cgi?id=239681

Source/_javascript_Core:

This reverts commit 433f73bc052d7c978c619e28b2574df8faf6cb72.


* Configurations/_javascript_Core.xcconfig:
* _javascript_Core.xcodeproj/project.pbxproj:

Source/WebCore:


* Configurations/WebCore.xcconfig:
* WebCore.xcodeproj/project.pbxproj:

Source/WebKit:


* Configurations/BaseTarget.xcconfig:
* WebKit.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/WebCore.xcconfig
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Configurations/BaseTarget.xcconfig
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (293485 => 293486)

--- trunk/Source/_javascript_Core/ChangeLog	2022-04-27 00:19:14 UTC (rev 293485)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-04-27 00:23:35 UTC (rev 293486)
@@ -1,3 +1,13 @@
+2022-04-26  Elliott Williams  
+
+Unreviewed, reverting "[Xcode] Compute PGO profdata paths instead of searching for them at build time"
+https://bugs.webkit.org/show_bug.cgi?id=239681
+
+This reverts commit 433f73bc052d7c978c619e28b2574df8faf6cb72.
+
+* Configurations/_javascript_Core.xcconfig:
+* _javascript_Core.xcodeproj/project.pbxproj:
+
 2022-04-26  Yusuke Suzuki  
 
 [JSC] Add forceUnlinkedDFG option


Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (293485 => 293486)

--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-04-27 00:19:14 UTC (rev 293485)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-04-27 00:23:35 UTC (rev 293486)
@@ -40,12 +40,6 @@
 SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/_javascript_Core.order;
 SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,_javascript_Core.order;
 
-PROFILE_DATA_PATH = $(PROFILE_DATA_PATH_PRODUCTION_$(DEPLOYMENT_LOCATION));
-PROFILE_DATA_PATH_PRODUCTION_YES = $(SDK_DIR)/usr/local/include/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed;
-PROFILE_DATA_PATH_PRODUCTION_NO = $(PROFILE_DATA_PATH_INTERNAL_$(USE_INTERNAL_SDK));
-PROFILE_DATA_PATH_INTERNAL_YES = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed;
-PROFILE_DATA_PATH_INTERNAL_ = $(SRCROOT)/../../Tools/Profiling/Empty.profdata.compressed;
-
 PROFILE_DATA_FLAGS_ENABLED = -fprofile-instr-use=$(BUILT_PRODUCTS_DIR)/DerivedSources/_javascript_Core/_javascript_Core.profdata;
 
 PROFILE_DATA_FLAGS = $(PROFILE_DATA_FLAGS_$(CONFIGURATION)_$(WK_PLATFORM_NAME));


Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (293485 => 293486)

--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2022-04-27 00:19:14 UTC (rev 293485)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2022-04-27 00:23:35 UTC (rev 293486)
@@ -12111,7 +12111,9 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
-"$(PROFILE_DATA_PATH)",
+"$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed",
+"$(SRCROOT)/../../Tools/Profiling/Empty.profdata",
+"$(SDK_DIR)/usr/local/include/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed",
 			);
 			name = "Copy Profiling Data";
 			outputFileListPaths = (
@@ -12121,7 +12123,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\nexit 0;\nfi\n\nif [ -z \"${PROFILE_DATA_FLAGS}\" ]; then\nexit 0;\nfi\n\nif [[ \"$(file -b \"${SCRIPT_INPUT_FILE_0}\")\" = \"lzfse compressed\"* ]]; then\nset -x; compression_tool -decode -i \"${SCRIPT_INPUT_FILE_0}\" -o \"${SCRIPT_OUTPUT_FILE_0}\" -a lzfse;\nelse\nset -x; cp \"${SCRIPT_INPUT_FILE_0}\" \"${SCRIPT_OUTPUT_FILE_0}\"\nfi\n";
+			shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\nexit 0;\nfi\n\nif [ -z \"${PROFILE_DATA_FLAGS}\" ]; then\nexit 0;\nfi\n\nRELATIVE_PROFILE_DATA_PATH=\"usr/local/include/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed\";\nABSOLUTE_PROFILE_DATA_PATH=\"${BUILT_PRODUCTS_DIR}/${RELATIVE_PROFILE_DATA_PATH}\";\n\nif [ ! -f \"${ABSOLUTE_PROFILE_DATA_PATH}\" ]; then\nABSOLUTE_PROFILE_DATA_PATH=\"${SDK_DIR}/${RELATIVE_PROFILE_DATA_PATH}\";\nfi\n\nif [ ! -f

[webkit-changes] [293455] trunk/Source

2022-04-26 Thread emw

Title: [293455] trunk/Source








Revision 293455
Author e...@apple.com
Date 2022-04-26 14:58:01 -0700 (Tue, 26 Apr 2022)


Log Message
Fix build error: "cp: _javascript_Core.profdata is not a directory"
https://bugs.webkit.org/show_bug.cgi?id=239681

Unreviewed build fix.

* Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:

Canonical link: https://commits.webkit.org/250008@main

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (293454 => 293455)

--- trunk/Source/_javascript_Core/ChangeLog	2022-04-26 21:51:06 UTC (rev 293454)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-04-26 21:58:01 UTC (rev 293455)
@@ -1,3 +1,12 @@
+2022-04-26  Elliott Williams  
+
+Fix build error: "cp: _javascript_Core.profdata is not a directory"
+https://bugs.webkit.org/show_bug.cgi?id=239681
+
+Unreviewed build fix.
+
+* _javascript_Core.xcodeproj/project.pbxproj:
+
 2022-04-22  Elliott Williams  
 
 [Xcode] Compute PGO profdata paths instead of searching for them at build time


Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (293454 => 293455)

--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2022-04-26 21:51:06 UTC (rev 293454)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2022-04-26 21:58:01 UTC (rev 293455)
@@ -12121,7 +12121,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\nexit 0;\nfi\n\nif [ -z \"${PROFILE_DATA_FLAGS}\" ]; then\nexit 0;\nfi\n\nif [[ \"$(file -b \"${SCRIPT_INPUT_FILE_0}\")\" = \"lzfse compressed\"* ]]; then\nset -x; compression_tool -decode -i \"${SCRIPT_INPUT_FILE_0}\" -o \"${SCRIPT_OUTPUT_FILE_0}\" -a lzfse;\nelse\nset -x; cp \"${SCRIPT_INPUT_FILE_0}\" -o \"${SCRIPT_OUTPUT_FILE_0}\"\nfi\n";
+			shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\nexit 0;\nfi\n\nif [ -z \"${PROFILE_DATA_FLAGS}\" ]; then\nexit 0;\nfi\n\nif [[ \"$(file -b \"${SCRIPT_INPUT_FILE_0}\")\" = \"lzfse compressed\"* ]]; then\nset -x; compression_tool -decode -i \"${SCRIPT_INPUT_FILE_0}\" -o \"${SCRIPT_OUTPUT_FILE_0}\" -a lzfse;\nelse\nset -x; cp \"${SCRIPT_INPUT_FILE_0}\" \"${SCRIPT_OUTPUT_FILE_0}\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 


Modified: trunk/Source/WebCore/ChangeLog (293454 => 293455)

--- trunk/Source/WebCore/ChangeLog	2022-04-26 21:51:06 UTC (rev 293454)
+++ trunk/Source/WebCore/ChangeLog	2022-04-26 21:58:01 UTC (rev 293455)
@@ -1,3 +1,12 @@
+2022-04-26  Elliott Williams  
+
+Fix build error: "cp: _javascript_Core.profdata is not a directory"
+https://bugs.webkit.org/show_bug.cgi?id=239681
+
+Unreviewed build fix.
+
+* WebCore.xcodeproj/project.pbxproj:
+
 2022-04-26  Manuel Rego Casasnovas  
 
 Remove AriaReflectionEnabled runtime flag


Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (293454 => 293455)

--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2022-04-26 21:51:06 UTC (rev 293454)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2022-04-26 21:58:01 UTC (rev 293455)
@@ -38891,7 +38891,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\nexit 0;\nfi\n\nif [ -z \"${PROFILE_DATA_FLAGS}\" ]; then\nexit 0;\nfi\n\nif [[ \"$(file -b \"${SCRIPT_INPUT_FILE_0}\")\" = \"lzfse compressed\"* ]]; then\nset -x; compression_tool -decode -i \"${SCRIPT_INPUT_FILE_0}\" -o \"${SCRIPT_OUTPUT_FILE_0}\" -a lzfse;\nelse\nset -x; cp \"${SCRIPT_INPUT_FILE_0}\" -o \"${SCRIPT_OUTPUT_FILE_0}\"\nfi\n";
+			shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\nexit 0;\nfi\n\nif [ -z \"${PROFILE_DATA_FLAGS}\" ]; then\nexit 0;\nfi\n\nif [[ \"$(file -b \"${SCRIPT_INPUT_FILE_0}\")\" = \"lzfse compressed\"* ]]; then\nset -x; compression_tool -decode -i \"${SCRIPT_INPUT_FILE_0}\" -o \"${SCRIPT_OUTPUT_FILE_0}\" -a lzfse;\nelse\nset -x; cp \"${SCRIPT_INPUT_FILE_0}\" \"${SCRIPT_OUTPUT_FILE_0}\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 


Modified: trunk/Source/WebKit/ChangeLog (293454 => 293455)

--- trunk/Source/WebKit/ChangeLog	2022-04-26 21:51:06 UTC (rev 293454)
+++ trunk/Source/WebKit/ChangeLog	2022-04-26 21:58:01 UTC (rev 293455)
@@ -1,3 +1,12 @@
+2022-04-26  Elliott Willi

[webkit-changes] [293442] trunk/Source

2022-04-26 Thread emw

Title: [293442] trunk/Source








Revision 293442
Author e...@apple.com
Date 2022-04-26 12:20:18 -0700 (Tue, 26 Apr 2022)


Log Message
[Xcode] Compute PGO profdata paths instead of searching for them at build time
https://bugs.webkit.org/show_bug.cgi?id=239681

Reviewed by Alexey Proskuryakov.

Production builds should always use profdata from the SDK, internal
release builds should use profdata from the local WebKitAdditions, and
everyone else should use the stub profdata. Add a PROFILE_DATA_PATH
build setting which implements these rules and replace the script
phases that checked those paths dynamically.

This fixes XCBuild validation issues in the open-source build, and
should prevent production builders from using stale profdata in
BUILT_PRODUCTS_DIR. Additionally, engineers can now build with custom
profile data by overriding PROFILE_DATA_PATH.

If PROFILE_DATA_PATH does not appear to be raw LLVM profiling data, it
is decoded using compression_tool(1).

* Source/_javascript_Core/Configurations/_javascript_Core.xcconfig:
* Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj:
* Source/WebKit/Configurations/BaseTarget.xcconfig:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebCore/Configurations/WebCore.xcconfig:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:

Canonical link: https://commits.webkit.org/249997@main

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/WebCore.xcconfig
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Configurations/BaseTarget.xcconfig
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (293441 => 293442)

--- trunk/Source/_javascript_Core/ChangeLog	2022-04-26 18:51:26 UTC (rev 293441)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-04-26 19:20:18 UTC (rev 293442)
@@ -1,3 +1,27 @@
+2022-04-22  Elliott Williams  
+
+[Xcode] Compute PGO profdata paths instead of searching for them at build time
+https://bugs.webkit.org/show_bug.cgi?id=239681
+
+Reviewed by Alexey Proskuryakov.
+
+Production builds should always use profdata from the SDK, internal
+release builds should use profdata from the local WebKitAdditions, and
+everyone else should use the stub profdata. Add a PROFILE_DATA_PATH
+build setting which implements these rules and replace the script
+phases that checked those paths dynamically.
+
+This fixes XCBuild validation issues in the open-source build, and
+should prevent production builders from using stale profdata in
+BUILT_PRODUCTS_DIR. Additionally, engineers can now build with custom
+profile data by overriding PROFILE_DATA_PATH.
+
+If PROFILE_DATA_PATH does not appear to be raw LLVM profiling data, it
+is decoded using compression_tool(1).
+
+* Configurations/_javascript_Core.xcconfig:
+* _javascript_Core.xcodeproj/project.pbxproj:
+
 2022-04-25  Keith Miller  
 
 structureIDToStructureWithScratch should only do things if ADDRESS64


Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (293441 => 293442)

--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-04-26 18:51:26 UTC (rev 293441)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-04-26 19:20:18 UTC (rev 293442)
@@ -40,6 +40,12 @@
 SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/_javascript_Core.order;
 SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,_javascript_Core.order;
 
+PROFILE_DATA_PATH = $(PROFILE_DATA_PATH_PRODUCTION_$(DEPLOYMENT_LOCATION));
+PROFILE_DATA_PATH_PRODUCTION_YES = $(SDK_DIR)/usr/local/include/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed;
+PROFILE_DATA_PATH_PRODUCTION_NO = $(PROFILE_DATA_PATH_INTERNAL_$(USE_INTERNAL_SDK));
+PROFILE_DATA_PATH_INTERNAL_YES = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed;
+PROFILE_DATA_PATH_INTERNAL_ = $(SRCROOT)/../../Tools/Profiling/Empty.profdata.compressed;
+
 PROFILE_DATA_FLAGS_ENABLED = -fprofile-instr-use=$(BUILT_PRODUCTS_DIR)/DerivedSources/_javascript_Core/_javascript_Core.profdata;
 
 PROFILE_DATA_FLAGS = $(PROFILE_DATA_FLAGS_$(CONFIGURATION)_$(WK_PLATFORM_NAME));


Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (293441 => 293442)

--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2022-04-26 18:51:26 UTC (rev 293441)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2022-04-26 19:20:18 UTC (rev 293442)
@@ -12111,9 +12111,7 @@
 			inputFileListPa

[webkit-changes] [293408] trunk/Source/WebKit

2022-04-25 Thread emw

Title: [293408] trunk/Source/WebKit








Revision 293408
Author e...@apple.com
Date 2022-04-25 20:53:13 -0700 (Mon, 25 Apr 2022)


Log Message
[XCBuild] Refactor WebKit resources to emit output tasks for dependency validation
https://bugs.webkit.org/show_bug.cgi?id=239556

Reviewed by Alexey Proskuryakov.

* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
  * Replace the script phase that calls generate-automation-atom.py with
a build rule, and process those files as headers.
  * Clean up references and project metadata for deleted files.
  * Use WK_FRAMEWORK_VERSION_PREFIX in script output paths so that the
realpaths are correct on macOS.

Canonical link: https://commits.webkit.org/249974@main

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/WebKit/ChangeLog (293407 => 293408)

--- trunk/Source/WebKit/ChangeLog	2022-04-26 02:16:00 UTC (rev 293407)
+++ trunk/Source/WebKit/ChangeLog	2022-04-26 03:53:13 UTC (rev 293408)
@@ -1,3 +1,17 @@
+2022-04-21  Elliott Williams  
+
+[XCBuild] Refactor WebKit resources to emit output tasks for dependency validation
+https://bugs.webkit.org/show_bug.cgi?id=239556
+
+Reviewed by Alexey Proskuryakov.
+
+* WebKit/WebKit.xcodeproj/project.pbxproj:
+  * Replace the script phase that calls generate-automation-atom.py with
+a build rule, and process those files as headers.
+  * Clean up references and project metadata for deleted files.
+  * Use WK_FRAMEWORK_VERSION_PREFIX in script output paths so that the
+realpaths are correct on macOS.
+
 2022-04-25  Brent Fulgham  
 
 HARDENING: Add MESSAGE_CHECK in some Captive Portal cases


Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (293407 => 293408)

--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-04-26 02:16:00 UTC (rev 293407)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-04-26 03:53:13 UTC (rev 293408)
@@ -1352,7 +1352,6 @@
 		7B73124225CC8525003B2796 /* StreamConnectionEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B73123925CC8525003B2796 /* StreamConnectionEncoder.h */; };
 		7BAB111025DD02B3008FC479 /* ScopedActiveMessageReceiveQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BAB110F25DD02B2008FC479 /* ScopedActiveMessageReceiveQueue.h */; };
 		7BCF70DE2615D06E00E4FB70 /* ScopedRenderingResourcesRequestCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7BCF70CB2614935E00E4FB70 /* ScopedRenderingResourcesRequestCocoa.mm */; };
-		7BDDA3192747C0400038659E /* (null) in Headers */ = {isa = PBXBuildFile; };
 		7BE37F9327C7CA51007A6CD3 /* IPCStreamTesterIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BE37F9227C7C518007A6CD3 /* IPCStreamTesterIdentifier.h */; };
 		7BE9326327F5C75A00D5FEFB /* ReceiverMatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BE9326227F5C75A00D5FEFB /* ReceiverMatcher.h */; };
 		7C065F2C1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C065F2A1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h */; };
@@ -1963,6 +1962,12 @@
 		CEE4AE2B1A5DCF430002F49B /* UIKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CEE4AE2A1A5DCF430002F49B /* UIKitSPI.h */; };
 		D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484311FF4B6500032B39 /* WebPopupMenu.h */; };
 		D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */; };
+		DD4DB786280F945A001700D4 /* ElementAttribute.js in Headers */ = {isa = PBXBuildFile; fileRef = 990657341F323CBF00944F9C /* ElementAttribute.js */; settings = {ATTRIBUTES = (Private, ); }; };
+		DD4DB787280F945E001700D4 /* ElementDisplayed.js in Headers */ = {isa = PBXBuildFile; fileRef = 990657331F323CBF00944F9C /* ElementDisplayed.js */; settings = {ATTRIBUTES = (Private, ); }; };
+		DD4DB788280F9471001700D4 /* EnterFullscreen.js in Headers */ = {isa = PBXBuildFile; fileRef = 99CA66C8203668220074F35E /* EnterFullscreen.js */; settings = {ATTRIBUTES = (Private, ); }; };
+		DD4DB789280F9471001700D4 /* FindNodes.js in Headers */ = {isa = PBXBuildFile; fileRef = 990657311F323CBF00944F9C /* FindNodes.js */; settings = {ATTRIBUTES = (Private, ); }; };
+		DD4DB78A280F9471001700D4 /* FormElementClear.js in Headers */ = {isa = PBXBuildFile; fileRef = 990657321F323CBF00944F9C /* FormElementClear.js */; settings = {ATTRIBUTES = (Private, ); }; };
+		DD4DB78B280F9471001700D4 /* FormSubmit.js in Headers */ = {isa = PBXBuildFile; fileRef = 990657351F323CBF00944F9C /* FormSubmit.js */; settings = {ATTRIBUTES = (Private, ); }; };
 		DDA0A27C27E55E4D005E086E /* DOMCSSImportRule.h in Headers */ = {isa = PBXBuildFile; fileRef = DDA0A17C27E55E24005E086E /* DOMCSSImportRule.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DDA0A27D27E55E4D005E086E /* DOM

[webkit-changes] [293294] trunk/Tools

2022-04-23 Thread emw

Title: [293294] trunk/Tools








Revision 293294
Author e...@apple.com
Date 2022-04-23 14:13:57 -0700 (Sat, 23 Apr 2022)


Log Message
[buildbot] Increase the EWS compile timeout to account for delayed output from clang/XCBuild
https://bugs.webkit.org/show_bug.cgi?id=239455

Reviewed by Ryan Haddad.

Same as https://commits.webkit.org/249737@main, needed to work around
delayed output bugs in Xcode/XCBuild.

* Tools/CISupport/ews-build/steps.py:
(CompileWebKit.__init__):
* Tools/CISupport/ews-build/steps_unittest.py:

Canonical link: https://commits.webkit.org/249919@main

Modified Paths

trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/CISupport/ews-build/steps.py (293293 => 293294)

--- trunk/Tools/CISupport/ews-build/steps.py	2022-04-23 20:25:12 UTC (rev 293293)
+++ trunk/Tools/CISupport/ews-build/steps.py	2022-04-23 21:13:57 UTC (rev 293294)
@@ -2295,6 +2295,9 @@
 
 def __init__(self, skipUpload=False, **kwargs):
 self.skipUpload = skipUpload
+# https://bugs.webkit.org/show_bug.cgi?id=239455: The timeout needs to be >20 min to work
+# around log output delays on slower machines.
+kwargs.setdefault('timeout', 60 * 30)
 super(CompileWebKit, self).__init__(logEnviron=False, **kwargs)
 
 def doStepIf(self, step):


Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (293293 => 293294)

--- trunk/Tools/CISupport/ews-build/steps_unittest.py	2022-04-23 20:25:12 UTC (rev 293293)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py	2022-04-23 21:13:57 UTC (rev 293294)
@@ -1166,6 +1166,7 @@
 self.setProperty('configuration', 'release')
 self.expectRemoteCommands(
 ExpectShell(workdir='wkdir',
+timeout=1800,
 logEnviron=False,
 command=['perl', 'Tools/Scripts/build-webkit', '--release'],
 )
@@ -1181,6 +1182,7 @@
 self.setProperty('configuration', 'release')
 self.expectRemoteCommands(
 ExpectShell(workdir='wkdir',
+timeout=1800,
 logEnviron=False,
 command=['perl', 'Tools/Scripts/build-webkit', '--release', '--prefix=/app/webkit/WebKitBuild/release/install', '--gtk'],
 )
@@ -1196,6 +1198,7 @@
 self.setProperty('configuration', 'release')
 self.expectRemoteCommands(
 ExpectShell(workdir='wkdir',
+timeout=1800,
 logEnviron=False,
 command=['perl', 'Tools/Scripts/build-webkit', '--release', '--wpe'],
 )
@@ -1210,6 +1213,7 @@
 self.setProperty('configuration', 'debug')
 self.expectRemoteCommands(
 ExpectShell(workdir='wkdir',
+timeout=1800,
 logEnviron=False,
 command=['perl', 'Tools/Scripts/build-webkit', '--debug'],
 )
@@ -1242,6 +1246,7 @@
 self.setProperty('configuration', 'release')
 self.expectRemoteCommands(
 ExpectShell(workdir='wkdir',
+timeout=1800,
 logEnviron=False,
 command=['perl', 'Tools/Scripts/build-webkit', '--release'],
 )
@@ -1256,6 +1261,7 @@
 self.setProperty('configuration', 'debug')
 self.expectRemoteCommands(
 ExpectShell(workdir='wkdir',
+timeout=1800,
 logEnviron=False,
 command=['perl', 'Tools/Scripts/build-webkit', '--debug'],
 )
@@ -1366,6 +1372,7 @@
 self.setProperty('configuration', 'release')
 self.expectRemoteCommands(
 ExpectShell(workdir='wkdir',
+timeout=1800,
 logEnviron=False,
 command=['perl', 'Tools/Scripts/build-jsc', '--release'],
 )
@@ -1380,6 +1387,7 @@
 self.setProperty('configuration', 'debug')
 self.expectRemoteCommands(
 ExpectShell(workdir='wkdir',
+timeout=1800,
 logEnviron=False,
 command=['perl', 'Tools/Scripts/build-jsc', '--debug'],
 )
@@ -1404,6 +1412,7 @@
 self.setProperty('configuration', 'release')
 self.expectRemoteCommands(
 ExpectShell(workdir='wkdir',
+timeout=1800,
 logEnviron=False,
 command=['perl', 'Tools/Scripts/build-jsc', '--release'],
 )
@@ -1418,6 +1427,7 @@
 self.setProperty('configuration', 'debug')
 self.expectRemoteCommands(
 ExpectShell(workdir='wkdir',
+

[webkit-changes] [292974] trunk/Tools/CISupport/build-webkit-org

2022-04-18 Thread emw

Title: [292974] trunk/Tools/CISupport/build-webkit-org








Revision 292974
Author e...@apple.com
Date 2022-04-18 14:54:01 -0700 (Mon, 18 Apr 2022)


Log Message
[buildbot] Increase the compile timeout to account for delayed output from clang/XCBuild
https://bugs.webkit.org/show_bug.cgi?id=239455

Reviewed by Aakash Jain.

* Tools/CISupport/build-webkit-org/steps.py:
(CompileWebKit):
(CompileWebKit.__init__): Change the default timeout to 30 minutes.
* Tools/CISupport/build-webkit-org/steps_unittest.py: Update
  expectations.
(TestCompileWebKit.test_success):
(TestCompileWebKit.test_success_gtk):
(TestCompileWebKit.test_success_wpe):
(TestCompileWebKit.test_failure):
(TestCompileJSCOnly.test_success):
(TestCompileJSCOnly.test_failure):

Canonical link: https://commits.webkit.org/249737@main

Modified Paths

trunk/Tools/CISupport/build-webkit-org/steps.py
trunk/Tools/CISupport/build-webkit-org/steps_unittest.py




Diff

Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (292973 => 292974)

--- trunk/Tools/CISupport/build-webkit-org/steps.py	2022-04-18 21:44:04 UTC (rev 292973)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py	2022-04-18 21:54:01 UTC (rev 292974)
@@ -268,6 +268,12 @@
 descriptionDone = ["compiled"]
 warningPattern = ".*arning: .*"
 
+def __init__(self, **kwargs):
+# https://bugs.webkit.org/show_bug.cgi?id=239455: The timeout needs to be >20 min to
+# work around log output delays on slower machines.
+kwargs.setdefault('timeout', 60 * 30)
+super().__init__(**kwargs)
+
 def start(self):
 platform = self.getProperty('platform')
 buildOnly = self.getProperty('buildOnly')


Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (292973 => 292974)

--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py	2022-04-18 21:44:04 UTC (rev 292973)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py	2022-04-18 21:54:01 UTC (rev 292974)
@@ -402,7 +402,7 @@
 self.expectRemoteCommands(
 ExpectShell(
 workdir='wkdir',
-timeout=1200,
+timeout=1800,
 logEnviron=True,
 command=['perl', 'Tools/Scripts/build-webkit', '--release'],
 ) + 0,
@@ -418,7 +418,7 @@
 self.expectRemoteCommands(
 ExpectShell(
 workdir='wkdir',
-timeout=1200,
+timeout=1800,
 logEnviron=True,
 command=['perl', 'Tools/Scripts/build-webkit', '--release', '--prefix=/app/webkit/WebKitBuild/Release/install', '--gtk'],
 ) + 0,
@@ -434,7 +434,7 @@
 self.expectRemoteCommands(
 ExpectShell(
 workdir='wkdir',
-timeout=1200,
+timeout=1800,
 logEnviron=True,
 command=['perl', 'Tools/Scripts/build-webkit', '--release', '--wpe'],
 ) + 0,
@@ -449,7 +449,7 @@
 self.expectRemoteCommands(
 ExpectShell(
 workdir='wkdir',
-timeout=1200,
+timeout=1800,
 logEnviron=True,
 command=['perl', 'Tools/Scripts/build-webkit', '--debug'],
 ) + 2
@@ -474,7 +474,7 @@
 self.expectRemoteCommands(
 ExpectShell(
 workdir='wkdir',
-timeout=1200,
+timeout=1800,
 logEnviron=True,
 command=['perl', 'Tools/Scripts/build-jsc', '--release'],
 ) + 0,
@@ -489,6 +489,7 @@
 self.expectRemoteCommands(
 ExpectShell(
 workdir='wkdir',
+timeout=1800,
 logEnviron=True,
 command=['perl', 'Tools/Scripts/build-jsc', '--debug'],
 ) + 2






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

[webkit-changes] [292959] trunk

2022-04-18 Thread emw

Title: [292959] trunk








Revision 292959
Author e...@apple.com
Date 2022-04-18 10:49:33 -0700 (Mon, 18 Apr 2022)


Log Message
[XCBuild] Use XCBuild for all command-line and project builds
https://bugs.webkit.org/show_bug.cgi?id=238916

Reviewed by Alexey Proskuryakov.

Source/bmalloc:

* bmalloc.xcodeproj/project.pbxproj:

Source/_javascript_Core:

Switch to the new build system, without changing anything about our
build order. Make will still build projects one-at-a-time, but this
drops our dependency on the legacy build system.

* _javascript_Core.xcodeproj/project.pbxproj:

Source/ThirdParty/ANGLE:

* ANGLE.xcodeproj/project.pbxproj:

Source/ThirdParty/libwebrtc:

* libwebrtc.xcodeproj/project.pbxproj:

Source/WebCore:

* WebCore.xcodeproj/project.pbxproj:

Source/WebGPU:

* WebGPU.xcodeproj/project.pbxproj:

Source/WebInspectorUI:

* WebInspectorUI.xcodeproj/project.pbxproj:

Source/WebKit:

* WebKit.xcodeproj/project.pbxproj:

Source/WebKitLegacy:

* WebKitLegacy.xcodeproj/project.pbxproj:

Source/WTF:

* WTF.xcodeproj/project.pbxproj:

Tools:

There are a few projects in Tools/ which are checked in but not built
as part of the normal Make or build-webkit workflow. I've updated
them, and noted below which ones were already failing to build.

* ContentExtensionTester/ContentExtensionTester.xcodeproj/project.pbxproj:
* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
* EditingHistory/EditingHistory.xcodeproj/project.pbxproj: Fails to
build locally, updated anyway.
* FontWithFeatures/FontWithFeatures.xcodeproj/project.pbxproj: Fails
to build locally, updated anyway.
* ImageDiff/ImageDiff.xcodeproj/project.pbxproj:
* MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj:
* MiniBrowserSwiftUI/MiniBrowserSwiftUI.xcodeproj/project.pbxproj:
* MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj:
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* WebEditingTester/WebEditingTester.xcodeproj/project.pbxproj: Fails
to build locally, updated anyway.
* WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/ThirdParty/libwebrtc/ChangeLog
trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/WTF.xcodeproj/project.pbxproj
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebGPU/ChangeLog
trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKitLegacy/ChangeLog
trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj
trunk/Source/bmalloc/ChangeLog
trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj
trunk/Tools/ChangeLog
trunk/Tools/ContentExtensionTester/ContentExtensionTester.xcodeproj/project.pbxproj
trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
trunk/Tools/EditingHistory/EditingHistory.xcodeproj/project.pbxproj
trunk/Tools/FontWithFeatures/FontWithFeatures.xcodeproj/project.pbxproj
trunk/Tools/ImageDiff/ImageDiff.xcodeproj/project.pbxproj
trunk/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj
trunk/Tools/MiniBrowserSwiftUI/MiniBrowserSwiftUI.xcodeproj/project.pbxproj
trunk/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj
trunk/Tools/Scripts/build-webkit
trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
trunk/Tools/WebEditingTester/WebEditingTester.xcodeproj/project.pbxproj
trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (292958 => 292959)

--- trunk/Source/_javascript_Core/ChangeLog	2022-04-18 17:02:07 UTC (rev 292958)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-04-18 17:49:33 UTC (rev 292959)
@@ -1,3 +1,16 @@
+2022-04-18  Elliott Williams  
+
+[XCBuild] Use XCBuild for all command-line and project builds
+https://bugs.webkit.org/show_bug.cgi?id=238916
+
+Reviewed by Alexey Proskuryakov.
+
+Switch to the new build system, without changing anything about our
+build order. Make will still build projects one-at-a-time, but this
+drops our dependency on the legacy build system.
+
+* _javascript_Core.xcodeproj/project.pbxproj:
+
 2022-04-16  Mark Lam  
 
 Harden JSObject::setPrototypeOf.


Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (292958 => 292959)

--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2022-04-18 17:02:07 UTC (rev 292958)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2022-04-18 17:49:33 UTC (rev 292959)
@@

[webkit-changes] [292845] trunk

2022-04-13 Thread emw

Title: [292845] trunk








Revision 292845
Author e...@apple.com
Date 2022-04-13 17:15:54 -0700 (Wed, 13 Apr 2022)


Log Message
[Xcode] Fix public watchOS workspace build by updating scheme and build settings
https://bugs.webkit.org/show_bug.cgi?id=239301

Reviewed by Alexey Proskuryakov.

.:

Add AD_HOC_CODE_SIGNING_ALLOWED=YES (similar to
https://commits.webkit.org/249449@main) and
DISABLE_SDK_METADATA_PARSING=YES in various places to work around
open-source workspace build failures when building for watchOS.

* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
- Remove libwebrtc from the "All Source" scheme. On watchOS, it doesn't
build, and on other platforms, it is an implicit dependency, so
removing it lets the build system determine whether or not it should
build.
- Remove MiniBrowser from the "All Source" scheme, as it's part of "All
Tools". "All Tools" probably shouldn't be built for embedded
platforms, as it contains some Mac-only tools, but we do not enforce
this.

Source/WebCore:

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

Source/WebGPU:

* Configurations/Base.xcconfig:
* Configurations/WebGPU.xcconfig:

Source/WebInspectorUI:

* Configurations/Base.xcconfig:

Source/WebKit:

* Configurations/WebKit.xcconfig:

Source/WebKitLegacy/mac:

* Configurations/Base.xcconfig:
* Configurations/WebKitLegacy.xcconfig:

Modified Paths

trunk/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/Base.xcconfig
trunk/Source/WebCore/Configurations/WebCore.xcconfig
trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig
trunk/Source/WebGPU/ChangeLog
trunk/Source/WebGPU/Configurations/Base.xcconfig
trunk/Source/WebGPU/Configurations/WebGPU.xcconfig
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Configurations/Base.xcconfig
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Configurations/WebKit.xcconfig
trunk/Source/WebKitLegacy/mac/ChangeLog
trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig
trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme




Diff

Modified: trunk/ChangeLog (292844 => 292845)

--- trunk/ChangeLog	2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/ChangeLog	2022-04-14 00:15:54 UTC (rev 292845)
@@ -1,3 +1,25 @@
+2022-04-13  Elliott Williams  
+
+[Xcode] Fix public watchOS workspace build by updating scheme and build settings
+https://bugs.webkit.org/show_bug.cgi?id=239301
+
+Reviewed by Alexey Proskuryakov.
+
+Add AD_HOC_CODE_SIGNING_ALLOWED=YES (similar to
+https://commits.webkit.org/249449@main) and
+DISABLE_SDK_METADATA_PARSING=YES in various places to work around
+open-source workspace build failures when building for watchOS.
+
+* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
+- Remove libwebrtc from the "All Source" scheme. On watchOS, it doesn't
+build, and on other platforms, it is an implicit dependency, so
+removing it lets the build system determine whether or not it should
+build.
+- Remove MiniBrowser from the "All Source" scheme, as it's part of "All
+Tools". "All Tools" probably shouldn't be built for embedded
+platforms, as it contains some Mac-only tools, but we do not enforce
+this.
+
 2022-04-12  Elliott Williams  
 
 Reland "[XCBuild] Enable dependency validation by default"


Modified: trunk/Source/WebCore/ChangeLog (292844 => 292845)

--- trunk/Source/WebCore/ChangeLog	2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebCore/ChangeLog	2022-04-14 00:15:54 UTC (rev 292845)
@@ -1,3 +1,14 @@
+2022-04-13  Elliott Williams  
+
+[Xcode] Fix public watchOS workspace build by updating scheme and build settings
+https://bugs.webkit.org/show_bug.cgi?id=239301
+
+Reviewed by Alexey Proskuryakov.
+
+* Configurations/Base.xcconfig:
+* Configurations/WebCore.xcconfig:
+* Configurations/WebCoreTestSupport.xcconfig:
+
 2022-04-13  Michael Catanzaro  
 
 Misc compiler warnings, April 2022 edition


Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (292844 => 292845)

--- trunk/Source/WebCore/Configurations/Base.xcconfig	2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig	2022-04-14 00:15:54 UTC (rev 292845)
@@ -25,6 +25,7 @@
 #include "SDKVariant.xcconfig"
 
 CODE_SIGN_IDENTITY = -;
+AD_HOC_CODE_SIGNING_ALLOWED = YES;
 
 USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
 USE_INTERNAL_SDK_Production = YES;


Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (292844 => 292845)

--- trunk/Source/WebCore/Configurations/WebCore.xcconfig	2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig	2022-04-14 00:15:54 UTC (rev 292845)
@@ -78,6 +78,9 @@
 INSTALL_PATH_

[webkit-changes] [292797] trunk

2022-04-12 Thread emw

Title: [292797] trunk








Revision 292797
Author e...@apple.com
Date 2022-04-12 21:21:58 -0700 (Tue, 12 Apr 2022)


Log Message
[Xcode] In open-source builds, disable bitcode in xcconfigs instead of build-webkit
https://bugs.webkit.org/show_bug.cgi?id=239262

Reviewed by Alexey Proskuryakov.

Source/bmalloc:

* Configurations/Base.xcconfig:

Source/_javascript_Core:

Disable bitcode in open-source builds, as WebKit never part of an App
Store submission. This improves support for building WebKit directly
from the workspace.

* Configurations/Base.xcconfig:

Source/ThirdParty/ANGLE:

* Configurations/Base.xcconfig:

Source/ThirdParty/libwebrtc:

* Configurations/Base.xcconfig:

Source/WebCore:

* Configurations/Base.xcconfig:

Source/WebCore/PAL:

* Configurations/Base.xcconfig:

Source/WebGPU:

* Configurations/Base.xcconfig:

Source/WebInspectorUI:

* Configurations/Base.xcconfig:

Source/WebKit:

* Configurations/Base.xcconfig:
* SwiftOverlay/Configurations/Base.xcconfig:

Source/WebKitLegacy/mac:

* Configurations/Base.xcconfig:

Source/WTF:

* Configurations/Base.xcconfig:

Tools:

* ContentExtensionTester/Configurations/Base.xcconfig:
* DumpRenderTree/mac/Configurations/Base.xcconfig:
* ImageDiff/cg/Configurations/Base.xcconfig:
* MiniBrowser/Configurations/Base.xcconfig:
* MiniBrowserSwiftUI/Configurations/Base.xcconfig:
* MobileMiniBrowser/Configurations/Base.xcconfig:
* Scripts/webkitdirs.pm:
(XcodeOptions):
* TestWebKitAPI/Configurations/Base.xcconfig:
* WebEditingTester/Configurations/Base.xcconfig:
* WebKitTestRunner/Configurations/Base.xcconfig:
* lldb/lldbWebKitTester/Configurations/Base.xcconfig:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/Base.xcconfig
trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
trunk/Source/ThirdParty/libwebrtc/ChangeLog
trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/Configurations/Base.xcconfig
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/Base.xcconfig
trunk/Source/WebCore/PAL/ChangeLog
trunk/Source/WebCore/PAL/Configurations/Base.xcconfig
trunk/Source/WebGPU/ChangeLog
trunk/Source/WebGPU/Configurations/Base.xcconfig
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Configurations/Base.xcconfig
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Configurations/Base.xcconfig
trunk/Source/WebKit/SwiftOverlay/Configurations/Base.xcconfig
trunk/Source/WebKitLegacy/mac/ChangeLog
trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig
trunk/Source/bmalloc/ChangeLog
trunk/Source/bmalloc/Configurations/Base.xcconfig
trunk/Tools/ChangeLog
trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig
trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
trunk/Tools/ImageDiff/cg/Configurations/Base.xcconfig
trunk/Tools/MiniBrowser/Configurations/Base.xcconfig
trunk/Tools/MiniBrowserSwiftUI/Configurations/Base.xcconfig
trunk/Tools/MobileMiniBrowser/Configurations/Base.xcconfig
trunk/Tools/Scripts/webkitdirs.pm
trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig
trunk/Tools/WebEditingTester/Configurations/Base.xcconfig
trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig
trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (292796 => 292797)

--- trunk/Source/_javascript_Core/ChangeLog	2022-04-13 03:58:56 UTC (rev 292796)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-04-13 04:21:58 UTC (rev 292797)
@@ -1,3 +1,16 @@
+2022-04-12  Elliott Williams  
+
+[Xcode] In open-source builds, disable bitcode in xcconfigs instead of build-webkit
+https://bugs.webkit.org/show_bug.cgi?id=239262
+
+Reviewed by Alexey Proskuryakov.
+
+Disable bitcode in open-source builds, as WebKit never part of an App
+Store submission. This improves support for building WebKit directly
+from the workspace.
+
+* Configurations/Base.xcconfig:
+
 2022-04-12  Yusuke Suzuki  
 
 [JSC] Move StructureCache from VM to JSGlobalObject


Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (292796 => 292797)

--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2022-04-13 03:58:56 UTC (rev 292796)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2022-04-13 04:21:58 UTC (rev 292797)
@@ -61,6 +61,7 @@
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 COMBINE_HIDPI_IMAGES = NO;
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
+ENABLE_BITCODE = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 GCC_C_LANGUAGE_STANDARD = gnu99;
 GCC_DEBUGGING_SYMBOLS = default;


Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (292796 => 292797)

--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2022-04-13 03:58:56 UTC (rev 292796)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2022-04-13 04:21:58 UTC (rev 292797)
@@ -1,5 +1,14 @@
 2022-04-12  Elliott Williams  
 
+[Xc

[webkit-changes] [292791] trunk

2022-04-12 Thread emw

Title: [292791] trunk








Revision 292791
Author e...@apple.com
Date 2022-04-12 16:02:14 -0700 (Tue, 12 Apr 2022)


Log Message
Reland "[XCBuild] Enable dependency validation by default"
https://bugs.webkit.org/show_bug.cgi?id=238901


Reviewed by Alexey Proskuryakov.

.:

Addresses two problems that impacted the previous attempt at landing:

Derived Sources scripts which use generated xcfilelists contain
"optional" inputs which are only available in internal builds. These
inputs lead to spurious dependency validation errors. These scripts
are unique in that they run from script-only targets, not as a phase
in one of the project's native targets. So, in open-source builds,
restrict VALIDATE_DEPENDENCIES to only run on native targets.

When building an individual project, and not a workspace, it's
expected that many input dependencies in the build directory will be
missing from XCBuild's graph. Disable dependency validation unless we
_know_ we're building from a workspace, defined as when the
USE_WORKSPACE Make flag or --use-workspace build-webkit flag is
passed.

* Makefile.shared: Turn on validation errors when USE_WORKSPACE=YES.
Use a new build setting, WK_VALIDATE_DEPENDENCIES, which is the
"requested" validation level. The actual validation level set in
VALIDATE_DEPENDENCIES may be lower (see above).

Source/bmalloc:

* Configurations/DebugRelease.xcconfig: In open-source builds, disable
VALIDATE_DEPENDENCIES when there is no PRODUCT_TYPE (i.e. not building
a native target).

Source/_javascript_Core:

* Configurations/DebugRelease.xcconfig: In open-source builds, disable
VALIDATE_DEPENDENCIES when there is no PRODUCT_TYPE (i.e. not building
a native target).

Source/ThirdParty/ANGLE:

* Configurations/DebugRelease.xcconfig: In open-source builds, disable
VALIDATE_DEPENDENCIES when there is no PRODUCT_TYPE (i.e. not building
a native target).

Source/ThirdParty/libwebrtc:

* Configurations/DebugRelease.xcconfig: In open-source builds, disable
VALIDATE_DEPENDENCIES when there is no PRODUCT_TYPE (i.e. not building
a native target).

Source/WebCore:

* Configurations/DebugRelease.xcconfig: In open-source builds, disable
VALIDATE_DEPENDENCIES when there is no PRODUCT_TYPE (i.e. not building
a native target).

Source/WebCore/PAL:

* Configurations/DebugRelease.xcconfig: In open-source builds, disable
VALIDATE_DEPENDENCIES when there is no PRODUCT_TYPE (i.e. not building
a native target).

Source/WebGPU:

* Configurations/DebugRelease.xcconfig: In open-source builds, disable
VALIDATE_DEPENDENCIES when there is no PRODUCT_TYPE (i.e. not building
a native target).

Source/WebInspectorUI:

* Configurations/DebugRelease.xcconfig: In open-source builds, disable
VALIDATE_DEPENDENCIES when there is no PRODUCT_TYPE (i.e. not building
a native target).

Source/WebKit:

* Configurations/DebugRelease.xcconfig: In open-source builds, disable
VALIDATE_DEPENDENCIES when there is no PRODUCT_TYPE (i.e. not building
a native target).

Source/WebKitLegacy/mac:

* Configurations/DebugRelease.xcconfig: In open-source builds, disable
VALIDATE_DEPENDENCIES when there is no PRODUCT_TYPE (i.e. not building
a native target).

Source/WTF:

* Configurations/DebugRelease.xcconfig: In open-source builds, disable
VALIDATE_DEPENDENCIES when there is no PRODUCT_TYPE (i.e. not building
a native target).

Tools:

* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig: In
open-source builds, disable VALIDATE_DEPENDENCIES when there is no
PRODUCT_TYPE (i.e. not building a native target).
* ImageDiff/cg/Configurations/DebugRelease.xcconfig: Same as above.
* MiniBrowser/Configurations/DebugRelease.xcconfig: Same as above.
* MobileMiniBrowser/Configurations/DebugRelease.xcconfig: Same as
above.
* Scripts/build-webkit: Turn on validation errors when
USE_WORKSPACE=YES. Use a new build setting, WK_VALIDATE_DEPENDENCIES,
which is the "requested" validation level. The actual validation level
set in VALIDATE_DEPENDENCIES may be lower.
* Scripts/set-webkit-configuration:
* Scripts/webkitdirs.pm:
(markBaseProductDirectoryAsCreatedByXcodeBuildSystem):
(setCreatedByXcodeBuildSystem):
* TestWebKitAPI/Configurations/DebugRelease.xcconfig: Same as above.
* WebKitTestRunner/Configurations/DebugRelease.xcconfig: Same as
above.
* lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig: Same as
above.

Modified Paths

trunk/ChangeLog
trunk/Makefile.shared
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig
trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
trunk/Source/ThirdParty/libwebrtc/ChangeLog
trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/Configurations/DebugRelease.xcconfig
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/DebugRelease.xcconfig
trunk/Source/WebCore/PAL/ChangeLog
trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig
trunk/Source/W

[webkit-changes] [292640] trunk

2022-04-08 Thread emw

Title: [292640] trunk








Revision 292640
Author e...@apple.com
Date 2022-04-08 15:56:27 -0700 (Fri, 08 Apr 2022)


Log Message
[Xcode] Avoid targeting 32-bit iOS and Mac architectures
https://bugs.webkit.org/show_bug.cgi?id=238971

Reviewed by Alexey Proskuryakov.

PerformanceTests:

* DecoderTest/Configurations/DebugRelease.xcconfig:
* MediaTime/Configurations/DebugRelease.xcconfig:

Source/bmalloc:

* Configurations/DebugRelease.xcconfig:

Source/_javascript_Core:

Modern Xcode supports building armv7 iOS and i386 macOS, but only when targeting older OSes.
We do not support these targets, but our ARCHS override implies we do. Remove our setting
and use the default.

This improves support for building directly from WebKit.xcworkspace to a `generic/*`
destination.

* Configurations/DebugRelease.xcconfig:

Source/ThirdParty:

* gtest/xcode/Config/General.xcconfig:

Source/ThirdParty/ANGLE:

* Configurations/DebugRelease.xcconfig:

Source/ThirdParty/libwebrtc:

* Configurations/DebugRelease.xcconfig:

Source/WebCore:

* Configurations/DebugRelease.xcconfig:

Source/WebCore/PAL:

* Configurations/DebugRelease.xcconfig:

Source/WebGPU:

* Configurations/DebugRelease.xcconfig:

Source/WebInspectorUI:

* Configurations/DebugRelease.xcconfig:

Source/WebKit:

* Configurations/DebugRelease.xcconfig:

Source/WebKitLegacy/mac:

* Configurations/DebugRelease.xcconfig:

Source/WTF:

* Configurations/DebugRelease.xcconfig:

Tools:

* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
* ImageDiff/cg/Configurations/DebugRelease.xcconfig:
* MiniBrowser/Configurations/DebugRelease.xcconfig:
* MobileMiniBrowser/Configurations/DebugRelease.xcconfig:
* TestWebKitAPI/Configurations/DebugRelease.xcconfig:
* WebEditingTester/Configurations/DebugRelease.xcconfig:
* WebKitTestRunner/Configurations/DebugRelease.xcconfig:

Modified Paths

trunk/PerformanceTests/ChangeLog
trunk/PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig
trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig
trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
trunk/Source/ThirdParty/ChangeLog
trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
trunk/Source/ThirdParty/libwebrtc/ChangeLog
trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/Configurations/DebugRelease.xcconfig
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/DebugRelease.xcconfig
trunk/Source/WebCore/PAL/ChangeLog
trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig
trunk/Source/WebGPU/ChangeLog
trunk/Source/WebGPU/Configurations/DebugRelease.xcconfig
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Configurations/DebugRelease.xcconfig
trunk/Source/WebKitLegacy/mac/ChangeLog
trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig
trunk/Source/bmalloc/ChangeLog
trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig
trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
trunk/Tools/MobileMiniBrowser/Configurations/DebugRelease.xcconfig
trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig
trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig




Diff

Modified: trunk/PerformanceTests/ChangeLog (292639 => 292640)

--- trunk/PerformanceTests/ChangeLog	2022-04-08 22:47:08 UTC (rev 292639)
+++ trunk/PerformanceTests/ChangeLog	2022-04-08 22:56:27 UTC (rev 292640)
@@ -1,3 +1,13 @@
+2022-04-08  Elliott Williams  
+
+[Xcode] Avoid targeting 32-bit iOS and Mac architectures
+https://bugs.webkit.org/show_bug.cgi?id=238971
+
+Reviewed by Alexey Proskuryakov.
+
+* DecoderTest/Configurations/DebugRelease.xcconfig:
+* MediaTime/Configurations/DebugRelease.xcconfig:
+
 2022-04-06  Saam Barati  
 
 Add versions of Speedometer2.0 and 2.1 in PerformanceTests


Modified: trunk/PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig (292639 => 292640)

--- trunk/PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig	2022-04-08 22:47:08 UTC (rev 292639)
+++ trunk/PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig	2022-04-08 22:56:27 UTC (rev 292640)
@@ -24,8 +24,6 @@
 #include "Base.xcconfig"
 #include? "../../../LocalOverrides.xcconfig"
 
-ARCHS = $(ARCHS_STANDARD_32_64_BIT);
-
 _ONLY_ACTIVE_ARCH_ = YES;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;


Modified: trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig (292639 => 292640)

--- trunk/PerformanceTests/MediaTim

[webkit-changes] [292626] trunk

2022-04-08 Thread emw

Title: [292626] trunk








Revision 292626
Author e...@apple.com
Date 2022-04-08 11:29:35 -0700 (Fri, 08 Apr 2022)


Log Message
Unreviewed, reverting r292591.

Causing spurious EWS errors

Reverted changeset:

"[XCBuild] Enable dependency validation by default"
https://bugs.webkit.org/show_bug.cgi?id=238901
https://commits.webkit.org/r292591

Modified Paths

trunk/ChangeLog
trunk/Makefile.shared
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig
trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
trunk/Source/ThirdParty/libwebrtc/ChangeLog
trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/Configurations/DebugRelease.xcconfig
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/DebugRelease.xcconfig
trunk/Source/WebCore/PAL/ChangeLog
trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig
trunk/Source/WebGPU/ChangeLog
trunk/Source/WebGPU/Configurations/DebugRelease.xcconfig
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Configurations/DebugRelease.xcconfig
trunk/Source/WebKitLegacy/mac/ChangeLog
trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig
trunk/Source/bmalloc/ChangeLog
trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig
trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
trunk/Tools/MobileMiniBrowser/Configurations/DebugRelease.xcconfig
trunk/Tools/Scripts/build-webkit
trunk/Tools/Scripts/set-webkit-configuration
trunk/Tools/Scripts/webkitdirs.pm
trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig




Diff

Modified: trunk/ChangeLog (292625 => 292626)

--- trunk/ChangeLog	2022-04-08 18:19:49 UTC (rev 292625)
+++ trunk/ChangeLog	2022-04-08 18:29:35 UTC (rev 292626)
@@ -1,3 +1,15 @@
+2022-04-08  Elliott Williams  
+
+Unreviewed, reverting r292591.
+
+Causing spurious EWS errors
+
+Reverted changeset:
+
+"[XCBuild] Enable dependency validation by default"
+https://bugs.webkit.org/show_bug.cgi?id=238901
+https://commits.webkit.org/r292591
+
 2022-04-07  Elliott Williams  
 
 [XCBuild] Enable dependency validation by default


Modified: trunk/Makefile.shared (292625 => 292626)

--- trunk/Makefile.shared	2022-04-08 18:19:49 UTC (rev 292625)
+++ trunk/Makefile.shared	2022-04-08 18:29:35 UTC (rev 292626)
@@ -97,6 +97,11 @@
 CONFIG_OPTIONS += --lto-mode=none
 endif
 
+ifeq (YES,$(findstring YES,$(VALIDATE_DEPENDENCIES)))
+CONFIG_OPTIONS += --validate-dependencies
+XCODE_OPTIONS += -EnableBuildDebugging=1 VALIDATE_DEPENDENCIES=$(VALIDATE_DEPENDENCIES)
+endif
+
 export DSYMUTIL_NUM_THREADS = $(shell sysctl -n hw.activecpu)
 
 # Run xcodebuild with the same PATH with which the Xcode IDE runs, to mitigate unnecessary rebuilds due to PATH differences.
@@ -119,7 +124,9 @@
 endef
 
 all:
+ifneq (,$(CONFIG_OPTIONS))
 	@$(call set_webkit_configuration,)
+endif
 	@$(call invoke_xcode,,,GCC_PREPROCESSOR_DEFINITIONS='$(GCC_PREPROCESSOR_ADDITIONS) $$(inherited)')
 
 debug d: force


Modified: trunk/Source/_javascript_Core/ChangeLog (292625 => 292626)

--- trunk/Source/_javascript_Core/ChangeLog	2022-04-08 18:19:49 UTC (rev 292625)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-04-08 18:29:35 UTC (rev 292626)
@@ -1,3 +1,15 @@
+2022-04-08  Elliott Williams  
+
+Unreviewed, reverting r292591.
+
+Causing spurious EWS errors
+
+Reverted changeset:
+
+"[XCBuild] Enable dependency validation by default"
+https://bugs.webkit.org/show_bug.cgi?id=238901
+https://commits.webkit.org/r292591
+
 2022-04-08  Chris Dumez  
 
 Reduce number of StringView to String conversions in JSC


Modified: trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig (292625 => 292626)

--- trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig	2022-04-08 18:19:49 UTC (rev 292625)
+++ trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig	2022-04-08 18:29:35 UTC (rev 292626)
@@ -40,8 +40,6 @@
 SDKROOT_ = macosx;
 SDKROOT_YES = macosx.internal;
 
-VALIDATE_DEPENDENCIES = YES_ERROR;
-
 WK_RELOCATABLE_FRAMEWORKS = YES;
 
 WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);


Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (292625 => 292626)

--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2022-04-08 18:19:49 UTC (rev 292625)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2022-04-08 18:29:35 UTC (rev 292626)
@@ -1,3 +1,15 @@
+2022-04-08  Elliott Williams  
+
+Unreviewed, reverting r292591.

[webkit-changes] [292591] trunk

2022-04-07 Thread emw

Title: [292591] trunk








Revision 292591
Author e...@apple.com
Date 2022-04-07 21:09:07 -0700 (Thu, 07 Apr 2022)


Log Message
[XCBuild] Enable dependency validation by default
https://bugs.webkit.org/show_bug.cgi?id=238901


Reviewed by Alexey Proskuryakov.

.:

Set VALIDATE_DEPENDENCIES=YES_ERROR everywhere, so that builds fail
when task outputs are missing.

The only interesting detail is that we need to set an extended
attribute on the user's build directory in order for XCBuild to
validate dependencies _within_ that directory. Since a users' build
directory may not be created by XCBuild, have build-webkit and
set-webkit-configuration set the attribute manually.

* Makefile.shared: Remove the VALIDATE_DEPENDENCIES opt-in logic.
Always call through to set-webkit-configuration, because that's where
we verify that CreatedByBuildSystem is set on the build directory.
Don't pass -EnableBuildDebugging=1; it's not actually needed to enable
dependency validation.

Source/bmalloc:

* Configurations/DebugRelease.xcconfig:

Source/_javascript_Core:

* Configurations/DebugRelease.xcconfig:

Source/ThirdParty/ANGLE:

* Configurations/DebugRelease.xcconfig:

Source/ThirdParty/libwebrtc:

* Configurations/DebugRelease.xcconfig:

Source/WebCore:

* Configurations/DebugRelease.xcconfig:

Source/WebCore/PAL:

* Configurations/DebugRelease.xcconfig:

Source/WebGPU:

* Configurations/DebugRelease.xcconfig:

Source/WebInspectorUI:

* Configurations/DebugRelease.xcconfig:

Source/WebKit:

* Configurations/DebugRelease.xcconfig:

Source/WebKitLegacy/mac:

* Configurations/DebugRelease.xcconfig:

Source/WTF:

* Configurations/DebugRelease.xcconfig:

Tools:

* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
* ImageDiff/cg/Configurations/DebugRelease.xcconfig:
* MiniBrowser/Configurations/DebugRelease.xcconfig:
* MobileMiniBrowser/Configurations/DebugRelease.xcconfig:
* Scripts/build-webkit:
* Scripts/set-webkit-configuration: When run with no arguments, checks
the base product directory, prints the configuration, and exits.
Recognizes -h and --help flags to show usage.
* Scripts/webkitdirs.pm:
(markBaseProductDirectoryAsCreatedByXcodeBuildSystem): New name of
setCreatedByXcodeBuildSystem.
(setCreatedByXcodeBuildSystem): Renamed.
* TestWebKitAPI/Configurations/DebugRelease.xcconfig:
* WebKitTestRunner/Configurations/DebugRelease.xcconfig:
* lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig:

Modified Paths

trunk/ChangeLog
trunk/Makefile.shared
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig
trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
trunk/Source/ThirdParty/libwebrtc/ChangeLog
trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/Configurations/DebugRelease.xcconfig
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/DebugRelease.xcconfig
trunk/Source/WebCore/PAL/ChangeLog
trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig
trunk/Source/WebGPU/ChangeLog
trunk/Source/WebGPU/Configurations/DebugRelease.xcconfig
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Configurations/DebugRelease.xcconfig
trunk/Source/WebKitLegacy/mac/ChangeLog
trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig
trunk/Source/bmalloc/ChangeLog
trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig
trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
trunk/Tools/MobileMiniBrowser/Configurations/DebugRelease.xcconfig
trunk/Tools/Scripts/build-webkit
trunk/Tools/Scripts/set-webkit-configuration
trunk/Tools/Scripts/webkitdirs.pm
trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig




Diff

Modified: trunk/ChangeLog (292590 => 292591)

--- trunk/ChangeLog	2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/ChangeLog	2022-04-08 04:09:07 UTC (rev 292591)
@@ -1,3 +1,26 @@
+2022-04-07  Elliott Williams  
+
+[XCBuild] Enable dependency validation by default
+https://bugs.webkit.org/show_bug.cgi?id=238901
+
+
+Reviewed by Alexey Proskuryakov.
+
+Set VALIDATE_DEPENDENCIES=YES_ERROR everywhere, so that builds fail
+when task outputs are missing.
+
+The only interesting detail is that we need to set an extended
+attribute on the user's build directory in order for XCBuild to
+validate dependencies _within_ that directory. Since a users' build
+directory may not be created by XCBuild, have build-webkit and
+set-webkit-configuration set the at

[webkit-changes] [292444] trunk/Source/WebCore/PAL

2022-04-05 Thread emw

Title: [292444] trunk/Source/WebCore/PAL








Revision 292444
Author e...@apple.com
Date 2022-04-05 17:24:58 -0700 (Tue, 05 Apr 2022)


Log Message
[XCBuild] PAL: Add headers-only dependency on WebGPU
https://bugs.webkit.org/show_bug.cgi?id=238646

Reviewed by Alexey Proskuryakov.

Lots of includes of WebGPU in pal/graphics/WebGPU/Impl, so the build system needs to know to
copy its headers before building PAL.

Clean up a file reference to a header that was removed in
https://commits.webkit.org/247364@main

* PAL.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/WebCore/PAL/ChangeLog
trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig
trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/WebCore/PAL/ChangeLog (292443 => 292444)

--- trunk/Source/WebCore/PAL/ChangeLog	2022-04-06 00:08:40 UTC (rev 292443)
+++ trunk/Source/WebCore/PAL/ChangeLog	2022-04-06 00:24:58 UTC (rev 292444)
@@ -1,3 +1,18 @@
+2022-04-05  Elliott Williams  
+
+[XCBuild] PAL: Add headers-only dependency on WebGPU
+https://bugs.webkit.org/show_bug.cgi?id=238646
+
+Reviewed by Alexey Proskuryakov.
+
+Lots of includes of WebGPU in pal/graphics/WebGPU/Impl, so the build system needs to know to
+copy its headers before building PAL.
+
+Clean up a file reference to a header that was removed in
+https://commits.webkit.org/247364@main
+
+* PAL.xcodeproj/project.pbxproj:
+
 2022-04-05  Chris Dumez  
 
 Mark String(const char*) constructor as explicit


Modified: trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig (292443 => 292444)

--- trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig	2022-04-06 00:08:40 UTC (rev 292443)
+++ trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig	2022-04-06 00:24:58 UTC (rev 292444)
@@ -63,7 +63,7 @@
 
 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_PRODUCT_DEPENDENCY_NAMES_$(WK_WHICH_BUILD_SYSTEM));
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(inherited) *.tiff *Cursor.png;
-EXCLUDED_PRODUCT_DEPENDENCY_NAMES_legacy = libWTF.a libWebKitAdditions.a;
+EXCLUDED_PRODUCT_DEPENDENCY_NAMES_legacy = libWTF.a libWebKitAdditions.a WebGPU.framework;
 
 WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
 


Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (292443 => 292444)

--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj	2022-04-06 00:08:40 UTC (rev 292443)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj	2022-04-06 00:24:58 UTC (rev 292444)
@@ -89,6 +89,7 @@
 		CD6122D12559B8F200FC657A /* OutputDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD6122CF2559B8F200FC657A /* OutputDevice.mm */; };
 		CDACB3602387425B0018D7CE /* MediaToolboxSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDACB35E23873E480018D7CE /* MediaToolboxSoftLink.cpp */; };
 		DD05A36027BF0ACE0096EFAB /* libWTF.a in Product Dependencies */ = {isa = PBXBuildFile; fileRef = DD05A35F27BF0AC40096EFAB /* libWTF.a */; };
+		DD0B43C227F679A7009E31FC /* WebGPU.framework in Product Dependencies */ = {isa = PBXBuildFile; fileRef = DD0B43C127F67999009E31FC /* WebGPU.framework */; };
 		DD20DD1227BC90D60093D175 /* MediaTimeAVFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C00CFD21F68CE4600AAC26D /* MediaTimeAVFoundation.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		DD20DD1327BC90D60093D175 /* OutputContext.h in Headers */ = {isa = PBXBuildFile; fileRef = CD6122CA2559B6AC00FC657A /* OutputContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		DD20DD1427BC90D60093D175 /* OutputDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = CD6122CE2559B8F200FC657A /* OutputDevice.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -206,7 +207,6 @@
 		DD20DD8427BC90D70093D175 /* WebGPUPipelineDescriptorBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC5E45E27374948006F6FF4 /* WebGPUPipelineDescriptorBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		DD20DD8527BC90D70093D175 /* WebGPUPipelineLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC5E44527374947006F6FF4 /* WebGPUPipelineLayout.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		DD20DD8627BC90D70093D175 /* WebGPUPipelineLayoutDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC5E44D27374947006F6FF4 /* WebGPUPipelineLayoutDescriptor.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		DD20DD8727BC90D70093D175 /* WebGPUPipelineStatisticName.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC5E43927374946006F6FF4 /* WebGPUPipelineStatisticName.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		DD20DD8827BC90D70093D175 /* WebGPUPowerPreference.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC5E47A27374949006F6FF4 /* WebGPUPowerPreference.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		DD20DD8927BC90D70093D175 /* WebGPUPredefinedColorSpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC5E47D27374949006F6FF4 /* WebGPUPredefinedColorSpace.h */; settings

[webkit-changes] [292433] trunk/Source/WebKitLegacy

2022-04-05 Thread emw

Title: [292433] trunk/Source/WebKitLegacy








Revision 292433
Author e...@apple.com
Date 2022-04-05 15:33:54 -0700 (Tue, 05 Apr 2022)


Log Message
Fix STP build error "no such file or directory: 'Technology'"
https://bugs.webkit.org/show_bug.cgi?id=238834


Reviewed by Alexey Proskuryakov.

* scripts/migrate-header-rule: Don't generate an export list when
building for Mac. We won't use it, and this script does not support
paths in FRAMEWORK_SEARCH_PATHS containing spaces.

Modified Paths

trunk/Source/WebKitLegacy/ChangeLog
trunk/Source/WebKitLegacy/scripts/migrate-header-rule




Diff

Modified: trunk/Source/WebKitLegacy/ChangeLog (292432 => 292433)

--- trunk/Source/WebKitLegacy/ChangeLog	2022-04-05 22:31:41 UTC (rev 292432)
+++ trunk/Source/WebKitLegacy/ChangeLog	2022-04-05 22:33:54 UTC (rev 292433)
@@ -1,3 +1,15 @@
+2022-04-05  Elliott Williams  
+
+Fix STP build error "no such file or directory: 'Technology'"
+https://bugs.webkit.org/show_bug.cgi?id=238834
+
+
+Reviewed by Alexey Proskuryakov.
+
+* scripts/migrate-header-rule: Don't generate an export list when
+building for Mac. We won't use it, and this script does not support
+paths in FRAMEWORK_SEARCH_PATHS containing spaces.
+
 2022-04-04  Elliott Williams  
 
 [XCBuild] WebKitLegacy's "Migrated headers" script does not emit task information


Modified: trunk/Source/WebKitLegacy/scripts/migrate-header-rule (292432 => 292433)

--- trunk/Source/WebKitLegacy/scripts/migrate-header-rule	2022-04-05 22:31:41 UTC (rev 292432)
+++ trunk/Source/WebKitLegacy/scripts/migrate-header-rule	2022-04-05 22:33:54 UTC (rev 292433)
@@ -6,7 +6,10 @@
 # Create a forwarding header to make all imports of this header use WebKitLegacy's header map.
 echo "#import " > "${SCRIPT_OUTPUT_FILE_1}"
 
+if [ ${WK_PLATFORM_NAME} != macosx ]; then
+
 # *_SEARCH_PATHS are already shell-escaped, convert to an array so we can pass a flag for each path.
+# Note that this method does not work for search paths which contain spaces (rdar://91303280).
 eval HEADER_SEARCH_PATHS=(${HEADER_SEARCH_PATHS} ${SYSTEM_HEADER_SEARCH_PATHS})
 eval FRAMEWORK_SEARCH_PATHS=(${FRAMEWORK_SEARCH_PATHS} ${SYSTEM_FRAMEWORK_SEARCH_PATHS})
 
@@ -13,5 +16,10 @@
 # Create an export list, which will be used by "Generate Export Files" to make the
 # EXPORTED_SYMBOLS_FILE passes to the linker.
 for WK_CURRENT_ARCH in ${ARCHS}; do
-tapi reexport -target ${WK_CURRENT_ARCH}-${LLVM_TARGET_TRIPLE_VENDOR}-${LLVM_TARGET_TRIPLE_OS_VERSION}${LLVM_TARGET_TRIPLE_SUFFIX} -isysroot ${SDK_DIR} -I${BUILT_PRODUCTS_DIR} ${HEADER_SEARCH_PATHS[@]/#/-I} -F${BUILT_PRODUCTS_DIR}  ${FRAMEWORK_SEARCH_PATHS[@]/#/-F} -DWEBCORE_EXPORT= "${SDK_DIR}/usr/include/TargetConditionals.h" "${INPUT_FILE_PATH}" -o /dev/stdout
+tapi reexport -target ${WK_CURRENT_ARCH}-${LLVM_TARGET_TRIPLE_VENDOR}-${LLVM_TARGET_TRIPLE_OS_VERSION}${LLVM_TARGET_TRIPLE_SUFFIX} -isysroot ${SDK_DIR} -I${BUILT_PRODUCTS_DIR} ${HEADER_SEARCH_PATHS[@]/#/-I} -F${BUILT_PRODUCTS_DIR} ${FRAMEWORK_SEARCH_PATHS[@]/#/-F} -DWEBCORE_EXPORT= "${SDK_DIR}/usr/include/TargetConditionals.h" "${INPUT_FILE_PATH}" -o /dev/stdout
 done > "${SCRIPT_OUTPUT_FILE_2}"
+
+else
+# Mac platforms don't use this export list.
+touch "${SCRIPT_OUTPUT_FILE_2}"
+fi
\ No newline at end of file






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

[webkit-changes] [292292] trunk

2022-04-04 Thread emw

Title: [292292] trunk








Revision 292292
Author e...@apple.com
Date 2022-04-04 09:59:04 -0700 (Mon, 04 Apr 2022)


Log Message
[XCBuild] WebKitLegacy's "Migrated headers" script does not emit task information
https://bugs.webkit.org/show_bug.cgi?id=238409


Reviewed by Alexey Proskuryakov.

Source/WebKit:

* WebKit.xcodeproj/project.pbxproj: Small build rule fix to prevent "no rule to process
file" warnings on every generated forwarding header. This happened because the build rule
that generates these temporary forwarding headers looked like it was supposed to _process_
those headers, too.

Source/WebKitLegacy:

Like r291809, replace MigrateHeaders.make with a "Migrated Headers" group in
WebKitLegacy.xcodeproj, and use a build rule to rewrite the headers at build-time. This
provides the build system with sufficient metadata to reason about the migrated headers and
when they need to be re-processed.

Since WebKitLegacy uses an export symbols list, run tapi-reexport on each migrated header as
it is processed. In the "Generate Export Files" phase, stitch these together to form the
EXPORTED_SYMBOLS_FILE given to the linker.

* scripts/migrate-header-rule: Added. Runs sed and tapi-reexport on headers as they are
migrated. For tapi, include  so that TARGET_OS_* declarations get
resolved according to the target triple. This was not needed in the Make-based approach
because it processed all the headers in one invocation, and one of them imports
TargetConditionals early enough that it affects the others.

Running one tapi instance per header is obviously more overhead, but on a sufficiently
multicore machine it should be faster than blocking WebKitLegacy's build process on the
Make-based script phase.
* WebKitLegacy.xcodeproj/project.pbxproj: Delete script phases, add "Migrated Headers" group
and build rule. Add a legacy-only "Install Headers" phase which launches a child xcodebuild
to install headers using the new build system. Unlike prior implementations in WebKit, WTF,
and PAL, the child xcodebuild needs access to existing build products so that clang (via
tapi) can import them. Do this by populating the child xcodebuild's SYMROOT with symlinks to
the real build products.

Source/WebKitLegacy/mac:

* Configurations/WebKitLegacy.xcconfig: Use EXCLUDED_SOURCE_FILE_NAMES and
INCLUDED_SOURCE_FILE_NAMES to control which headers are exported. Set
USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES, so that the "Generate Export Files" phase can
depend on the whole directory of reexport files and be invoked when any of them change.
* MigrateHeaders.make: Removed.

Tools:

* Scripts/check-for-inappropriate-files-in-framework: We were relying on a script to create
an (empty) WebKitLegacy.framework/Headers directory, which was being scanned here.
WebKitLegacy is entirely private API, so change it to check PrivateHeaders/.

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Configurations/WebKit.xcconfig
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKitLegacy/ChangeLog
trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj
trunk/Source/WebKitLegacy/mac/ChangeLog
trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
trunk/Tools/ChangeLog
trunk/Tools/Scripts/check-for-inappropriate-files-in-framework


Added Paths

trunk/Source/WebKitLegacy/scripts/migrate-header-rule


Removed Paths

trunk/Source/WebKitLegacy/mac/MigrateHeaders.make
trunk/Source/WebKitLegacy/mac/postprocess-headers.sh




Diff

Modified: trunk/Source/WebKit/ChangeLog (292291 => 292292)

--- trunk/Source/WebKit/ChangeLog	2022-04-04 16:31:48 UTC (rev 292291)
+++ trunk/Source/WebKit/ChangeLog	2022-04-04 16:59:04 UTC (rev 292292)
@@ -1,3 +1,16 @@
+2022-04-04  Elliott Williams  
+
+[XCBuild] WebKitLegacy's "Migrated headers" script does not emit task information
+https://bugs.webkit.org/show_bug.cgi?id=238409
+
+
+Reviewed by Alexey Proskuryakov.
+
+* WebKit.xcodeproj/project.pbxproj: Small build rule fix to prevent "no rule to process
+file" warnings on every generated forwarding header. This happened because the build rule
+that generates these temporary forwarding headers looked like it was supposed to _process_
+those headers, too.
+
 2022-04-04  Kimmo Kinnunen  
 
 RemoteRenderingBackendProxy fails to maintain correct state when gpu process crashes and upon deletion


Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (292291 => 292292)

--- trunk/Source/WebKit/Configurations/WebKit.xcconfig	2022-04-04 16:31:48 UTC (rev 292291)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig	2022-04-04 16:59:04 UTC (rev 292292)
@@ -195,9 +195,9 @@
 
 INCLUDED_SOURCE_FILE_NAMES = $(INCLUDED_MIGRATED_HEADERS_$(WK_WHICH_BUILD_SYSTEM));
 INCLUDED_MIGRATED_HEADERS_not_legacy = $(INCLUDED_MIGRATED_HEADERS_$(USE_INTERNAL_SDK)_$(WK_COCOA_TOUCH)) $(INCLUDED_MIGRATED_HEADERS_$(ENABLE_IOS_TOUCH_EVENTS));
-// WebEventRegion.h is migrated wh

[webkit-changes] [292183] trunk

2022-03-31 Thread emw

Title: [292183] trunk








Revision 292183
Author e...@apple.com
Date 2022-03-31 14:56:59 -0700 (Thu, 31 Mar 2022)


Log Message
[XCBuild] WebKitLegacy's "Migrated headers" script does not emit task information
https://bugs.webkit.org/show_bug.cgi?id=238409


Reviewed by Alexey Proskuryakov.

Source/WebKit:

* WebKit.xcodeproj/project.pbxproj: Small build rule fix to prevent "no rule to process
file" warnings on every generated forwarding header. This happened because the build rule
that generates these temporary forwarding headers looked like it was supposed to _process_
those headers, too.

Source/WebKitLegacy:

Like r291809, replace MigrateHeaders.make with a "Migrated Headers" group in
WebKitLegacy.xcodeproj, and use a build rule to rewrite the headers at build-time. This
provides the build system with sufficient metadata to reason about the migrated headers and
when they need to be re-processed.

Since WebKitLegacy uses an export symbols list, run tapi-reexport on each migrated header as
it is processed. In the "Generate Export Files" phase, stitch these together to form the
EXPORTED_SYMBOLS_FILE given to the linker.

* scripts/migrate-header-rule: Added. Runs sed and tapi-reexport on headers as they are
migrated. For tapi, include  so that TARGET_OS_* declarations get
resolved according to the target triple. This was not needed in the Make-based approach
because it processed all the headers in one invocation, and one of them imports
TargetConditionals early enough that it affects the others.

Running one tapi instance per header is obviously more overhead, but on a sufficiently
multicore machine it should be faster than blocking WebKitLegacy's build process on the
Make-based script phase.
* WebKitLegacy.xcodeproj/project.pbxproj: Delete script phases, add "Migrated Headers" group
and build rule. Add a legacy-only "Install Headers" phase which launches a child xcodebuild
to install headers using the new build system. Unlike prior implementations in WebKit, WTF,
and PAL, the child xcodebuild needs access to existing build products so that clang (via
tapi) can import them. Do this by populating the child xcodebuild's SYMROOT with symlinks to
the real build products.

Source/WebKitLegacy/mac:

* Configurations/WebKitLegacy.xcconfig: Use EXCLUDED_SOURCE_FILE_NAMES and
INCLUDED_SOURCE_FILE_NAMES to control which headers are exported. Set
USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES, so that the "Generate Export Files" phase can
depend on the whole directory of reexport files and be invoked when any of them change.
* MigrateHeaders.make: Removed.

Tools:

* Scripts/check-for-inappropriate-files-in-framework: We were relying on a script to create
an (empty) WebKitLegacy.framework/Headers directory, which was being scanned here.
WebKitLegacy is entirely private API, so change it to check PrivateHeaders/.

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Configurations/WebKit.xcconfig
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKitLegacy/ChangeLog
trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj
trunk/Source/WebKitLegacy/mac/ChangeLog
trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
trunk/Tools/ChangeLog
trunk/Tools/Scripts/check-for-inappropriate-files-in-framework


Added Paths

trunk/Source/WebKitLegacy/scripts/migrate-header-rule


Removed Paths

trunk/Source/WebKitLegacy/mac/MigrateHeaders.make
trunk/Source/WebKitLegacy/mac/postprocess-headers.sh




Diff

Modified: trunk/Source/WebKit/ChangeLog (292182 => 292183)

--- trunk/Source/WebKit/ChangeLog	2022-03-31 21:53:51 UTC (rev 292182)
+++ trunk/Source/WebKit/ChangeLog	2022-03-31 21:56:59 UTC (rev 292183)
@@ -1,3 +1,16 @@
+2022-03-31  Elliott Williams  
+
+[XCBuild] WebKitLegacy's "Migrated headers" script does not emit task information
+https://bugs.webkit.org/show_bug.cgi?id=238409
+
+
+Reviewed by Alexey Proskuryakov.
+
+* WebKit.xcodeproj/project.pbxproj: Small build rule fix to prevent "no rule to process
+file" warnings on every generated forwarding header. This happened because the build rule
+that generates these temporary forwarding headers looked like it was supposed to _process_
+those headers, too.
+
 2022-03-31  Alex Christensen  
 
 null check page in API::DataTask constructor


Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (292182 => 292183)

--- trunk/Source/WebKit/Configurations/WebKit.xcconfig	2022-03-31 21:53:51 UTC (rev 292182)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig	2022-03-31 21:56:59 UTC (rev 292183)
@@ -195,9 +195,9 @@
 
 INCLUDED_SOURCE_FILE_NAMES = $(INCLUDED_MIGRATED_HEADERS_$(WK_WHICH_BUILD_SYSTEM));
 INCLUDED_MIGRATED_HEADERS_not_legacy = $(INCLUDED_MIGRATED_HEADERS_$(USE_INTERNAL_SDK)_$(WK_COCOA_TOUCH)) $(INCLUDED_MIGRATED_HEADERS_$(ENABLE_IOS_TOUCH_EVENTS));
-// WebEventRegion.h is migrated when building for an iOS family target with an internal SD

[webkit-changes] [291900] trunk/Source/WebKit

2022-03-25 Thread emw

Title: [291900] trunk/Source/WebKit








Revision 291900
Author e...@apple.com
Date 2022-03-25 15:55:11 -0700 (Fri, 25 Mar 2022)


Log Message
[Big Sur] WK2 failing to build with `error: reference to 'WebDocumentView' is ambiguous`
https://bugs.webkit.org/show_bug.cgi?id=238384

Reviewed by Alexey Proskuryakov.

Build fix, see rdar://90844690.

Create forwarding headers in WebKit's temporary directory which cause imports of any
migrated header to be imported using WebKit's header map. For example,

#import 
#import 

...both resolve to the same header.

Also, clean up project file references to files which were deleted in r291809.

* WebKit.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/WebKit/ChangeLog (291899 => 291900)

--- trunk/Source/WebKit/ChangeLog	2022-03-25 22:53:21 UTC (rev 291899)
+++ trunk/Source/WebKit/ChangeLog	2022-03-25 22:55:11 UTC (rev 291900)
@@ -1,3 +1,24 @@
+2022-03-25  Elliott Williams  
+
+[Big Sur] WK2 failing to build with `error: reference to 'WebDocumentView' is ambiguous`
+https://bugs.webkit.org/show_bug.cgi?id=238384
+
+Reviewed by Alexey Proskuryakov.
+
+Build fix, see rdar://90844690.
+
+Create forwarding headers in WebKit's temporary directory which cause imports of any
+migrated header to be imported using WebKit's header map. For example,
+
+#import 
+#import 
+
+...both resolve to the same header.
+
+Also, clean up project file references to files which were deleted in r291809.
+
+* WebKit.xcodeproj/project.pbxproj:
+
 2022-03-25  Wenson Hsieh  
 
 Enable PGO when building for release and production


Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (291899 => 291900)

--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-03-25 22:53:21 UTC (rev 291899)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-03-25 22:55:11 UTC (rev 291900)
@@ -2377,19 +2377,38 @@
 		DDA0A38427E56213005E086E /* PBXBuildRule */ = {
 			isa = PBXBuildRule;
 			compilerSpec = com.apple.compilers.proxy.script;
-			filePatterns = "*/WebKitLegacy/*.h */WebCore/*.h";
+			filePatterns = "*/WebKitLegacy/*.h";
 			fileType = pattern.proxy;
 			inputFiles = (
 "$(SRCROOT)/Scripts/postprocess-header-rule",
 			);
 			isEditable = 1;
-			name = "Migrate Headers from WebCore and WebKitLegacy";
+			name = "Migrate Headers from WebKitLegacy";
 			outputFiles = (
 "$(WK_MIGRATED_HEADER_OUTPUT_DIR)/$(INPUT_FILE_NAME)",
+"$(DERIVED_FILE_DIR)/WebKitLegacy/$(INPUT_FILE_NAME)",
 			);
 			runOncePerArchitecture = 0;
-			script = "if [ \"${WK_PLATFORM_NAME}\" != macosx ]; then\necho \"#import \" > \"${SCRIPT_OUTPUT_FILE_0}\"\nelse\n\"${SCRIPT_INPUT_FILE_0}\"\nfi\n";
+			script = "set -e\nif [ \"${WK_PLATFORM_NAME}\" != macosx ]; then\necho \"#import \" > \"${SCRIPT_OUTPUT_FILE_0}\"\nelse\n\"${SCRIPT_INPUT_FILE_0}\"\nfi\necho \"#import \" > \"${SCRIPT_OUTPUT_FILE_1}\"\n";
 		};
+		DDF74C7827EE20C90011F633 /* PBXBuildRule */ = {
+			isa = PBXBuildRule;
+			compilerSpec = com.apple.compilers.proxy.script;
+			filePatterns = "*/WebCore/*.h";
+			fileType = pattern.proxy;
+			inputFiles = (
+"$(SRCROOT)/Scripts/postprocess-header-rule",
+			);
+			isEditable = 1;
+			name = "Migrate Headers from WebCore";
+			outputFiles = (
+"$(WK_MIGRATED_HEADER_OUTPUT_DIR)/$(INPUT_FILE_NAME)",
+"$(DERIVED_FILE_DIR)/WebKitLegacy/$(INPUT_FILE_NAME)",
+"$(DERIVED_FILE_DIR)/WebCore/$(INPUT_FILE_NAME)",
+			);
+			runOncePerArchitecture = 0;
+			script = "set -e\nif [ \"${WK_PLATFORM_NAME}\" != macosx ]; then\necho \"#import \" > \"${SCRIPT_OUTPUT_FILE_0}\"\nelse\n\"${SCRIPT_INPUT_FILE_0}\"\nfi\necho \"#import \" > \"${SCRIPT_OUTPUT_FILE_1}\"\necho \"#import \" > \"${SCRIPT_OUTPUT_FILE_2}\"\n";
+		};
 /* End PBXBuildRule section */
 
 /* Begin PBXContainerItemProxy section */
@@ -2998,8 +3017,6 @@
 		1A1B0EB318A424950038481A /* WKNavigationResponse.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNavigationResponse.mm; sourceTree = ""; };
 		1A1B0EB418A424950038481A /* WKNavigationResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationResponse.h; sourceTree = ""; };
 		1A1B0EB718A424CD0038481A /* WKNavigationResponseInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationResponseInternal.h; sourceTree = ""; };
-		1A1D2116191D995C0001619F /* postprocess-framework-headers.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = "postprocess-framework-headers.sh"; path = "mac/postprocess-framework-headers.sh"; sourceTree = ""; };
-		1A1D2117191D996C0001619F /* MigrateHeadersFromWebKitLegacy.make */ = {isa = PBXFileReference; lastKnownFileType = tex

[webkit-changes] [291251] trunk/Source/bmalloc

2022-03-14 Thread emw

Title: [291251] trunk/Source/bmalloc








Revision 291251
Author e...@apple.com
Date 2022-03-14 14:14:21 -0700 (Mon, 14 Mar 2022)


Log Message
bmalloc.xcodeproj: Remove duplicate file reference
https://bugs.webkit.org/show_bug.cgi?id=237845

Reviewed by Simon Fraser.

pas_thread_local_cache_layout_node_kind.h was listed twice in the same group, probably due
to a merge conflict resolution typo. Dedupe it.

* bmalloc.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/bmalloc/ChangeLog
trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/bmalloc/ChangeLog (291250 => 291251)

--- trunk/Source/bmalloc/ChangeLog	2022-03-14 20:44:12 UTC (rev 291250)
+++ trunk/Source/bmalloc/ChangeLog	2022-03-14 21:14:21 UTC (rev 291251)
@@ -1,3 +1,15 @@
+2022-03-14  Elliott Williams  
+
+bmalloc.xcodeproj: Remove duplicate file reference
+https://bugs.webkit.org/show_bug.cgi?id=237845
+
+Reviewed by Simon Fraser.
+
+pas_thread_local_cache_layout_node_kind.h was listed twice in the same group, probably due
+to a merge conflict resolution typo. Dedupe it.
+
+* bmalloc.xcodeproj/project.pbxproj:
+
 2022-03-12  Tim Horton  
 
 Adopt FALLBACK_PLATFORM_NAME in place of FALLBACK_PLATFORM


Modified: trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj (291250 => 291251)

--- trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj	2022-03-14 20:44:12 UTC (rev 291250)
+++ trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj	2022-03-14 21:14:21 UTC (rev 291251)
@@ -1909,7 +1909,6 @@
 0F8E83272492EAF30046D7F8 /* pas_thread_local_cache_layout_node.c */,
 0F8E83282492EAF30046D7F8 /* pas_thread_local_cache_layout_node.h */,
 0F7C92D826E57F75006AF012 /* pas_thread_local_cache_layout_node_kind.h */,
-0F7C92D826E57F75006AF012 /* pas_thread_local_cache_layout_node_kind.h */,
 0FC40AA22451498E00876DA0 /* pas_thread_local_cache_node.c */,
 0FC40AA72451498E00876DA0 /* pas_thread_local_cache_node.h */,
 E35B7BC927ADB44E00C3498F /* pas_thread_suspend_lock.c */,






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

[webkit-changes] [291192] trunk/Source

2022-03-11 Thread emw

Title: [291192] trunk/Source








Revision 291192
Author e...@apple.com
Date 2022-03-11 14:30:31 -0800 (Fri, 11 Mar 2022)


Log Message
[Xcode] "Nest Headers" script phases copy headers incorrectly on Catalyst
https://bugs.webkit.org/show_bug.cgi?id=237793

Reviewed by Alexey Proskuryakov.

Source/WebCore/PAL:

* PAL.xcodeproj/project.pbxproj:

Source/WTF:

SDK_VARIANT needs to be passed into the nested `xcodebuild` invocation that these script
phases run. Pass WK_USE_ALTERNATE_FRAMEWORKS_DIR=NO to prevent the default behavior where
Catalyst content is installed to /System/iOSSupport, as this causes headers to be copied to
WebKitBuild/Release/System/iOSSupport/...

This script phases only run under the legacy build system, so they do not affect production
builds. https://commits.webkit.org/247656@main provides more context on this hack (tl;dr
it's a temporary workaround for the XCBuild migration).

* WTF.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/WTF.xcodeproj/project.pbxproj
trunk/Source/WebCore/PAL/ChangeLog
trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/WTF/ChangeLog (291191 => 291192)

--- trunk/Source/WTF/ChangeLog	2022-03-11 22:22:51 UTC (rev 291191)
+++ trunk/Source/WTF/ChangeLog	2022-03-11 22:30:31 UTC (rev 291192)
@@ -1,3 +1,21 @@
+2022-03-11  Elliott Williams  
+
+[Xcode] "Nest Headers" script phases copy headers incorrectly on Catalyst
+https://bugs.webkit.org/show_bug.cgi?id=237793
+
+Reviewed by Alexey Proskuryakov.
+
+SDK_VARIANT needs to be passed into the nested `xcodebuild` invocation that these script
+phases run. Pass WK_USE_ALTERNATE_FRAMEWORKS_DIR=NO to prevent the default behavior where
+Catalyst content is installed to /System/iOSSupport, as this causes headers to be copied to
+WebKitBuild/Release/System/iOSSupport/...
+
+This script phases only run under the legacy build system, so they do not affect production
+builds. https://commits.webkit.org/247656@main provides more context on this hack (tl;dr
+it's a temporary workaround for the XCBuild migration).
+
+* WTF.xcodeproj/project.pbxproj:
+
 2022-03-10  Carlos Garcia Campos  
 
 [GTK] Add a unit tests to check the remote inspector HTTP server


Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (291191 => 291192)

--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj	2022-03-11 22:22:51 UTC (rev 291191)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj	2022-03-11 22:30:31 UTC (rev 291192)
@@ -3521,7 +3521,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "[ \"${WK_USE_NEW_BUILD_SYSTEM}\" = YES ] && exit 0\nxcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" installhdrs SYMROOT=\"${TARGET_TEMP_DIR}/LegacyNestHeaders-build\" DSTROOT=\"${BUILT_PRODUCTS_DIR}\" SDKROOT=\"${SDKROOT}\" -UseNewBuildSystem=YES\n\n";
+			shellScript = "[ \"${WK_USE_NEW_BUILD_SYSTEM}\" = YES ] && exit 0\nxcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" installhdrs SYMROOT=\"${TARGET_TEMP_DIR}/LegacyNestHeaders-build\" DSTROOT=\"${BUILT_PRODUCTS_DIR}\" SDKROOT=\"${SDKROOT}\" SDK_VARIANT=\"${SDK_VARIANT}\" WK_USE_ALTERNATE_FRAMEWORKS_DIR=NO -UseNewBuildSystem=YES\n\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 


Modified: trunk/Source/WebCore/PAL/ChangeLog (291191 => 291192)

--- trunk/Source/WebCore/PAL/ChangeLog	2022-03-11 22:22:51 UTC (rev 291191)
+++ trunk/Source/WebCore/PAL/ChangeLog	2022-03-11 22:30:31 UTC (rev 291192)
@@ -1,3 +1,12 @@
+2022-03-11  Elliott Williams  
+
+[Xcode] "Nest Headers" script phases copy headers incorrectly on Catalyst
+https://bugs.webkit.org/show_bug.cgi?id=237793
+
+Reviewed by Alexey Proskuryakov.
+
+* PAL.xcodeproj/project.pbxproj:
+
 2022-03-08  Jean-Yves Avenard  
 
 Split SourceBufferParserWebM and have platform agnostic WebMParser


Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (291191 => 291192)

--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj	2022-03-11 22:22:51 UTC (rev 291191)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj	2022-03-11 22:30:31 UTC (rev 291192)
@@ -2049,7 +2049,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "[ \"${WK_USE_NEW_BUILD_SYSTEM}\" = YES ] && exit 0\nxcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" installhdrs SYMROOT=\"${TARGET_TEMP_DIR}/LegacyNestHeaders-build\" DSTROOT=\"${BUILT_PRODUCTS_DIR}\" SDKROOT=\"${SDKROOT}\" -UseNewBuildSystem=YES\n";
+			shellScript = "[ \"${WK_USE_NEW_BUILD_SYSTEM}\" = YES ] && exit 0\nxcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" installhdrs SYMROOT=\"${TARGET_TEMP_DIR}/LegacyNestHeaders-build\" DSTROOT=\"${BUILT_PRODUCTS_DIR}\" SDKROOT=\"${SDKROOT}\" SDK_VARIANT=\"${SDK_VARIANT}\" WK_USE_ALTERNATE

[webkit-changes] [291181] trunk

2022-03-11 Thread emw

Title: [291181] trunk








Revision 291181
Author e...@apple.com
Date 2022-03-11 11:14:03 -0800 (Fri, 11 Mar 2022)


Log Message
Makefile.shared: Rename WORKSPACE to WORKSPACE_PATH and allow overrides
https://bugs.webkit.org/show_bug.cgi?id=237746

Reviewed by Alexey Proskuryakov.

This permits Make-based workflows which build out of a different workspace, e.g. a workspace
that includes WebKitAdditions.

WORKSPACE_PATH was chosen as a new name for parity with SCRIPTS_PATH and to avoid confusion
with USE_WORKSPACE.

Refactors Makefile.shared a bit to prevent SCHEME or WORKSPACE_PATH being set without
USE_WORKSPACE from breaking the build.

* Makefile.shared:

Modified Paths

trunk/ChangeLog
trunk/Makefile.shared




Diff

Modified: trunk/ChangeLog (291180 => 291181)

--- trunk/ChangeLog	2022-03-11 19:08:58 UTC (rev 291180)
+++ trunk/ChangeLog	2022-03-11 19:14:03 UTC (rev 291181)
@@ -1,3 +1,21 @@
+2022-03-11  Elliott Williams  
+
+Makefile.shared: Rename WORKSPACE to WORKSPACE_PATH and allow overrides
+https://bugs.webkit.org/show_bug.cgi?id=237746
+
+Reviewed by Alexey Proskuryakov.
+
+This permits Make-based workflows which build out of a different workspace, e.g. a workspace
+that includes WebKitAdditions.
+
+WORKSPACE_PATH was chosen as a new name for parity with SCRIPTS_PATH and to avoid confusion
+with USE_WORKSPACE.
+
+Refactors Makefile.shared a bit to prevent SCHEME or WORKSPACE_PATH being set without
+USE_WORKSPACE from breaking the build.
+
+* Makefile.shared:
+
 2022-03-08  Jonathan Bedard  
 
 [git-webkit] Support multiple metadata locations


Modified: trunk/Makefile.shared (291180 => 291181)

--- trunk/Makefile.shared	2022-03-11 19:08:58 UTC (rev 291180)
+++ trunk/Makefile.shared	2022-03-11 19:14:03 UTC (rev 291181)
@@ -4,10 +4,10 @@
 
 ifeq ($(USE_WORKSPACE),YES)
 SCHEME ?= $(notdir $(CURDIR))
-XCODE_TARGET = -scheme "$(SCHEME)"
-WORKSPACE := $(dir $(lastword $(MAKEFILE_LIST)))WebKit.xcworkspace
+WORKSPACE_PATH ?= $(dir $(lastword $(MAKEFILE_LIST)))WebKit.xcworkspace
+XCODE_TARGET = -workspace $(WORKSPACE_PATH) -scheme "$(SCHEME)"
 else
-SCHEME =
+USE_WORKSPACE =
 endif
 
 ifneq (,$(SDKROOT))
@@ -117,9 +117,9 @@
 	( \
 		[[ -t 1 ]] && COLOR_DIAGNOSTICS_ARG="COLOR_DIAGNOSTICS=YES"; \
 		echo; \
-		echo "= BUILDING $(if $(WORKSPACE),$(SCHEME),$(notdir $(CURDIR))) ="; \
+		echo "= BUILDING $(if $(USE_WORKSPACE),$(SCHEME),$(notdir $(CURDIR))) ="; \
 		echo; \
-		$1 xcodebuild $2 $(WORKSPACE:%=-workspace %) $(OTHER_OPTIONS) $(XCODE_TARGET) $(XCODE_OPTIONS) $3 | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} \
+		$1 xcodebuild $2 $(OTHER_OPTIONS) $(XCODE_TARGET) $(XCODE_OPTIONS) $3 | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} \
 	)
 endef
 






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

[webkit-changes] [291142] trunk/Source/JavaScriptCore

2022-03-10 Thread emw

Title: [291142] trunk/Source/_javascript_Core








Revision 291142
Author e...@apple.com
Date 2022-03-10 18:35:06 -0800 (Thu, 10 Mar 2022)


Log Message
[XCBuild] Emit a discovered dependency file from offlineasm
https://bugs.webkit.org/show_bug.cgi?id=237329

Reviewed by Alexey Proskuryakov.

Xcode needs to know what files offlineasm uses and produces in order to schedule it
correctly in incremental builds. Rather than use generated xcfilelists like WebKit does
elsewhere in the project, emit a depfile from offlineasm based on the parse tree's source
files.

Discovered dependency files ("depfiles") are Makefile-formatted files which list the inputs
used to produce an output. They are emitting during the build to a temporary directory, and
ensure that subsequent incremental builds will re-run offlineasm when any of the included
sources change. This is the same mechanism clang uses to track header dependencies.

Unfortunately, the legacy build system will refuse to execute a script phase or rule that
emits a depfile. To work around this, convert the offlineasm pipeline to be based on build
rules, to be used by XCBuild only. The idea is that LowLevelInterpreter.asm is listed as a
source build file in JSCLLIntSettingsExtractor, JSCLLIntOffsetsExtractor, and
_javascript_Core. Each target uses a build rule to generate its respective header from
LowLevelInterpreter.asm. Xcode schedules these rule executions before any clang tasks.

The legacy build system avoids executing the rules via EXCLUDED_SOURCE_FILE_NAMES, and
instead uses the existing build phases, which have "(Legacy)" in their names and are now
no-ops under XCBuild.

Aside from working around the legacy build system's limitations, using build rules is
probably a superior way to express what we're doing, as it gives Xcode the opportunity to
compile other objects in parallel, and could be easily extended to compile multiple discrete
asm files should the need arise.

* Configurations/ToolExecutable.xcconfig: Build rules are XCBuild-only.
* _javascript_Core.xcodeproj/project.pbxproj: Add build rules, rename legacy scripts.
* offlineasm/asm.rb: Add --depfile flag.
* offlineasm/generate_offset_extractor.rb: Add --depfile flag.
* offlineasm/generate_settings_extractor.rb: Add --depfile flag.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig
trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/_javascript_Core/offlineasm/asm.rb
trunk/Source/_javascript_Core/offlineasm/generate_offset_extractor.rb
trunk/Source/_javascript_Core/offlineasm/generate_settings_extractor.rb
trunk/Source/_javascript_Core/offlineasm/parser.rb




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (291141 => 291142)

--- trunk/Source/_javascript_Core/ChangeLog	2022-03-11 02:04:19 UTC (rev 291141)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-03-11 02:35:06 UTC (rev 291142)
@@ -1,3 +1,42 @@
+2022-03-10  Elliott Williams  
+
+[XCBuild] Emit a discovered dependency file from offlineasm
+https://bugs.webkit.org/show_bug.cgi?id=237329
+
+Reviewed by Alexey Proskuryakov.
+
+Xcode needs to know what files offlineasm uses and produces in order to schedule it
+correctly in incremental builds. Rather than use generated xcfilelists like WebKit does
+elsewhere in the project, emit a depfile from offlineasm based on the parse tree's source
+files.
+
+Discovered dependency files ("depfiles") are Makefile-formatted files which list the inputs
+used to produce an output. They are emitting during the build to a temporary directory, and
+ensure that subsequent incremental builds will re-run offlineasm when any of the included
+sources change. This is the same mechanism clang uses to track header dependencies.
+
+Unfortunately, the legacy build system will refuse to execute a script phase or rule that
+emits a depfile. To work around this, convert the offlineasm pipeline to be based on build
+rules, to be used by XCBuild only. The idea is that LowLevelInterpreter.asm is listed as a
+source build file in JSCLLIntSettingsExtractor, JSCLLIntOffsetsExtractor, and
+_javascript_Core. Each target uses a build rule to generate its respective header from
+LowLevelInterpreter.asm. Xcode schedules these rule executions before any clang tasks.
+
+The legacy build system avoids executing the rules via EXCLUDED_SOURCE_FILE_NAMES, and
+instead uses the existing build phases, which have "(Legacy)" in their names and are now
+no-ops under XCBuild.
+
+Aside from working around the legacy build system's limitations, using build rules is
+probably a superior way to express what we're doing, as it gives Xcode the opportunity to
+compile other objects in paral

[webkit-changes] [291133] trunk

2022-03-10 Thread emw

Title: [291133] trunk








Revision 291133
Author e...@apple.com
Date 2022-03-10 14:17:30 -0800 (Thu, 10 Mar 2022)


Log Message
[XCBuild] Fix GeneratedSources dependency validation errors
https://bugs.webkit.org/show_bug.cgi?id=237490

Reviewed by Alexey Proskuryakov.
.:

Fixes miscellanous targets which were not specifying their task outputs correctly.

For easier dependency validation testing, Make builds now recognize a VALIDATE_DEPENDENCIES
setting. Building with VALIDATE_DEPENDENCIES=YES or VALIDATE_DEPENDENCIES=YES_ERROR passes
the setting to xcodebuild and sets a magic xattr on the build directory so that product
files in it are validated.

* Makefile.shared:

Source/_javascript_Core:

Declare JSCBuiltins.cpp in DerivedSources.make. It's created by generate-js-builtins.py but
was never declared as an output.

* DerivedSources-output.xcfilelist: Autogenerated changes.
* DerivedSources.make:

Source/ThirdParty:

In gtest's static library target, replace the folder reference containing headers with file
references for each copied header. This allows XCBuild to correctly plan incremental builds
when these headers change.

* gtest/xcode/Config/StaticLibraryTarget.xcconfig:
* gtest/xcode/gtest.xcodeproj/project.pbxproj:

Source/WebCore:

Declare missing outputs in DerivedSources.make, and merge files from the "Copy Generated
Headers" phase in with the other private headers, since they all go to the same destination.

* DerivedSources-output.xcfilelist: Autogenerated chagnes.
* DerivedSources.make:
* WebCore.xcodeproj/project.pbxproj:

Tools:

* Scripts/set-webkit-configuration: Add --validate-dependencies option.
* WebKitTestRunner/DerivedSources-input.xcfilelist: Autogenerated changes.
* WebKitTestRunner/DerivedSources.make: Explicitly depend on preprocessor.pm, which is
imported by other scripts but not listed as a dependency.

Modified Paths

trunk/ChangeLog
trunk/Makefile.shared
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/DerivedSources-output.xcfilelist
trunk/Source/_javascript_Core/DerivedSources.make
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/ThirdParty/ChangeLog
trunk/Source/ThirdParty/gtest/xcode/Config/StaticLibraryTarget.xcconfig
trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/DerivedSources-output.xcfilelist
trunk/Source/WebCore/DerivedSources.make
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Tools/ChangeLog
trunk/Tools/Scripts/set-webkit-configuration
trunk/Tools/Scripts/webkitdirs.pm
trunk/Tools/WebKitTestRunner/DerivedSources-input.xcfilelist
trunk/Tools/WebKitTestRunner/DerivedSources.make




Diff

Modified: trunk/ChangeLog (291132 => 291133)

--- trunk/ChangeLog	2022-03-10 22:00:17 UTC (rev 291132)
+++ trunk/ChangeLog	2022-03-10 22:17:30 UTC (rev 291133)
@@ -1,3 +1,19 @@
+2022-03-10  Elliott Williams  
+
+[XCBuild] Fix GeneratedSources dependency validation errors
+https://bugs.webkit.org/show_bug.cgi?id=237490
+
+Reviewed by Alexey Proskuryakov.
+
+Fixes miscellanous targets which were not specifying their task outputs correctly.
+
+For easier dependency validation testing, Make builds now recognize a VALIDATE_DEPENDENCIES
+setting. Building with VALIDATE_DEPENDENCIES=YES or VALIDATE_DEPENDENCIES=YES_ERROR passes
+the setting to xcodebuild and sets a magic xattr on the build directory so that product
+files in it are validated.
+
+* Makefile.shared:
+
 2022-03-07  Basuke Suzuki  
 
 Update Basuke Suzuki's status to reviewer


Modified: trunk/Makefile.shared (291132 => 291133)

--- trunk/Makefile.shared	2022-03-10 22:00:17 UTC (rev 291132)
+++ trunk/Makefile.shared	2022-03-10 22:17:30 UTC (rev 291133)
@@ -66,37 +66,42 @@
 endif
 
 ifeq ($(ASAN),YES)
-ASAN_OPTION=--asan
+CONFIG_OPTIONS += --asan
 else
 ifeq ($(ASAN),NO)
-ASAN_OPTION=--no-asan
+CONFIG_OPTIONS += --no-asan
 endif
 endif
 
 ifeq ($(TSAN),YES)
-TSAN_OPTION=--tsan
+CONFIG_OPTIONS += --tsan
 else
 ifeq ($(TSAN),NO)
-TSAN_OPTION=--no-tsan
+CONFIG_OPTIONS += --no-tsan
 endif
 endif
 
 ifeq ($(UBSAN),YES)
-UBSAN_OPTION=--ubsan
+CONFIG_OPTIONS += --ubsan
 else
 ifeq ($(UBSAN),NO)
-UBSAN_OPTION=--no-ubsan
+CONFIG_OPTIONS += --no-ubsan
 endif
 endif
 
 ifeq ($(WK_LTO_MODE),full)
-WK_LTO_OPTION=--lto-mode=full
+CONFIG_OPTIONS += --lto-mode=full
 else ifeq ($(WK_LTO_MODE),thin)
-WK_LTO_OPTION=--lto-mode=thin
+CONFIG_OPTIONS += --lto-mode=thin
 else ifeq ($(WK_LTO_MODE),none)
-WK_LTO_OPTION=--lto-mode=none
+CONFIG_OPTIONS += --lto-mode=none
 endif
 
+ifeq (YES,$(findstring YES,$(VALIDATE_DEPENDENCIES)))
+CONFIG_OPTIONS += --validate-dependencies
+XCODE_OPTIONS += -EnableBuildDebugging=1 VALIDATE_DEPENDENCIES=$(VALIDATE_DEPENDENCIES)
+endif
+
 export DSYMUTIL_NUM_THREADS = $(shell sysctl -n hw.activecpu)
 
 # Run xcodebuild with the same PATH with which the Xcode IDE runs, to mitigate unnecessary rebu

[webkit-changes] [290975] trunk/Source/JavaScriptCore

2022-03-07 Thread emw

Title: [290975] trunk/Source/_javascript_Core








Revision 290975
Author e...@apple.com
Date 2022-03-07 23:18:39 -0800 (Mon, 07 Mar 2022)


Log Message
[XCBuild] Emit a discovered dependency file from offlineasm
https://bugs.webkit.org/show_bug.cgi?id=237329

Reviewed by Keith Miller.

Xcode needs to know what files offlineasm uses and produces in order to schedule it
correctly in incremental builds. Rather than use generated xcfilelists like WebKit does
elsewhere in the project, emit a depfile from offlineasm based on the parse tree's source
files.

Discovered dependency files ("depfiles") are Makefile-formatted files which list the inputs
used to produce an output. They are emitting during the build to a temporary directory, and
ensure that subsequent incremental builds will re-run offlineasm when any of the included
sources change. This is the same mechanism clang uses to track header dependencies.

Unfortunately, the legacy build system will refuse to execute a script phase or rule that
emits a depfile. To work around this, convert the offlineasm pipeline to be based on build
rules, to be used by XCBuild only. The idea is that LowLevelInterpreter.asm is listed as a
source build file in JSCLLIntSettingsExtractor, JSCLLIntOffsetsExtractor, and
_javascript_Core. Each target uses a build rule to generate its respective header from
LowLevelInterpreter.asm. Xcode schedules these rule executions before any clang tasks.

The legacy build system avoids executing the rules via EXCLUDED_SOURCE_FILE_NAMES, and
instead uses the existing build phases, which have "(Legacy)" in their names and are now
no-ops under XCBuild.

Aside from working around the legacy build system's limitations, using build rules is
probably a superior way to express what we're doing, as it gives Xcode the opportunity to
compile other objects in parallel, and could be easily extended to compile multiple discrete
asm files should the need arise.

* Configurations/ToolExecutable.xcconfig: Build rules are XCBuild-only.
* _javascript_Core.xcodeproj/project.pbxproj: Add build rules, rename legacy scripts.
* offlineasm/asm.rb: Add --depfile flag.
* offlineasm/generate_offset_extractor.rb: Add --depfile flag.
* offlineasm/generate_settings_extractor.rb: Add --depfile flag.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig
trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/_javascript_Core/offlineasm/asm.rb
trunk/Source/_javascript_Core/offlineasm/generate_offset_extractor.rb
trunk/Source/_javascript_Core/offlineasm/generate_settings_extractor.rb
trunk/Source/_javascript_Core/offlineasm/parser.rb




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (290974 => 290975)

--- trunk/Source/_javascript_Core/ChangeLog	2022-03-08 06:41:39 UTC (rev 290974)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-03-08 07:18:39 UTC (rev 290975)
@@ -1,3 +1,42 @@
+2022-03-07  Elliott Williams  
+
+[XCBuild] Emit a discovered dependency file from offlineasm
+https://bugs.webkit.org/show_bug.cgi?id=237329
+
+Reviewed by Keith Miller.
+
+Xcode needs to know what files offlineasm uses and produces in order to schedule it
+correctly in incremental builds. Rather than use generated xcfilelists like WebKit does
+elsewhere in the project, emit a depfile from offlineasm based on the parse tree's source
+files.
+
+Discovered dependency files ("depfiles") are Makefile-formatted files which list the inputs
+used to produce an output. They are emitting during the build to a temporary directory, and
+ensure that subsequent incremental builds will re-run offlineasm when any of the included
+sources change. This is the same mechanism clang uses to track header dependencies.
+
+Unfortunately, the legacy build system will refuse to execute a script phase or rule that
+emits a depfile. To work around this, convert the offlineasm pipeline to be based on build
+rules, to be used by XCBuild only. The idea is that LowLevelInterpreter.asm is listed as a
+source build file in JSCLLIntSettingsExtractor, JSCLLIntOffsetsExtractor, and
+_javascript_Core. Each target uses a build rule to generate its respective header from
+LowLevelInterpreter.asm. Xcode schedules these rule executions before any clang tasks.
+
+The legacy build system avoids executing the rules via EXCLUDED_SOURCE_FILE_NAMES, and
+instead uses the existing build phases, which have "(Legacy)" in their names and are now
+no-ops under XCBuild.
+
+Aside from working around the legacy build system's limitations, using build rules is
+probably a superior way to express what we're doing, as it gives Xcode the opportunity to
+compile other objects in parallel, and could

[webkit-changes] [290957] trunk/Source/WebKit

2022-03-07 Thread emw

Title: [290957] trunk/Source/WebKit








Revision 290957
Author e...@apple.com
Date 2022-03-07 14:13:22 -0800 (Mon, 07 Mar 2022)


Log Message
DerivedSources.make: Regenerate message receiver sources on Makefile changes
https://bugs.webkit.org/show_bug.cgi?id=237543

Reviewed by Alexey Proskuryakov.

This script depends on configuration and other sources in DerivedSources.make, so it should
regenerate when they change. Fixes one-time incremental build failures caused by r290896.

* DerivedSources.make:

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/DerivedSources-input.xcfilelist
trunk/Source/WebKit/DerivedSources.make




Diff

Modified: trunk/Source/WebKit/ChangeLog (290956 => 290957)

--- trunk/Source/WebKit/ChangeLog	2022-03-07 22:11:36 UTC (rev 290956)
+++ trunk/Source/WebKit/ChangeLog	2022-03-07 22:13:22 UTC (rev 290957)
@@ -1,3 +1,15 @@
+2022-03-07  Elliott Williams  
+
+DerivedSources.make: Regenerate message receiver sources on Makefile changes
+https://bugs.webkit.org/show_bug.cgi?id=237543
+
+Reviewed by Alexey Proskuryakov.
+
+This script depends on configuration and other sources in DerivedSources.make, so it should
+regenerate when they change. Fixes one-time incremental build failures caused by r290896.
+
+* DerivedSources.make:
+
 2022-03-07  Alex Christensen  
 
 Remove unnecessary Async attribute in .messages.in files


Modified: trunk/Source/WebKit/DerivedSources-input.xcfilelist (290956 => 290957)

--- trunk/Source/WebKit/DerivedSources-input.xcfilelist	2022-03-07 22:11:36 UTC (rev 290956)
+++ trunk/Source/WebKit/DerivedSources-input.xcfilelist	2022-03-07 22:13:22 UTC (rev 290957)
@@ -18,6 +18,7 @@
 $(_javascript_CORE_PRIVATE_HEADERS_DIR)/jsmin.py
 $(_javascript_CORE_PRIVATE_HEADERS_DIR)/models.py
 $(_javascript_CORE_PRIVATE_HEADERS_DIR)/xxd.pl
+$(PROJECT_DIR)/DerivedSources.make
 $(PROJECT_DIR)/GPUProcess/GPUConnectionToWebProcess.messages.in
 $(PROJECT_DIR)/GPUProcess/GPUProcess.messages.in
 $(PROJECT_DIR)/GPUProcess/graphics/RemoteDisplayListRecorder.messages.in


Modified: trunk/Source/WebKit/DerivedSources.make (290956 => 290957)

--- trunk/Source/WebKit/DerivedSources.make	2022-03-07 22:11:36 UTC (rev 290956)
+++ trunk/Source/WebKit/DerivedSources.make	2022-03-07 22:13:22 UTC (rev 290957)
@@ -316,6 +316,7 @@
 $(WebKit2)/Scripts/webkit/messages.py \
 $(WebKit2)/Scripts/webkit/model.py \
 $(WebKit2)/Scripts/webkit/parser.py \
+$(WebKit2)/DerivedSources.make \
 #
 
 FRAMEWORK_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')






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

[webkit-changes] [290400] trunk

2022-02-23 Thread emw

Title: [290400] trunk








Revision 290400
Author e...@apple.com
Date 2022-02-23 16:47:08 -0800 (Wed, 23 Feb 2022)


Log Message
[XCBuild] Don't automatically use the ../Internal/WebKit workspace
https://bugs.webkit.org/show_bug.cgi?id=237115

Reviewed by Alexey Proskuryakov.

When the USE_WORKSPACE=YES Make flag was added in https://commits.webkit.org/246232@main, we
configured Make to automatically use the workspace at ../Internal/WebKit/WebKit.xcworkspace,
if it was available. The idea was to make it easier for workspace builds to automatically
detect dependencies needed by folks at Apple, like WebKitAdditions.

In practice, this has made workspace builds silently rely on code from outside of the WebKit
repo, and it's unintuitive since non-workspace Make builds do not do this.

* Makefile.shared:

Modified Paths

trunk/ChangeLog
trunk/Makefile.shared




Diff

Modified: trunk/ChangeLog (290399 => 290400)

--- trunk/ChangeLog	2022-02-24 00:39:27 UTC (rev 290399)
+++ trunk/ChangeLog	2022-02-24 00:47:08 UTC (rev 290400)
@@ -1,3 +1,20 @@
+2022-02-23  Elliott Williams  
+
+[XCBuild] Don't automatically use the ../Internal/WebKit workspace
+https://bugs.webkit.org/show_bug.cgi?id=237115
+
+Reviewed by Alexey Proskuryakov.
+
+When the USE_WORKSPACE=YES Make flag was added in https://commits.webkit.org/246232@main, we
+configured Make to automatically use the workspace at ../Internal/WebKit/WebKit.xcworkspace,
+if it was available. The idea was to make it easier for workspace builds to automatically
+detect dependencies needed by folks at Apple, like WebKitAdditions.
+
+In practice, this has made workspace builds silently rely on code from outside of the WebKit
+repo, and it's unintuitive since non-workspace Make builds do not do this.
+
+* Makefile.shared:
+
 2022-02-23  W.D. Xiong  
 
 Add wdx's Github username to contributors.json


Modified: trunk/Makefile.shared (290399 => 290400)

--- trunk/Makefile.shared	2022-02-24 00:39:27 UTC (rev 290399)
+++ trunk/Makefile.shared	2022-02-24 00:47:08 UTC (rev 290400)
@@ -5,10 +5,7 @@
 ifeq ($(USE_WORKSPACE),YES)
 SCHEME ?= $(notdir $(CURDIR))
 XCODE_TARGET = -scheme "$(SCHEME)"
-WORKSPACE := $(firstword $(wildcard \
-	$(dir $(lastword $(MAKEFILE_LIST)))../Internal/WebKit/WebKit.xcworkspace \
-	$(dir $(lastword $(MAKEFILE_LIST)))WebKit.xcworkspace \
-	))
+WORKSPACE := $(dir $(lastword $(MAKEFILE_LIST)))WebKit.xcworkspace
 else
 SCHEME =
 endif






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

[webkit-changes] [290335] trunk/Source

2022-02-22 Thread emw

Title: [290335] trunk/Source








Revision 290335
Author e...@apple.com
Date 2022-02-22 15:07:26 -0800 (Tue, 22 Feb 2022)


Log Message
Source/WebCore/PAL:
Replace legacy-build-copy-nested-headers.py with an xcodebuild invocation.
https://bugs.webkit.org/show_bug.cgi?id=237011

Reviewed by Alexey Proskuryakov.

r290260 added a script to approximate how XCBuild copies headers to nested directories, for
use in legacy builds. Instead of that script, invoke `xcodebuild -UseNewBuildSystem=YES`
directly to copy nested headers to the build products directory. By taking the same
header-copying codepath, legacy builds can handle header edge cases (e.g. multiple headers
with the same basename) exactly as XCBuild does.

The child xcodebuild process saves incremental data to TARGET_TEMP_DIR, so it can rebuild
incrementally without clobbering the legacy build system's incremental data.

Apple production builds do not use the legacy build system, so this change is
engineering-only.

* PAL.xcodeproj/project.pbxproj:

Source/WTF:
Replace legacy-build-copy-nested-headers.py with an xcodebuild invocation
https://bugs.webkit.org/show_bug.cgi?id=237011

Reviewed by Alexey Proskuryakov.

* Scripts/legacy-build-copy-nested-headers.py: Removed.
* WTF.xcodeproj/project.pbxproj: Remove reference to legacy-build-copy-nested-headers.py.

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/WTF.xcodeproj/project.pbxproj
trunk/Source/WebCore/PAL/ChangeLog
trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj


Removed Paths

trunk/Source/WTF/Scripts/legacy-build-copy-nested-headers.py




Diff

Modified: trunk/Source/WTF/ChangeLog (290334 => 290335)

--- trunk/Source/WTF/ChangeLog	2022-02-22 23:02:31 UTC (rev 290334)
+++ trunk/Source/WTF/ChangeLog	2022-02-22 23:07:26 UTC (rev 290335)
@@ -1,3 +1,13 @@
+2022-02-22  Elliott Williams  
+
+Replace legacy-build-copy-nested-headers.py with an xcodebuild invocation
+https://bugs.webkit.org/show_bug.cgi?id=237011
+
+Reviewed by Alexey Proskuryakov.
+
+* Scripts/legacy-build-copy-nested-headers.py: Removed.
+* WTF.xcodeproj/project.pbxproj: Remove reference to legacy-build-copy-nested-headers.py.
+
 2022-02-22  Angelos Oikonomopoulos  
 
 Ruby ERB.new compatibility fix


Deleted: trunk/Source/WTF/Scripts/legacy-build-copy-nested-headers.py (290334 => 290335)

--- trunk/Source/WTF/Scripts/legacy-build-copy-nested-headers.py	2022-02-22 23:02:31 UTC (rev 290334)
+++ trunk/Source/WTF/Scripts/legacy-build-copy-nested-headers.py	2022-02-22 23:07:26 UTC (rev 290335)
@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-"""
-Xcode's legacy build system lacks a way to create *nested* header directories, i.e. copying headers to a build product
-while preserving the directory hierarchy of those headers. This script compensates by copying headers from a "flattened"
-directory (denoted by ${HEADER_OUTPUT_DIR}) to a "nested" directory hierarchy (starting at
-${WK_NESTED_HEADER_OUTPUT_DIR}).
-"""
-
-import os
-import shutil
-import sys
-from pathlib import Path
-
-if os.environ.get('WK_USE_NEW_BUILD_SYSTEM') == 'YES':
-# XCBuild uses build rules to do this natively; this script is for backwards
-# compatibility only.
-sys.exit(0)
-
-flattened_headers_folder = Path('{HEADER_OUTPUT_DIR}'.format_map(os.environ))
-nested_headers_folder = Path('{WK_NESTED_HEADER_OUTPUT_DIR}'.format_map(os.environ))
-header_srcroot = Path('{WK_HEADER_SRCROOT}'.format_map(os.environ))
-
-for header in header_srcroot.rglob('*.h'):
-flattened = flattened_headers_folder / header.name
-nested = nested_headers_folder / header.relative_to(header_srcroot)
-if not flattened.exists():
-# This header exists in the project's sources, but isn't being copied by
-# Xcode. Skip it.
-continue
-if nested.exists() and os.path.getmtime(nested) >= os.path.getmtime(header):
-# This header has already been copied. Skip it.
-continue
-
-# Copy the header out of SRCROOT, *NOT* the flattened headers folder.
-# Headers with the same basename might have overwritten each other in the
-# flattened directory, so there's no guarantee that a flattened header is
-# actually the header we want.
-print(header, '->', nested)
-nested.parent.mkdir(parents=True, exist_ok=True)
-shutil.copyfile(header, nested)


Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (290334 => 290335)

--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj	2022-02-22 23:02:31 UTC (rev 290334)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj	2022-02-22 23:07:26 UTC (rev 290335)
@@ -161,7 +161,6 @@
 		CEA072AA236FFBF70018839C /* CrashReporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA072A9236FFBF70018839C /* CrashReporter.cpp */; };
 		DCEE22011CEA7551000C2396 /* BlockObjCExceptions.mm in Sources */ = {isa = PBXBuildFile; fileRef = DCEE21FD1CEA7551000C2396 /* BlockObjCExceptions.mm */; };
 		DD03059327B5DA0D00344002 /* SignedPtr.h in Head

[webkit-changes] [290157] trunk

2022-02-18 Thread emw

Title: [290157] trunk








Revision 290157
Author e...@apple.com
Date 2022-02-18 13:12:51 -0800 (Fri, 18 Feb 2022)


Log Message
[XCBuild] "All Modules" workspace builds building out of order
https://bugs.webkit.org/show_bug.cgi?id=236813

Reviewed by Alexey Proskuryakov.

Source/ThirdParty/libwebrtc:

Nothing particularly interesting here, but should fix build failures on
Apple-BigSur-XCBuild-Release-Build .

* libwebrtc.xcodeproj/project.pbxproj: Ensure yasm is built before using it.

Source/WebCore/PAL:

Add product dependency on WTF, since PAL uses its headers without linking against it.

* PAL.xcodeproj/project.pbxproj:

Source/WebGPU:

Add product dependency on WTF. WGSL uses its headers without linking against it.

* Configurations/WGSL.xcconfig:
* WebGPU.xcodeproj/project.pbxproj:

Tools:

Add product dependency on WebKit. LayoutTestHelper uses headers from WebKit and lower
frameworks without linking against them.

* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
* DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig:

Modified Paths

trunk/Source/ThirdParty/libwebrtc/ChangeLog
trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
trunk/Source/WebCore/PAL/ChangeLog
trunk/Source/WebCore/PAL/Configurations/Base.xcconfig
trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig
trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
trunk/Source/WebGPU/ChangeLog
trunk/Source/WebGPU/Configurations/Base.xcconfig
trunk/Source/WebGPU/Configurations/WGSL.xcconfig
trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig




Diff

Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (290156 => 290157)

--- trunk/Source/ThirdParty/libwebrtc/ChangeLog	2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog	2022-02-18 21:12:51 UTC (rev 290157)
@@ -1,3 +1,15 @@
+2022-02-18  Elliott Williams  
+
+[XCBuild] "All Modules" workspace builds building out of order
+https://bugs.webkit.org/show_bug.cgi?id=236813
+
+Reviewed by Alexey Proskuryakov.
+
+Nothing particularly interesting here, but should fix build failures on
+Apple-BigSur-XCBuild-Release-Build .
+
+* libwebrtc.xcodeproj/project.pbxproj: Ensure yasm is built before using it.
+
 2022-02-18  Brandon Stewart  
 
 Generate compile_commands.json on macOS Builds


Modified: trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj (290156 => 290157)

--- trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj	2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj	2022-02-18 21:12:51 UTC (rev 290157)
@@ -3884,7 +3884,7 @@
 			outputFiles = (
 "${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o",
 			);
-			script = "SOURCE_DIR=\"${SRCROOT}/Source/third_party/libvpx/source\"\nSOURCE_FILE=\"${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.asm\"\nOBJECT_FILE=\"${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o\"\n\"${BUILT_PRODUCTS_DIR}/yasm\" -fmacho64 -I \"${SOURCE_DIR}/config\" -I \"${SOURCE_DIR}/config/mac/x64\" -I \"${SOURCE_DIR}/libvpx\" -o \"${OBJECT_FILE}.tmp\" \"${SOURCE_FILE}\"\ncmp -s \"${OBJECT_FILE}.tmp\" \"${OBJECT_FILE}\" && rm -f \"${OBJECT_FILE}.tmp\" || mv \"${OBJECT_FILE}.tmp\" \"${OBJECT_FILE}\"\n[[ \"${SOURCE_FILE}\" -nt \"${OBJECT_FILE}\" ]] && touch \"${OBJECT_FILE}\" || true\n";
+			script = "set -e\nSOURCE_DIR=\"${SRCROOT}/Source/third_party/libvpx/source\"\nSOURCE_FILE=\"${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.asm\"\nOBJECT_FILE=\"${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o\"\n\"${BUILT_PRODUCTS_DIR}/yasm\" -fmacho64 -I \"${SOURCE_DIR}/config\" -I \"${SOURCE_DIR}/config/mac/x64\" -I \"${SOURCE_DIR}/libvpx\" -o \"${OBJECT_FILE}.tmp\" \"${SOURCE_FILE}\"\ncmp -s \"${OBJECT_FILE}.tmp\" \"${OBJECT_FILE}\" && rm -f \"${OBJECT_FILE}.tmp\" || mv \"${OBJECT_FILE}.tmp\" \"${OBJECT_FILE}\"\n[[ \"${SOURCE_FILE}\" -nt \"${OBJECT_FILE}\" ]] && touch \"${OBJECT_FILE}\" || true\n";
 		};
 /* End PBXBuildRule section */
 
@@ -17230,6 +17230,7 @@
 			buildConfigurationList = 4105EB7F212E01D2008C0C20 /* Build configuration list for PBXNativeTarget "vpx" */;
 			buildPhases = (
 4105EB6C212E01D2008C0C20 /* Headers */,
+DD05A35A27BF00DF0096EFAB /* (Legacy) Ensure yasm is built */,
 4105EB74212E01D2008C0C20 /* Sources */,
 4105EB7C212E01D2008C0C20 /* Frameworks */,
 4105EB7D212E01D2008C0C20 /* CopyFiles */,
@@ -17532,6 +17533,25 @@
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
 		};
+		DD05A35A27BF00DF0096EFAB /* (Legacy) Ensure yasm is built */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+"$(BUILT_PRODUC

[webkit-changes] [289823] trunk/Source/JavaScriptCore

2022-02-15 Thread emw

Title: [289823] trunk/Source/_javascript_Core








Revision 289823
Author e...@apple.com
Date 2022-02-15 10:33:58 -0800 (Tue, 15 Feb 2022)


Log Message
[Xcode] Remove "Make libWTF.a Symbolic Link" script phase
https://bugs.webkit.org/show_bug.cgi?id=236613

Reviewed by Alexey Proskuryakov.

We pass the absolute path to libWTF.a to ld's -force_load argument. The path was being
computed at build time by a script, but can be expressed in build settings. Change
OTHER_LDFLAGS such that engineering builds libWTF.a from build products, and production
builds use libWTF.a from their SDK.

* Configurations/_javascript_Core.xcconfig: Set OTHER_LDFLAGS.
* _javascript_Core.xcodeproj/project.pbxproj: Remove build phase.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (289822 => 289823)

--- trunk/Source/_javascript_Core/ChangeLog	2022-02-15 18:29:51 UTC (rev 289822)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-02-15 18:33:58 UTC (rev 289823)
@@ -1,3 +1,18 @@
+2022-02-15  Elliott Williams  
+
+[Xcode] Remove "Make libWTF.a Symbolic Link" script phase
+https://bugs.webkit.org/show_bug.cgi?id=236613
+
+Reviewed by Alexey Proskuryakov.
+
+We pass the absolute path to libWTF.a to ld's -force_load argument. The path was being
+computed at build time by a script, but can be expressed in build settings. Change
+OTHER_LDFLAGS such that engineering builds libWTF.a from build products, and production
+builds use libWTF.a from their SDK.
+
+* Configurations/_javascript_Core.xcconfig: Set OTHER_LDFLAGS.
+* _javascript_Core.xcodeproj/project.pbxproj: Remove build phase.
+
 2022-02-15  Adrian Perez de Castro  
 
 [CMake] Checks uses of execute_process() for correct command splitting


Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (289822 => 289823)

--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-02-15 18:29:51 UTC (rev 289822)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-02-15 18:33:58 UTC (rev 289823)
@@ -29,10 +29,13 @@
 // Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
 OTHER_LDFLAGS_HIDE_SYMBOLS = -Wl,-unexported_symbol,__ZTISt9bad_alloc -Wl,-unexported_symbol,__ZTISt9exception -Wl,-unexported_symbol,__ZTSSt9bad_alloc -Wl,-unexported_symbol,__ZTSSt9exception -Wl,-unexported_symbol,__ZdlPvS_ -Wl,-unexported_symbol,__ZnwmPv -Wl,-unexported_symbol,__ZNKSt3__18functionIFvvEEclEv -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEEC1EOS2_ -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEEC2EOS2_ -Wl,-unexported_symbol,__ZNKSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEEclES3_S5_ -Wl,-unexported_symbol,__ZNSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEED1Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEED2Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEED1Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEED2Ev -Wl,-unexported_symbol,__ZTVNSt3__117bad_function_callE -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIPKcS4_cLb1EE11__
 range_endES4_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIPKcS4_cLb1EE13__range_beginES4_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE14__append_rangeIPKcEENS_9enable_ifIXsr27__is_cpp17_forward_iteratorIT_EE5valueEvE4typeERNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcS8_S8_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE15__append_sourceIPKcEEvRNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcRKT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE14__append_rangeIPKcEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeERNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcS8_S8_ -Wl,-unexported_symbol,__ZNKSt3__14__fs10filesystem18directory_iteratordeEv -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem18directory_iteratorppEv -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIA10_cPccLb1EE11__range_endEPKc -Wl,-unexported_symbol,__ZNSt3__14__fs1
 0filesystem24__is_pathable_char_arrayIA10_cPccLb1EE13__range_beginEPKc -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem4pathdVERKS2_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE15__append_sourceIA10_cEEvRNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcRKT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__throw_filesystem_errorIJRPKcRKNS1_4pathERKNS_10error_codevDpOT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem14__is_separatorIcEENS_9enable_ifIXsr18__can_convert_charIT_EE5valueEbE4typeES4_ -Wl,-unexported_symbol,__ZNS

[webkit-changes] [289591] trunk/Source/WTF

2022-02-10 Thread emw

Title: [289591] trunk/Source/WTF








Revision 289591
Author e...@apple.com
Date 2022-02-10 15:57:17 -0800 (Thu, 10 Feb 2022)


Log Message
Copy SignedPtr.h in WTF.xcodeproj
https://bugs.webkit.org/show_bug.cgi?id=236466

Reviewed by Alexey Proskuryakov.

SignedPtr.h was recently added and needs to be part of WTF's Copy Headers phase.

* WTF.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/WTF.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/WTF/ChangeLog (289590 => 289591)

--- trunk/Source/WTF/ChangeLog	2022-02-10 23:49:33 UTC (rev 289590)
+++ trunk/Source/WTF/ChangeLog	2022-02-10 23:57:17 UTC (rev 289591)
@@ -1,5 +1,16 @@
 2022-02-10  Elliott Williams  
 
+Copy SignedPtr.h in WTF.xcodeproj
+https://bugs.webkit.org/show_bug.cgi?id=236466
+
+Reviewed by Alexey Proskuryakov.
+
+SignedPtr.h was recently added and needs to be part of WTF's Copy Headers phase.
+
+* WTF.xcodeproj/project.pbxproj:
+
+2022-02-10  Elliott Williams  
+
 Reland native Xcode build phases for "Copy WTF Headers", again
 https://bugs.webkit.org/show_bug.cgi?id=235744
 


Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (289590 => 289591)

--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj	2022-02-10 23:49:33 UTC (rev 289590)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj	2022-02-10 23:57:17 UTC (rev 289591)
@@ -159,6 +159,7 @@
 		CD5497AC15857D0300B5BC30 /* MediaTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5497AA15857D0300B5BC30 /* MediaTime.cpp */; };
 		CEA072AA236FFBF70018839C /* CrashReporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA072A9236FFBF70018839C /* CrashReporter.cpp */; };
 		DCEE22011CEA7551000C2396 /* BlockObjCExceptions.mm in Sources */ = {isa = PBXBuildFile; fileRef = DCEE21FD1CEA7551000C2396 /* BlockObjCExceptions.mm */; };
+		DD03059327B5DA0D00344002 /* SignedPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 862A8D32278DE74A0014120C /* SignedPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		DD3DC85E27A4BF8E007E5B61 /* WeakHashSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B67F3F12228D5310030DE9C /* WeakHashSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		DD3DC85F27A4BF8E007E5B61 /* HashMap.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472B6151A825A004123FF /* HashMap.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		DD3DC86027A4BF8E007E5B61 /* Observer.h in Headers */ = {isa = PBXBuildFile; fileRef = CD48A87024C8A21600F5800C /* Observer.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -3276,6 +3277,7 @@
 DD3DC88627A4BF8E007E5B61 /* SetForScope.h in Headers */,
 DD3DC8BB27A4BF8E007E5B61 /* SHA1.h in Headers */,
 DD3DC88B27A4BF8E007E5B61 /* SharedTask.h in Headers */,
+DD03059327B5DA0D00344002 /* SignedPtr.h in Headers */,
 DD3DC8F727A4BF8E007E5B61 /* SimpleStats.h in Headers */,
 DD3DC97627A4BF8E007E5B61 /* SingleRootGraph.h in Headers */,
 DD3DC89627A4BF8E007E5B61 /* SinglyLinkedList.h in Headers */,






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

[webkit-changes] [289587] trunk

2022-02-10 Thread emw

Title: [289587] trunk








Revision 289587
Author e...@apple.com
Date 2022-02-10 15:22:23 -0800 (Thu, 10 Feb 2022)


Log Message
[Xcode] Perform a full build when analyzing
https://bugs.webkit.org/show_bug.cgi?id=236421

Reviewed by Alexey Proskuryakov.

`xcodebuild analyze` does just enough work to run the analyzer on each target, and doesn't
appear to run build phases that only impact consumers of the target. In particular, it
doesn't copy framework headers.

Fix by telling xcodebuild to build _and_ analyze at once. AFAICT, this is exactly what
Xcode's Product > Analyze command does.

* Makefile.shared: s/analyze/build analyze

Modified Paths

trunk/ChangeLog
trunk/Makefile.shared




Diff

Modified: trunk/ChangeLog (289586 => 289587)

--- trunk/ChangeLog	2022-02-10 23:11:24 UTC (rev 289586)
+++ trunk/ChangeLog	2022-02-10 23:22:23 UTC (rev 289587)
@@ -1,3 +1,19 @@
+2022-02-10  Elliott Williams  
+
+[Xcode] Perform a full build when analyzing
+https://bugs.webkit.org/show_bug.cgi?id=236421
+
+Reviewed by Alexey Proskuryakov.
+
+`xcodebuild analyze` does just enough work to run the analyzer on each target, and doesn't
+appear to run build phases that only impact consumers of the target. In particular, it
+doesn't copy framework headers.
+
+Fix by telling xcodebuild to build _and_ analyze at once. AFAICT, this is exactly what
+Xcode's Product > Analyze command does.
+
+* Makefile.shared: s/analyze/build analyze
+
 2022-02-10  Alejandro G. Castro  
 
 [GTK][WPE] Improve device detection in the GbmDevice


Modified: trunk/Makefile.shared (289586 => 289587)

--- trunk/Makefile.shared	2022-02-10 23:11:24 UTC (rev 289586)
+++ trunk/Makefile.shared	2022-02-10 23:22:23 UTC (rev 289587)
@@ -138,7 +138,7 @@
 
 analyze:
 	@$(call set_webkit_configuration,--debug)
-	@$(call invoke_xcode,$(PATH_TO_SCAN_BUILD),analyze,GCC_PREPROCESSOR_DEFINITIONS='$(GCC_PREPROCESSOR_ADDITIONS) $$(inherited)')
+	@$(call invoke_xcode,$(PATH_TO_SCAN_BUILD),build analyze,GCC_PREPROCESSOR_DEFINITIONS='$(GCC_PREPROCESSOR_ADDITIONS) $$(inherited)')
 
 clean:
 ifndef XCODE_TARGET






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

[webkit-changes] [289584] trunk

2022-02-10 Thread emw

Title: [289584] trunk








Revision 289584
Author e...@apple.com
Date 2022-02-10 15:07:18 -0800 (Thu, 10 Feb 2022)


Log Message
Use of unversioned 'python' in Mac builds causing failures in 12.3
https://bugs.webkit.org/show_bug.cgi?id=236327

Reviewed by Jonathan Bedard.

* WebKit.xcodeproj/project.pbxproj: python -> python3 in "Replace WebKitAdditions in
Framework Headers" phase.

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Tools/Scripts/extract-dependencies-from-makefile
trunk/Tools/Scripts/generate-xcfilelists




Diff

Modified: trunk/Source/WebKit/ChangeLog (289583 => 289584)

--- trunk/Source/WebKit/ChangeLog	2022-02-10 23:02:57 UTC (rev 289583)
+++ trunk/Source/WebKit/ChangeLog	2022-02-10 23:07:18 UTC (rev 289584)
@@ -1,3 +1,13 @@
+2022-02-10  Elliott Williams  
+
+Use of unversioned 'python' in Mac builds causing failures in 12.3
+https://bugs.webkit.org/show_bug.cgi?id=236327
+
+Reviewed by Jonathan Bedard.
+
+* WebKit.xcodeproj/project.pbxproj: python -> python3 in "Replace WebKitAdditions in
+Framework Headers" phase.
+
 2022-02-10  Kimmo Kinnunen  
 
 ImageBuffer::get/putPixelBuffer should not go through DisplayList


Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (289583 => 289584)

--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-02-10 23:02:57 UTC (rev 289583)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-02-10 23:07:18 UTC (rev 289584)
@@ -15473,7 +15473,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${WK_USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n# In this configuration, post-processing is performed at the same time as copying in the postprocess-header-rule script, so there's no need for this separate step.\nexit 0\nfi\n\nif [ \"${ACTION}\" = \"analyze\" -o \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\nfor HEADERS_DIRECTORY in \"${PUBLIC_HEADERS_FOLDER_PATH}\" \"${PRIVATE_HEADERS_FOLDER_PATH}\"; do\nfor HEADER_PATH in \"${TARGET_BUILD_DIR}/${HEADERS_DIRECTORY}/\"*.*; do\nif [[ ! -z `grep '#import ' \"${HEADER_PATH}\"` ]]; then\npython \"${SRCROOT}/mac/
 replace-webkit-additions-includes.py\" \"${HEADER_PATH}\" \"${BUILT_PRODUCTS_DIR}\" \"${SDKROOT}\" || exit $?\nfi\ndone\ndone\nfi\n\n\n";
+			shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${WK_USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n# In this configuration, post-processing is performed at the same time as copying in the postprocess-header-rule script, so there's no need for this separate step.\nexit 0\nfi\n\nif [ \"${ACTION}\" = \"analyze\" -o \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\nfor HEADERS_DIRECTORY in \"${PUBLIC_HEADERS_FOLDER_PATH}\" \"${PRIVATE_HEADERS_FOLDER_PATH}\"; do\nfor HEADER_PATH in \"${TARGET_BUILD_DIR}/${HEADERS_DIRECTORY}/\"*.*; do\nif [[ ! -z `grep '#import ' \"${HEADER_PATH}\"` ]]; then\npython3 \"${SRCROOT}/mac/
 replace-webkit-additions-includes.py\" \"${HEADER_PATH}\" \"${BUILT_PRODUCTS_DIR}\" \"${SDKROOT}\" || exit $?\nfi\ndone\ndone\nfi\n\n\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 


Modified: trunk/Tools/Scripts/extract-dependencies-from-makefile (289583 => 289584)

--- trunk/Tools/Scripts/extract-dependencies-from-makefile	2022-02-10 23:02:57 UTC (rev 289583)
+++ trunk/Tools/Scripts/extract-dependencies-from-makefile	2022-02-10 23:07:18 UTC (rev 289584)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # vim: set ft=python:
 # -*- coding: utf-8 -*-
 #


Modified: trunk/Tools/Scripts/generate-xcfilelists (289583 => 289584)

--- trunk/Tools/Scripts/generate-xcfilelists	2022-02-10 23:02:57 UTC (rev 289583)
+++ trunk/Tools/Scripts/generate-xcfilelists	2022-02-10 23:07:18 UTC (rev 289584)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2019 Apple Inc.  All rights reserved.






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

[webkit-changes] [289093] trunk/Tools

2022-02-03 Thread emw

Title: [289093] trunk/Tools








Revision 289093
Author e...@apple.com
Date 2022-02-03 17:32:46 -0800 (Thu, 03 Feb 2022)


Log Message
[XCBuild] Add headers-only dependencies to projects in Tools/
https://bugs.webkit.org/show_bug.cgi?id=235751

Reviewed by Alexey Proskuryakov.

Many projects in Tools/ depend on WebKit.framework or other products which are upstream in
the build graph. In Make-based sequential builds, WebKit and friends would always build
before Tools; in workspaces, the targets may build in any order.

Add "product dependencies" build phases to targets which do not express
their dependencies through linker options, in the same manner as
https://commits.webkit.org/246026@main.

The legacy build system doesn't understand the "Product Dependencies" phase and thinks we're
trying to copy our own build products, so add an EXCLUDED_SOURCE_FILE_NAMES setting as a
workaround.

* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Add product dependencies.
* DumpRenderTree/mac/Configurations/Base.xcconfig: Add WK_WHICH_BUILD_SYSTEM.
* DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig: Legacy support.
* TestWebKitAPI/Configurations/Base.xcconfig: Legacy support.
* TestWebKitAPI/Configurations/TestWTFLibrary.xcconfig: Add WK_WHICH_BUILD_SYSTEM.
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Add product dependencies.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig
trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig
trunk/Tools/TestWebKitAPI/Configurations/TestWTFLibrary.xcconfig
trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj




Diff

Modified: trunk/Tools/ChangeLog (289092 => 289093)

--- trunk/Tools/ChangeLog	2022-02-04 01:27:47 UTC (rev 289092)
+++ trunk/Tools/ChangeLog	2022-02-04 01:32:46 UTC (rev 289093)
@@ -1,3 +1,29 @@
+2022-02-03  Elliott Williams  
+
+[XCBuild] Add headers-only dependencies to projects in Tools/
+https://bugs.webkit.org/show_bug.cgi?id=235751
+
+Reviewed by Alexey Proskuryakov.
+
+Many projects in Tools/ depend on WebKit.framework or other products which are upstream in
+the build graph. In Make-based sequential builds, WebKit and friends would always build
+before Tools; in workspaces, the targets may build in any order.
+
+Add "product dependencies" build phases to targets which do not express
+their dependencies through linker options, in the same manner as
+https://commits.webkit.org/246026@main.
+
+The legacy build system doesn't understand the "Product Dependencies" phase and thinks we're
+trying to copy our own build products, so add an EXCLUDED_SOURCE_FILE_NAMES setting as a
+workaround.
+
+* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Add product dependencies.
+* DumpRenderTree/mac/Configurations/Base.xcconfig: Add WK_WHICH_BUILD_SYSTEM.
+* DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig: Legacy support.
+* TestWebKitAPI/Configurations/Base.xcconfig: Legacy support.
+* TestWebKitAPI/Configurations/TestWTFLibrary.xcconfig: Add WK_WHICH_BUILD_SYSTEM.
+* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Add product dependencies.
+
 2022-02-03  Jonathan Bedard  
 
 [EWS] Rename RunJSCTestsWithoutPatch


Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (289092 => 289093)

--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj	2022-02-04 01:27:47 UTC (rev 289092)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj	2022-02-04 01:32:46 UTC (rev 289093)
@@ -119,6 +119,7 @@
 		BCF6C6500C98E9C000AC063E /* GCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF6C64F0C98E9C000AC063E /* GCController.cpp */; };
 		C23EA2081BC9F05100C980B7 /* FontWithFeatures.otf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = C23EA2061BC9EABA00C980B7 /* FontWithFeatures.otf */; };
 		C23EA2091BC9F05100C980B7 /* FontWithFeatures.ttf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = C23EA2071BC9EABA00C980B7 /* FontWithFeatures.ttf */; };
+		DDD2187827A21850002B7025 /* WebKit.framework in Product Dependencies */ = {isa = PBXBuildFile; fileRef = 9335435F03D75502008635CE /* WebKit.framework */; };
 		E1B7816511AF31B7007E1BC2 /* MockGeolocationProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1B7808711AF1669007E1BC2 /* MockGeolocationProvider.mm */; };
 		F4010B7B24DA201F00A876E2 /* PoseAsClass.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4010B7924DA200E00A876E2 /* PoseAsClass.mm */; };
 		F445C68624B2789D00790440 /* UIScriptControllerShared.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F445C68524B2788F00790440 /* UIScriptControllerShared.cpp */; };
@@ -198,6 +199,17

[webkit-changes] [289084] trunk

2022-02-03 Thread emw

Title: [289084] trunk








Revision 289084
Author e...@apple.com
Date 2022-02-03 15:21:54 -0800 (Thu, 03 Feb 2022)


Log Message
Add Elliott Williams to contributors.json

Modified Paths

trunk/ChangeLog
trunk/metadata/contributors.json




Diff

Modified: trunk/ChangeLog (289083 => 289084)

--- trunk/ChangeLog	2022-02-03 23:14:43 UTC (rev 289083)
+++ trunk/ChangeLog	2022-02-03 23:21:54 UTC (rev 289084)
@@ -1,3 +1,11 @@
+2022-02-03  Elliott Williams  
+
+Add Elliott Williams to contributors.json
+
+Unreviewed.
+
+* metadata/contributors.json:
+
 2022-01-24  Jonathan Bedard  
 
 [git-webkit] Configure default branch management 


Modified: trunk/metadata/contributors.json (289083 => 289084)

--- trunk/metadata/contributors.json	2022-02-03 23:14:43 UTC (rev 289083)
+++ trunk/metadata/contributors.json	2022-02-03 23:21:54 UTC (rev 289084)
@@ -2234,6 +2234,18 @@
   ]
},
{
+  "emails" : [
+ "e...@apple.com"
+  ],
+  "expertise" : "Xcode build system",
+  "github" : "emw-apple",
+  "name" : "Elliott Williams",
+  "nicks" : [
+ "emw"
+  ],
+  "status" : "committer"
+   },
+   {
   "aliases" : [
  "Emil Eklund"
   ],






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

50 matches

Mail list logo