From d699e3de12df8d3b8e497b89c9fea143dd84b596 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Mon, 4 Nov 2019 17:16:06 -0800 Subject: [PATCH] Windows: Only set VERSION_QUAD if unset When trying to build with some pretty typical version strings this was causing failures trying to generate the windows resource file. The resource file is already gated by an `ifdef` for this var, so instead of blindly setting based on "VERSION", which can contain some characters which are incompatible (e.g. 1.2.3.rc.0 will fail due to the ".rc"). Signed-off-by: Brian Goff (cherry picked from commit ce931f28ea8768baa7ca2725d9030fbf8a40d3ba) Signed-off-by: Brian Goff --- hack/make/.go-autogen | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hack/make/.go-autogen b/hack/make/.go-autogen index ef5c6a40f2..d10750054e 100644 --- a/hack/make/.go-autogen +++ b/hack/make/.go-autogen @@ -58,7 +58,9 @@ if [ "$(go env GOOS)" = "windows" ]; then fi # Generate a Windows file version of the form major,minor,patch,build (with any part optional) - VERSION_QUAD=$(echo -n $VERSION | sed -re 's/^([0-9.]*).*$/\1/' | tr . ,) + if [ ! -v VERSION_QUAD ]; then + VERSION_QUAD=$(echo -n $VERSION | sed -re 's/^([0-9.]*).*$/\1/' | tr . ,) + fi # Pass version and commit information into the resource compiler defs=