Use goversioninfo to create Windows Version Info

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

scripts/build/binary

@@ -54,30 +54,19 @@ if [ -n "$GO_STRIP" ]; then
     LDFLAGS="$LDFLAGS -s -w"
 fi
 
-if [ "$(go env GOOS)" = "windows" ]; then
-    : "${WINDRES=$($(go env CC) --print-prog-name=windres)}"
-    if [ -z "$WINDRES" ]; then
-        >&2 echo "Empty WINDRES detected, skipping manifesting binary"
-    else
-        # Generate a Windows file version of the form major,minor,patch,build
-        VERSION_QUAD=$(printf "%s" "$VERSION" | sed -re 's/^([0-9.]*).*$/\1/' | tr . , | sed -re 's/,$//' | sed -re 's/^[0-9]+$/\0,0/' | sed -re 's/^[0-9]+,[0-9]+$/\0,0/' | sed -re 's/^[0-9]+,[0-9]+,[0-9]+$/\0,0/')
-
-        set --
-        [ -n "$VERSION" ]      && set -- "$@" -D "DOCKER_VERSION=\"$VERSION\""
-        [ -n "$VERSION_QUAD" ] && set -- "$@" -D "DOCKER_VERSION_QUAD=$VERSION_QUAD"
-        [ -n "$GITCOMMIT" ]    && set -- "$@" -D "DOCKER_COMMIT=\"$GITCOMMIT\""
-
-        target="$(dirname "$0")/../../cli/winresources/rsrc_$(go env GOARCH).syso"
-        mkdir -p "$(dirname "${target}")"
-        "$WINDRES" -i "$(dirname "$0")/../winresources/docker.rc" -o "$target" --use-temp-file "$@"
-        echo "package winresources" > "$(dirname "${target}")/stub_windows.go"
-    fi
-fi
-
 echo "Building $GO_LINKMODE $(basename "${TARGET}")"
 
 export GO111MODULE=auto
 
-go build -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}"
+if [ "$(go env GOOS)" = "windows" ]; then
+  if [ ! -x "$(command -v goversioninfo)" ]; then
+    >&2 echo "goversioninfo not found, skipping manifesting binary"
+  else
+    ./scripts/build/mkversioninfo
+    (set -x ; go generate -v "${SOURCE}")
+  fi
+fi
+
+(set -x ; go build -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}")
 
 ln -sf "$(basename "${TARGET}")" "$(dirname "${TARGET}")/docker"

scripts/build/mkversioninfo

@@ -0,0 +1,60 @@
+#!/usr/bin/env sh
+set -eu
+
+: "${COMPANY_NAME=}"
+
+. ./scripts/build/.variables
+
+# Create version quad for Windows of the form major.minor.patch.build
+VERSION_QUAD=$(printf "%s" "$VERSION" | sed -re 's/^([0-9.]*).*$/\1/' | sed -re 's/\.$//' | sed -re 's/^[0-9]+$/\0\.0/' | sed -re 's/^[0-9]+\.[0-9]+$/\0\.0/' | sed -re 's/^[0-9]+\.[0-9]+\.[0-9]+$/\0\.0/')
+
+# Generate versioninfo.json to be able to create a syso file which contains
+# Microsoft Windows Version Information and an icon using goversioninfo.
+# https://docs.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-block
+# https://github.com/josephspurrier/goversioninfo/blob/master/testdata/resource/versioninfo.json
+cat > ./cli/winresources/versioninfo.json <<EOL
+{
+  "FixedFileInfo":
+  {
+    "FileVersion": {
+      "Major": $(echo "$VERSION_QUAD" | cut -d. -f1),
+      "Minor": $(echo "$VERSION_QUAD" | cut -d. -f2),
+      "Patch": $(echo "$VERSION_QUAD" | cut -d. -f3),
+      "Build": $(echo "$VERSION_QUAD" | cut -d. -f4)
+    },
+    "FileFlagsMask": "3f",
+    "FileFlags ": "00",
+    "FileOS": "040004",
+    "FileType": "01",
+    "FileSubType": "00"
+  },
+  "StringFileInfo":
+  {
+    "Comments": "",
+    "CompanyName": "${COMPANY_NAME}",
+    "FileDescription": "Docker Client",
+    "FileVersion": "${VERSION_QUAD}",
+    "InternalName": "",
+    "LegalCopyright": "Copyright © 2015-$(date +'%Y') Docker Inc.",
+    "LegalTrademarks": "",
+    "OriginalFilename": "$(basename "${TARGET}")",
+    "PrivateBuild": "",
+    "ProductName": "Docker Client",
+    "ProductVersion": "${VERSION}",
+    "SpecialBuild": "${GITCOMMIT}"
+  },
+  "VarFileInfo":
+  {
+    "Translation": {
+      "LangID": "0409",
+      "CharsetID": "04B0"
+    }
+  }
+}
+EOL
+(set -x ; cat ./cli/winresources/versioninfo.json)
+
+# Create winresources package stub if removed while using tmpfs in Dockerfile
+if [ ! -f "./cli/winresources/winresources.go" ]; then
+  echo "package winresources" > "./cli/winresources/winresources.go"
+fi

scripts/winresources/common.rc

@@ -1,38 +0,0 @@
-// Application icon
-1 ICON "docker.ico"
-
-// Windows executable manifest
-1 24 /* RT_MANIFEST */ "docker.exe.manifest"
-
-// Version information
-1 VERSIONINFO
-
-#ifdef DOCKER_VERSION_QUAD
-FILEVERSION     DOCKER_VERSION_QUAD
-PRODUCTVERSION  DOCKER_VERSION_QUAD
-#endif
-
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "000004B0"
-    BEGIN
-      VALUE "ProductName", DOCKER_NAME
-
-#ifdef DOCKER_VERSION
-      VALUE "FileVersion", DOCKER_VERSION
-      VALUE "ProductVersion", DOCKER_VERSION
-#endif
-
-#ifdef DOCKER_COMMIT
-      VALUE "OriginalFileName", DOCKER_COMMIT
-#endif
-
-    END
-  END
-
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0000, 0x04B0
-  END
-END

scripts/winresources/docker.exe.manifest

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <description>Docker</description>
-    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> 
-        <application> 
-            <!-- Windows 10 -->
-            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-            <!-- Windows 8.1 -->
-            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-            <!-- Windows Vista -->
-            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> 
-            <!-- Windows 7 -->
-            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-            <!-- Windows 8 -->
-            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-        </application> 
-    </compatibility>
-</assembly>

scripts/winresources/docker.rc

@@ -1,3 +0,0 @@
-#define DOCKER_NAME "Docker Client"
-
-#include "common.rc"