Fixes to windows scripts#3048
Merged
tiborvass merged 3 commits intodocker:masterfrom Apr 13, 2021
Merged
Conversation
tiborvass
force-pushed
the
win_script_fixes
branch
2 times, most recently
from
dcd1e42 to
8e4d12e
Compare
tonistiigi
reviewed
Apr 13, 2021
cpuguy83
reviewed
Apr 13, 2021
When the git checkout is dirty on top of a git tag (i.e., v20.10.6.m), the VERSION_QUAD was keeping a trailing comma. Now the trailing comma is stripped. Signed-off-by: Tibor Vass <[email protected]>
tiborvass
force-pushed
the
win_script_fixes
branch
from
8e4d12e to
2a16de0
Compare
tonistiigi
reviewed
Apr 13, 2021
This allows setting WINDRES to mingw's windres. For the record, mingw's windres needs --use-temp-file for a weird reason: in that case, it keeps preprocessor arguments intact (including quotes), without it, mingw's windres calls popen, which happens to pass the entire command to sh -c, stripping quotes after evaluation and causing a syntax error in mingw's windres. To use mingw's windres, set WINDRES to: - `x86_64-w64-mingw32-windres` on 64 bit - `i686-w64-mingw32-windres` on 32 bit Signed-off-by: Tibor Vass <[email protected]>
tiborvass
force-pushed
the
win_script_fixes
branch
from
2a16de0 to
2c40960
Compare
tonistiigi
approved these changes
Apr 13, 2021
Codecov Report
@@ Coverage Diff @@
## master #3048 +/- ##
=======================================
Coverage 57.06% 57.06%
=======================================
Files 299 299
Lines 18689 18689
=======================================
Hits 10665 10665
Misses 7157 7157
Partials 867 867 |
Collaborator
|
I pushed an extra commit which makes it so we do not error out if windres isn't available (e.g. cross compiling for armhf which doesn't have a mingw CC target). |
tiborvass
force-pushed
the
win_script_fixes
branch
from
ecc924e to
63e0c2c
Compare
Collaborator
Author
|
Reworked @cpuguy83's commit to still fail if windres command is not found, but instead provide a way to opt out of windres-ing by setting WINDRES to an empty string. PTAL |
tonistiigi
approved these changes
Apr 13, 2021
Signed-off-by: Brian Goff <[email protected]> Signed-off-by: Tibor Vass <[email protected]>
tiborvass
force-pushed
the
win_script_fixes
branch
from
63e0c2c to
83e9eeb
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.