Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 403d9c3

Browse files
authored
Merge pull request #425 from cpuguy83/backport_40169_windows_version_quad
[19.03] Windows: Only set VERSION_QUAD if unset Upstream-commit: f6398c1f075cf354ec500721ee406ed859d09504 Component: engine
2 parents 788a8e1 + 60e2f6b commit 403d9c3

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

components/engine/hack/make/.go-autogen

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ if [ "$(go env GOOS)" = "windows" ]; then
5858
fi
5959

6060
# Generate a Windows file version of the form major,minor,patch,build (with any part optional)
61-
VERSION_QUAD=$(echo -n $VERSION | sed -re 's/^([0-9.]*).*$/\1/' | tr . ,)
61+
if [ ! -v VERSION_QUAD ]; then
62+
VERSION_QUAD=$(echo -n $VERSION | sed -re 's/^([0-9.]*).*$/\1/' | tr . ,)
63+
fi
6264

6365
# Pass version and commit information into the resource compiler
6466
defs=

0 commit comments

Comments
 (0)