Bug 227526 - [GTK] Pack header and .pc files in the built-product archive
Summary: [GTK] Pack header and .pc files in the built-product archive
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Philippe Normand
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2021-06-30 07:45 PDT by Philippe Normand
Modified: 2021-07-15 08:21 PDT (History)
12 users (show)

See Also:


Attachments
Patch (9.55 KB, patch)
2021-06-30 07:51 PDT, Philippe Normand
no flags Details | Formatted Diff | Diff
Patch (13.53 KB, patch)
2021-07-02 03:54 PDT, Philippe Normand
no flags Details | Formatted Diff | Diff
Patch (16.02 KB, patch)
2021-07-02 04:06 PDT, Philippe Normand
no flags Details | Formatted Diff | Diff
Patch (16.02 KB, patch)
2021-07-02 04:09 PDT, Philippe Normand
no flags Details | Formatted Diff | Diff
Patch (17.87 KB, patch)
2021-07-02 04:19 PDT, Philippe Normand
no flags Details | Formatted Diff | Diff
Patch (18.52 KB, patch)
2021-07-02 04:28 PDT, Philippe Normand
no flags Details | Formatted Diff | Diff
Patch (18.28 KB, patch)
2021-07-02 05:38 PDT, Philippe Normand
no flags Details | Formatted Diff | Diff
Patch (17.23 KB, patch)
2021-07-02 05:42 PDT, Philippe Normand
no flags Details | Formatted Diff | Diff
Patch (14.05 KB, patch)
2021-07-02 08:16 PDT, Philippe Normand
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Philippe Normand 2021-06-30 07:45:17 PDT
The motivation for this is to enable Epiphany Canary builds from the GNOME CI.
Comment 1 Philippe Normand 2021-06-30 07:51:00 PDT
Created attachment 432592 [details]
Patch
Comment 2 Michael Catanzaro 2021-07-01 12:16:33 PDT
Comment on attachment 432592 [details]
Patch

I wonder, can you install WebKit into an empty install prefix, and then just copy everything it installed? That seems much less fragile.
Comment 3 Philippe Normand 2021-07-02 03:54:10 PDT
Created attachment 432775 [details]
Patch
Comment 4 Philippe Normand 2021-07-02 04:06:24 PDT
Created attachment 432776 [details]
Patch
Comment 5 Philippe Normand 2021-07-02 04:09:45 PDT
Created attachment 432777 [details]
Patch
Comment 6 Philippe Normand 2021-07-02 04:19:00 PDT
Created attachment 432778 [details]
Patch
Comment 7 Philippe Normand 2021-07-02 04:28:22 PDT
Created attachment 432780 [details]
Patch
Comment 8 Philippe Normand 2021-07-02 04:32:58 PDT
Aakash, the EWS fails because the new bot steps from the patch are not used (I think). How do you usually handle patches that change the EWS behavior?
Comment 9 Philippe Normand 2021-07-02 04:39:45 PDT
Comment on attachment 432780 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=432780&action=review

> Tools/CISupport/built-product-archive:258
> +            contents = [os.path.join('install', directory) for directory in ['bin', 'include', 'lib', 'libexec']]

Ah, the extractBuiltProduct() will need to take this into account (moving install/* to $PWD)
Comment 10 Philippe Normand 2021-07-02 05:38:56 PDT
Created attachment 432781 [details]
Patch
Comment 11 Philippe Normand 2021-07-02 05:42:52 PDT
Created attachment 432782 [details]
Patch
Comment 12 Michael Catanzaro 2021-07-02 06:20:43 PDT
Comment on attachment 432782 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=432782&action=review

Nice, this looks a lot better than the original version of this patch.

> Source/WebKit/gtk/webkit2gtk-web-extension.pc.in:5
> +revision=@SVN_REVISION@

I think I would land these revision=@SVN_REVISION@ changes in a separate bug/patch since they're largely unrelated to the bulk of this patch. You can set r=me.

P.S. I guess you know this will break as soon as we switch to GitHub. ;)
Comment 13 Philippe Normand 2021-07-02 06:20:52 PDT
EWS looks green, but I suspect that if/when this lands it might require clean builds on the GTK fleet, because build-webkit might not regenerate properly the ninja defs based on the added --prefix option.
Comment 14 Philippe Normand 2021-07-02 07:30:10 PDT
(In reply to Michael Catanzaro from comment #12)
> Comment on attachment 432782 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=432782&action=review
> 
> Nice, this looks a lot better than the original version of this patch.
> 
> > Source/WebKit/gtk/webkit2gtk-web-extension.pc.in:5
> > +revision=@SVN_REVISION@
> 
> I think I would land these revision=@SVN_REVISION@ changes in a separate
> bug/patch since they're largely unrelated to the bulk of this patch. You can
> set r=me.
> 
> P.S. I guess you know this will break as soon as we switch to GitHub. ;)

SVN_REVISION is used in various places across the tree. I expect that the migration to GitHub will take this into account :)
Comment 15 Philippe Normand 2021-07-02 08:16:25 PDT
Created attachment 432798 [details]
Patch
Comment 16 Philippe Normand 2021-07-02 08:17:36 PDT
(In reply to Philippe Normand from comment #13)
> EWS looks green, but I suspect that if/when this lands it might require
> clean builds on the GTK fleet, because build-webkit might not regenerate
> properly the ninja defs based on the added --prefix option.

I'd like to land this on Monday and have our QA folks around to help keep an eye on the bots for clean builds. :)
Comment 17 Philippe Normand 2021-07-05 00:58:02 PDT
Comment on attachment 432798 [details]
Patch

I've check the build should be OK, build-webkit detects the new argument and re-runs cmake.
Comment 18 EWS 2021-07-05 01:25:18 PDT
Committed r279563 (239394@main): <https://commits.webkit.org/239394@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 432798 [details].
Comment 19 Radar WebKit Bug Importer 2021-07-05 01:26:17 PDT
<rdar://problem/80167129>
Comment 20 Aakash Jain 2021-07-05 07:02:31 PDT
Restarted buildbot on build.webkit.org and EWS to pick up this change.