Attachment 340712 Details for Bug 185772 – Patch

[patch] Patch

bug-185772-20180518103721.patch (text/plain), 2.60 KB, created by Andy Estes on 2018-05-18 10:37:21 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Estes

Created: 2018-05-18 10:37:21 PDT

Size: 2.60 KB

patch

obsolete

>Subversion Revision: 231960
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index f6ac40b8c91e592eda92f8afa1ce7fa4c478cc9c..dfc4dda8c1c53704ea10b59d92e4ea94245a1ff9 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-05-18  Andy Estes  <aestes@apple.com>
>+
>+        Teach package-root to package iOS sandbox profiles
>+        https://bugs.webkit.org/show_bug.cgi?id=185772
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        For changes to WebKit's XPC services' sandbox profiles to take effect in an
>+        engineering build, they need to be copied to /usr/local/share/sandbox/ and the
>+        user needs to run `sbutil builtin override` on the device.
>+
>+        To make this process slightly easier, teach package-root to package the sandbox
>+        profiles along with the WebKit frameworks.
>+
>+        * Scripts/package-root:
>+
> 2018-05-18  Antoine Quint  <graouts@apple.com>
> 
>         [Web Animations] Turn Web Animations with CSS integration on for test runners
>diff --git a/Tools/Scripts/package-root b/Tools/Scripts/package-root
>index 1d9e63f1ad1802faa451bb81f631dd54b8e4ebc7..33c557e94f0e567f5ad38311b52bce7d00cce6ac 100755
>--- a/Tools/Scripts/package-root
>+++ b/Tools/Scripts/package-root
>@@ -71,17 +71,20 @@ usage() if $showHelp;
> 
> setConfiguration();
> 
>-my @privateFrameworks = qw(WebCore WebKitLegacy WebKit2);
>+my @privateFrameworks = qw(WebCore WebKitLegacy);
> my @publicFrameworks = qw(JavaScriptCore WebKit);
> my $privateInstallPath = "/System/Library/PrivateFrameworks";
> my $publicInstallPath = "/System/Library/Frameworks";
>+my $sandboxInstallPath = "/usr/local/share/sandbox";
> 
> my $configuration = configuration();
> my $platform = xcodeSDKPlatformName();
> my $productDir = productDir();
>+my $sourceDir = sourceDir();
> my $stagingRoot = tempdir(CLEANUP => 1);
> my $stagingPrivatePath = "/$stagingRoot$privateInstallPath";
> my $stagingPublicPath = "/$stagingRoot/$publicInstallPath";
>+my $stagingSandboxPath = "$stagingRoot$sandboxInstallPath";
> my $archiveName = "webkit-$configuration-$platform";
> my $archivePath = "$productDir/$archiveName.tar.gz";
> my ($fh, $tempArchiveName) = tempfile( "/tmp/$archiveName-XXXXXXX");
>@@ -100,6 +103,12 @@ foreach my $framework (@publicFrameworks) {
> 
> system 'ditto', "$productDir/usr", "$stagingRoot/usr";
> 
>+print "Copying iOS sandbox profiles ...\n";
>+system 'mkdir', '-p', $stagingSandboxPath;
>+foreach my $sandboxFile (glob("$sourceDir/Source/WebKit/Resources/SandboxProfiles/ios/*.sb")) {
>+    system 'cp', $sandboxFile, $stagingSandboxPath;
>+}
>+
> chdir $stagingRoot;
> print "Creating compressed archive ...\n";
> system 'ditto', '-cz', $stagingRoot, $tempArchiveName;

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 185772: 340712 | 340753