Skip to content

Commit

Permalink
[WPE] built-product-archive not longer includes cog in the release.zi…
Browse files Browse the repository at this point in the history
…p archive

https://bugs.webkit.org/show_bug.cgi?id=248233

Reviewed by Michael Catanzaro.

Since cog moved to Meson build system, the paths it uses for storing the built
products on the disk have changed. Instead of using a predefined names for
the paths just add to the product-archive the files (binaries) 'cog', 'cogctl'
as well as any library.

* Tools/CISupport/built-product-archive:

Canonical link: https://commits.webkit.org/256941@main
  • Loading branch information
clopez committed Nov 22, 2022
1 parent a6099ce commit fce087e
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Tools/CISupport/built-product-archive
Expand Up @@ -290,10 +290,12 @@ def archiveBuiltProduct(configuration, platform, fullPlatform, minify=False):
cogDirectory = os.path.join('Tools', 'cog-prefix', 'src', 'cog-build')
absoluteCogDirectory = os.path.join(_configurationBuildDirectory, cogDirectory)
if platform == 'wpe' and os.path.isdir(absoluteCogDirectory):
contents.extend([os.path.join(cogDirectory, filename_or_directory) for filename_or_directory in ['cog', 'cogctl', 'modules']])
for filename in os.listdir(absoluteCogDirectory):
if filename.startswith('libcogcore'):
contents.append(os.path.join(cogDirectory, filename))
for cog_root, cog_dirs, cog_files in os.walk(absoluteCogDirectory):
for cog_file in cog_files:
if cog_file in ['cog', 'cogctl'] or '.so' in cog_file:
realAbsolutePath = os.path.join(cog_root, cog_file)
realRelativePath = realAbsolutePath[len(_configurationBuildDirectory)+1:]
contents.append(realRelativePath)

if platform == 'gtk':
contents.extend([os.path.join('install', directory) for directory in ['include', os.path.join('lib', 'pkgconfig')]])
Expand Down

0 comments on commit fce087e

Please sign in to comment.