Skip to content

Include ARM64 packages in dllmap and libmap - #64

Open
RaphaelFakhri wants to merge 1 commit into
php:masterfrom
RaphaelFakhri:fix/dllmap-libmap-arm64
Open

RaphaelFakhri wants to merge 1 commit into
php:masterfrom
RaphaelFakhri:fix/dllmap-libmap-arm64

Conversation

@RaphaelFakhri

Copy link
Copy Markdown

Summary

phpsdk_dllmap and phpsdk_libmap select dependency archives with the pattern -(v[c|s]\d+)-(x\d\d)\.zip, which matches only x86 and x64. ARM64 archives such as ICU-77.1-1-vs17-arm64.zip are skipped without a warning, so the generated JSON has no arm64 entries even though the dependency server now publishes vs17/arm64 packages and arm64 series.

This change matches x86, x64 and arm64, the same architecture list that Config::getKnownBranches() and phpsdk_sbom already use.

Reproduce

  1. Create libfoo-1.0-vs17-x64.zip and libfoo-1.0-vs17-arm64.zip in one directory, each containing bin/libfoo.dll and lib/libfoo.lib.
  2. Run phpsdk_dllmap <dir> and phpsdk_libmap <dir>.

Before:

{"vs17":{"x64":{"libfoo-1.0-vs17-x64.zip":["libfoo.dll"]}}}

After:

{"vs17":{"arm64":{"libfoo-1.0-vs17-arm64.zip":["libfoo.dll"]},"x64":{"libfoo-1.0-vs17-x64.zip":["libfoo.dll"]}}}

phpsdk_libmap shows the same difference for libfoo.lib.

Testing

  • Ran both scripts on the archives above before and after the change.
  • php -l passes for both files.

Fixes #63

phpsdk_dllmap and phpsdk_libmap only matched x86 and x64 archive
names, so ARM64 dependency zips were silently left out of the
generated mappings.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

phpsdk_dllmap and phpsdk_libmap ignore ARM64 dependency archives

1 participant