From 31ce5cbdf889db1bc27a709a5b05c8b74c0caad1 Mon Sep 17 00:00:00 2001
From: albertony <12441419+albertony@users.noreply.github.com>
Date: Thu, 10 Dec 2020 18:39:33 +0100
Subject: [PATCH] Add version info to windows main exe resource

---
 src/cmd/barrierd/barrierd.rc |   1 -
 src/cmd/barrierd/resource.h  |  16 -----
 src/gui/res/win/Barrier.rc   | 113 ++++++++++++++++++++++++++++++++++-
 3 files changed, 112 insertions(+), 18 deletions(-)
 delete mode 100644 src/cmd/barrierd/resource.h

diff --git a/src/cmd/barrierd/barrierd.rc b/src/cmd/barrierd/barrierd.rc
index 15e518f389..df31e5f679 100644
--- a/src/cmd/barrierd/barrierd.rc
+++ b/src/cmd/barrierd/barrierd.rc
@@ -1,6 +1,5 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
diff --git a/src/cmd/barrierd/resource.h b/src/cmd/barrierd/resource.h
deleted file mode 100644
index 67ac542014..0000000000
--- a/src/cmd/barrierd/resource.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by barrierc.rc
-//
-#define IDI_BARRIER                     101
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        109
-#define _APS_NEXT_COMMAND_VALUE         40016
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/src/gui/res/win/Barrier.rc b/src/gui/res/win/Barrier.rc
index 9db2b3ea0b..2825690eed 100644
--- a/src/gui/res/win/Barrier.rc
+++ b/src/gui/res/win/Barrier.rc
@@ -1 +1,112 @@
-IDI_ICON1 ICON DISCARDABLE "../icons/256x256/barrier.ico"
+// Microsoft Visual C++ generated resource script.
+//
+//#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#include <winresrc.h>\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION BARRIER_VERSION_MAJOR, BARRIER_VERSION_MINOR, BARRIER_VERSION_PATCH, BARRIER_BUILD_NUMBER
+ PRODUCTVERSION BARRIER_VERSION_MAJOR, BARRIER_VERSION_MINOR, BARRIER_VERSION_PATCH, BARRIER_BUILD_NUMBER
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Debauchee Open Source Group"
+            VALUE "CompanyWeb", "https://github.com/debauchee/barrier/"
+            VALUE "FileVersion", BARRIER_VERSION
+            VALUE "LegalCopyright", "Copyright (C) 2018 Debauchee Open Source Group\nCopyright (C) 2012-2016 Symless Ltd.\nCopyright (C) 2008-2014 Nick Bolton\nCopyright (C) 2002-2014 Chris Schoeneman"
+            VALUE "ProductName", "Barrier"
+            VALUE "ProductVersion", BARRIER_VERSION
+            VALUE "OriginalFilename", "barrier.exe"
+            VALUE "FileDescription", "Open source KVM software"
+            VALUE "InternalName", "barrier"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_BARRIER             ICON                    "../icons/256x256/barrier.ico"
+
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+