Bug 265440 – [WPE][CMake] Cannot complete distcheck with ENABLE_WPE_1_1_API=OFF

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Adrian Perez]

When using ENABLE_WPE_1_1_API=OFF (the default), the “distcheck” target
fails with the following error:

----- 8< ----- snip ----- 8< ------

WebKit % MAKEFLAGS=-j47 MFLAGS=-j47 NUMBER_OF_PROCESSORS=47 ./Tools/Scripts/build-webkit --wpe --no-unified-builds --makeargs=distcheck
Building flatpak based environment
+  cmake --build /app/webkit/WebKitBuild/WPE/Release --config Release -- distcheck -j47
[1/1/2|0.0/s|  0%] Re-checking globbed directories...
[1/7740/7740|26.6/s| 99%] Checking release tarball: wpewebkit-2.43.1.tar
Traceback (most recent call last):
  File "/app/webkit/Tools/Scripts/make-dist", line 341, in <module>
    manifest = Manifest(arguments.manifest_filename, arguments.source_dir, arguments.build_dir, tarball_root)
               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/app/webkit/Tools/Scripts/make-dist", line 150, in __init__
    self.process_line(line)
  File "/app/webkit/Tools/Scripts/make-dist", line 188, in process_line
    self.add_directory(Directory(*self.get_source_and_tarball_paths_from_parts(parts)))
                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/app/webkit/Tools/Scripts/make-dist", line 173, in get_source_and_tarball_paths_from_parts
    full_source_path = self.get_full_source_path(parts[1])
                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/app/webkit/Tools/Scripts/make-dist", line 166, in get_full_source_path
    raise Exception('Could not find directory %s' % source_path)
Exception: Could not find directory /app/webkit/WebKitBuild/WPE/Release/Documentation/wpe-web-extension-2.0
FAILED: Source/CMakeFiles/distcheck /app/webkit/WebKitBuild/WPE/Release/Source/CMakeFiles/distcheck 
cd /app/webkit/WebKitBuild/WPE/Release/Source && /app/webkit/Tools/Scripts/make-dist --check --port=WPE --tarball-name=wpewebkit --source-dir=/app/webkit --build-dir=/app/webkit/WebKitBuild/WPE/Release --version=2.43.1 /app/webkit/WebKitBuild/WPE/Release/manifest.txt && /usr/bin/xz -evfQ /app/webkit/WebKitBuild/WPE/Release/wpewebkit-2.43.1.tar
ninja: build stopped: subcommand failed.
WebKit %

----- 8< ----- snip ----- 8< ------

I had to make the last few releases manually enabling ENABLE_WPE_1_1_API
in order to be able to produce tarballs, but that should not be needed.

[Carlos Garcia Campos]

I think this is because of the rename of web-extensions -> web-process-extensions. Just use the expected name in the wpe manifest file.

[Adrian Perez]

(In reply to Carlos Garcia Campos from comment #1)
> I think this is because of the rename of web-extensions ->
> web-process-extensions. Just use the expected name in the wpe manifest file.

That was also my suspicion, I'll look into fixing this issue soon.

[Adrian Perez]

It took me a while to get back to this, but I'm now testing a patch :)

[Adrian Perez]

Pull request: https://github.com/WebKit/WebKit/pull/26265

[EWS]

Committed 276496@main (fc03e5ddcfb7): <https://commits.webkit.org/276496@main>

Reviewed commits have been landed. Closing PR #26265 and removing active labels.

[Radar WebKit Bug Importer]

<rdar://problem/125193326>