Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARM64: Embed manifest properly #4718

Merged
merged 1 commit into from
Dec 7, 2023
Merged

Conversation

rimrul
Copy link
Member

@rimrul rimrul commented Nov 29, 2023

Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707

@rimrul rimrul marked this pull request as ready for review December 2, 2023 11:21
@rimrul rimrul marked this pull request as draft December 2, 2023 11:48
winuser.h contains the definition of RT_MANIFEST that our LLVM based
toolchain needs to understand that we want to embed
compat/win32/git.manifest as an application manifest. It currently just
embeds it as additional data that Windows doesn't understand.

This also helps our GCC based toolchain understand that we only want one
copy embedded. It currently embeds one working assembly manifest and one
nearly identical, but useless copy as additional data.

This also teaches our Visual Studio based buildsystems to pick up the
manifest file from git.rc. This means we don't have to explicitly specify
it in contrib/buildsystems/Generators/Vcxproj.pm anymore. Slightly
counter-intuitively this also means we have to explicitly tell Cmake
not to embed a default manifest.

This fixes git-for-windows#4707

Signed-off-by: Matthias Aßhauer <[email protected]>
@rimrul rimrul marked this pull request as ready for review December 6, 2023 08:26
Copy link
Member

@dscho dscho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent sleuthing!

@dscho dscho merged commit a0e4621 into git-for-windows:main Dec 7, 2023
40 checks passed
git-for-windows-ci pushed a commit that referenced this pull request Dec 7, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 7, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 7, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 7, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
dscho added a commit that referenced this pull request Dec 10, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
dscho added a commit that referenced this pull request Dec 10, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
dscho added a commit that referenced this pull request Dec 10, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 11, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 11, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 13, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
dscho added a commit that referenced this pull request Dec 13, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
dscho added a commit that referenced this pull request Dec 14, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 14, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 14, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 15, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 15, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 18, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 19, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 19, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
dscho added a commit that referenced this pull request Dec 19, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 19, 2023
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
dscho added a commit to dscho/git that referenced this pull request Dec 16, 2024
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes git-for-windows#4707
dscho added a commit to dscho/git that referenced this pull request Dec 17, 2024
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes git-for-windows#4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 17, 2024
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 19, 2024
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
dscho added a commit to dscho/git that referenced this pull request Dec 30, 2024
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes git-for-windows#4707
dscho added a commit to dscho/git that referenced this pull request Dec 30, 2024
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes git-for-windows#4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 31, 2024
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Dec 31, 2024
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 1, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 1, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 1, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 1, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 1, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 2, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 2, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 2, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 3, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 6, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 6, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
@dscho dscho mentioned this pull request Jan 7, 2025
dscho added a commit to dscho/git that referenced this pull request Jan 7, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes git-for-windows#4707
dscho added a commit to dscho/git that referenced this pull request Jan 7, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes git-for-windows#4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
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.

Symbolic Link Support Broken in Windows ARM64
2 participants