From aea488167af19845369e062bf9af4edfadc4fa71 Mon Sep 17 00:00:00 2001
From: albertony <12441419+albertony@users.noreply.github.com>
Date: Wed, 9 Dec 2020 13:42:33 +0100
Subject: [PATCH] Cleanup windows client and server exe resource build
---
src/cmd/barrierc/CMakeLists.txt | 11 +-
src/cmd/barrierc/barrierc.exe.manifest | 2 -
src/cmd/barrierc/barrierc.rc | 181 +++++++++++--------------
src/cmd/barriers/CMakeLists.txt | 11 +-
src/cmd/barriers/barriers.exe.manifest | 2 -
src/cmd/barriers/barriers.rc | 111 +++++++--------
6 files changed, 132 insertions(+), 186 deletions(-)
delete mode 100644 src/cmd/barrierc/barrierc.exe.manifest
delete mode 100644 src/cmd/barriers/barriers.exe.manifest
diff --git a/src/cmd/barrierc/CMakeLists.txt b/src/cmd/barrierc/CMakeLists.txt
index 0c085500..1675e351 100644
--- a/src/cmd/barrierc/CMakeLists.txt
+++ b/src/cmd/barrierc/CMakeLists.txt
@@ -21,16 +21,7 @@ set(sources
if (WIN32)
file(GLOB arch_headers "MSWindows*.h")
file(GLOB arch_sources "MSWindows*.cpp")
- list(APPEND sources
- resource.h
- barrierc.ico
- barrierc.rc
- tb_error.ico
- tb_idle.ico
- tb_run.ico
- tb_wait.ico
- barrierc.exe.manifest
- )
+ list(APPEND sources barrierc.rc)
elseif (APPLE)
file(GLOB arch_headers "OSX*.h")
file(GLOB arch_sources "OSX*.cpp")
diff --git a/src/cmd/barrierc/barrierc.exe.manifest b/src/cmd/barrierc/barrierc.exe.manifest
deleted file mode 100644
index 2c6f3652..00000000
--- a/src/cmd/barrierc/barrierc.exe.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-
-PerMonitortrue
\ No newline at end of file
diff --git a/src/cmd/barrierc/barrierc.rc b/src/cmd/barrierc/barrierc.rc
index e858a164..3000dcc3 100644
--- a/src/cmd/barrierc/barrierc.rc
+++ b/src/cmd/barrierc/barrierc.rc
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
@@ -8,9 +8,6 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include
-#if !defined(IDC_STATIC)
-#define IDC_STATIC (-1)
-#endif
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -19,60 +16,8 @@
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-#ifndef NOVERSIONINFO
-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
-FILETYPE VFT_APP
-FILESUBTYPE 0x0L
-BEGIN
-
-BLOCK "StringFileInfo"
-BEGIN
-
-// Language block for LANG_ENGLISH/SUBLANG_ENGLISH_US, Unicode CP
-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", "barrierc.exe"
-VALUE "FileDescription", "Open source KVM software client"
-VALUE "InternalName", "barrierc"
-END
-
-// Any other language blocks here
-
-END
-
-BLOCK "VarFileInfo"
-BEGIN
-/* Unordered list of Lang IDs and their code page IDs (Unicode = 1200 in case of Win32).
- These can be expressed using either hexadecimal or decimal. */
-VALUE "Translation", 0x409, 1200
-END
-
-END
-#endif
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -80,18 +25,18 @@ END
// TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE
BEGIN
"#include \r\n"
"\0"
END
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -100,6 +45,46 @@ 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", "barrierc.exe"
+ VALUE "FileDescription", "Open source KVM software client"
+ VALUE "InternalName", "barrierc"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+
/////////////////////////////////////////////////////////////////////////////
//
// Icon
@@ -107,18 +92,47 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_BARRIER ICON DISCARDABLE "barrierc.ico"
-IDI_TASKBAR_NOT_RUNNING ICON DISCARDABLE "tb_idle.ico"
-IDI_TASKBAR_NOT_WORKING ICON DISCARDABLE "tb_error.ico"
-IDI_TASKBAR_NOT_CONNECTED ICON DISCARDABLE "tb_wait.ico"
-IDI_TASKBAR_CONNECTED ICON DISCARDABLE "tb_run.ico"
+IDI_BARRIER ICON "barrierc.ico"
+IDI_TASKBAR_NOT_RUNNING ICON "tb_idle.ico"
+IDI_TASKBAR_NOT_WORKING ICON "tb_error.ico"
+IDI_TASKBAR_NOT_CONNECTED ICON "tb_wait.ico"
+IDI_TASKBAR_CONNECTED ICON "tb_run.ico"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDR_TASKBAR MENU
+BEGIN
+ POPUP "Barrier"
+ BEGIN
+ MENUITEM "Show Status", IDC_TASKBAR_STATUS
+ MENUITEM "Show Log", IDC_TASKBAR_SHOW_LOG
+ MENUITEM "Copy Log To Clipboard", IDC_TASKBAR_LOG
+ POPUP "Set Log Level"
+ BEGIN
+ MENUITEM "Error", IDC_TASKBAR_LOG_LEVEL_ERROR
+ MENUITEM "Warning", IDC_TASKBAR_LOG_LEVEL_WARNING
+ MENUITEM "Note", IDC_TASKBAR_LOG_LEVEL_NOTE
+ MENUITEM "Info", IDC_TASKBAR_LOG_LEVEL_INFO
+ MENUITEM "Debug", IDC_TASKBAR_LOG_LEVEL_DEBUG
+ MENUITEM "Debug1", IDC_TASKBAR_LOG_LEVEL_DEBUG1
+ MENUITEM "Debug2", IDC_TASKBAR_LOG_LEVEL_DEBUG2
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Quit", IDC_TASKBAR_QUIT
+ END
+END
+
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
-IDD_TASKBAR_STATUS DIALOG DISCARDABLE 0, 0, 145, 18
+IDD_TASKBAR_STATUS DIALOG 0, 0, 145, 18
STYLE DS_MODALFRAME | WS_POPUP
FONT 8, "MS Sans Serif"
BEGIN
@@ -127,47 +141,12 @@ BEGIN
END
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_TASKBAR MENU DISCARDABLE
-BEGIN
- POPUP "Barrier"
- BEGIN
- MENUITEM "Show Status", IDC_TASKBAR_STATUS
- MENUITEM "Show Log", IDC_TASKBAR_SHOW_LOG
- MENUITEM "Copy Log To Clipboard", IDC_TASKBAR_LOG
- POPUP "Set Log Level"
- BEGIN
- MENUITEM "Error", IDC_TASKBAR_LOG_LEVEL_ERROR
-
- MENUITEM "Warning", IDC_TASKBAR_LOG_LEVEL_WARNING
-
- MENUITEM "Note", IDC_TASKBAR_LOG_LEVEL_NOTE
-
- MENUITEM "Info", IDC_TASKBAR_LOG_LEVEL_INFO
-
- MENUITEM "Debug", IDC_TASKBAR_LOG_LEVEL_DEBUG
-
- MENUITEM "Debug1", IDC_TASKBAR_LOG_LEVEL_DEBUG1
-
- MENUITEM "Debug2", IDC_TASKBAR_LOG_LEVEL_DEBUG2
-
- END
- MENUITEM SEPARATOR
- MENUITEM "Quit", IDC_TASKBAR_QUIT
- END
-END
-
-
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
IDS_FAILED "Barrier is about to quit with errors or warnings. Please check the log then click OK."
IDS_INIT_FAILED "Barrier failed to initialize: %{1}"
diff --git a/src/cmd/barriers/CMakeLists.txt b/src/cmd/barriers/CMakeLists.txt
index 912421f0..ed47d61d 100644
--- a/src/cmd/barriers/CMakeLists.txt
+++ b/src/cmd/barriers/CMakeLists.txt
@@ -21,16 +21,7 @@ set(sources
if (WIN32)
file(GLOB arch_headers "MSWindows*.h")
file(GLOB arch_sources "MSWindows*.cpp")
- list(APPEND sources
- resource.h
- barriers.ico
- barriers.rc
- tb_error.ico
- tb_idle.ico
- tb_run.ico
- tb_wait.ico
- barriers.exe.manifest
- )
+ list(APPEND sources barriers.rc)
elseif (APPLE)
file(GLOB arch_headers "OSX*.h")
file(GLOB arch_sources "OSX*.cpp")
diff --git a/src/cmd/barriers/barriers.exe.manifest b/src/cmd/barriers/barriers.exe.manifest
deleted file mode 100644
index 7309fde6..00000000
--- a/src/cmd/barriers/barriers.exe.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-
-true
\ No newline at end of file
diff --git a/src/cmd/barriers/barriers.rc b/src/cmd/barriers/barriers.rc
index d6c069bb..f9d8af1d 100644
--- a/src/cmd/barriers/barriers.rc
+++ b/src/cmd/barriers/barriers.rc
@@ -16,60 +16,8 @@
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-#ifndef NOVERSIONINFO
-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
-FILETYPE VFT_APP
-FILESUBTYPE 0x0L
-BEGIN
-
-BLOCK "StringFileInfo"
-BEGIN
-
-// Language block for LANG_ENGLISH/SUBLANG_ENGLISH_US, Unicode CP
-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", "barriers.exe"
-VALUE "FileDescription", "Open source KVM software server"
-VALUE "InternalName", "barrierc"
-END
-
-// Any other language blocks here
-
-END
-
-BLOCK "VarFileInfo"
-BEGIN
-/* Unordered list of Lang IDs and their code page IDs (Unicode = 1200 in case of Win32).
- These can be expressed using either hexadecimal or decimal. */
-VALUE "Translation", 0x409, 1200
-END
-
-END
-#endif
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -77,18 +25,18 @@ END
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#include \r\n"
"\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -97,6 +45,46 @@ 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", "barriers.exe"
+ VALUE "FileDescription", "Open source KVM software server"
+ VALUE "InternalName", "barriers"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+
/////////////////////////////////////////////////////////////////////////////
//
// Icon
@@ -104,18 +92,19 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_BARRIER ICON "barriers.ico"
-IDI_TASKBAR_NOT_RUNNING ICON "tb_idle.ico"
-IDI_TASKBAR_NOT_WORKING ICON "tb_error.ico"
+IDI_BARRIER ICON "barriers.ico"
+IDI_TASKBAR_NOT_RUNNING ICON "tb_idle.ico"
+IDI_TASKBAR_NOT_WORKING ICON "tb_error.ico"
IDI_TASKBAR_NOT_CONNECTED ICON "tb_wait.ico"
-IDI_TASKBAR_CONNECTED ICON "tb_run.ico"
+IDI_TASKBAR_CONNECTED ICON "tb_run.ico"
+
/////////////////////////////////////////////////////////////////////////////
//
// Menu
//
-IDR_TASKBAR MENU
+IDR_TASKBAR MENU
BEGIN
POPUP "Barrier"
BEGIN
@@ -160,7 +149,7 @@ END
// String Table
//
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_FAILED "Barrier is about to quit with errors or warnings. Please check the log then click OK."
IDS_INIT_FAILED "Barrier failed to initialize: %{1}"