erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-06 14:07:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

feat(windows): fix version rc files to display correct

Browse source 
fix the version.rc files to display the correct description
and file name for keymanhp.*.exe fix version rc files to display correct
Also fix up the Keymanengine arm64 version names.
This commit is contained in:
rc-swag 2025-11-21 14:49:57 +10:00
parent 33cdb0f54c
commit bc927bc4c3
11 changed files with 91 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
windows/src/engine/keyman32/keyman32.vcxproj
View file

@ -157,7 +157,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<LibraryPath>$(ProjectDir)..\..\..\..\core\build\ARM64\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\ARM64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\ARM64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\ARM64\$(Configuration);$(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64)</LibraryPath>
<IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\ARM64\$(Configuration)\include;$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\arm64\$(Configuration)\include;$(IncludePath)</IncludePath>
<TargetName>keymanarm64</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

2
windows/src/engine/keyman32/keymanarm64.rc
View file

@ -1 +1 @@
#include "version64.rc"
#include "versionarm64.rc"

32
windows/src/engine/keyman32/versionarm64.rc Normal file
View file

@ -0,0 +1,32 @@
#include "../../../../common/windows/cpp/include/keymanversion.h"
1 VERSIONINFO
FILEVERSION KV_FILEVERSION
PRODUCTVERSION KV_PRODUCTVERSION
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "0C0904E4"
BEGIN
VALUE "CompanyName", KV_COMPANY_NAME
VALUE "FileDescription", "Keyman Engine Processor Arm64\0"
VALUE "FileVersion", KV_VERSION_STRING
VALUE "InternalName", "KEYMANARM64\0"
VALUE "LegalCopyright", KV_LEGAL_COPYRIGHT
VALUE "LegalTrademarks", KV_LEGAL_TRADEMARKS
VALUE "OriginalFilename", "KEYMANARM64.DLL\0"
VALUE "ProductName", "Keyman Engine\0"
VALUE "ProductVersion", KV_VERSION_STRING
VALUE "Comments", "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0xc09, 1252
END
END

4
windows/src/engine/keymanhp/build.sh
View file

@ -37,7 +37,7 @@ function do_clean_arm64() {
function do_build_x64() {
create-windows-output-folders
build_version.res
run_in_vs_env rc versionx64.rc
sed "s/Keyman Engine HP/Keyman Engine x64/g;
s/arch64/amd64/g" manifesthp.in > manifest.in
build_manifest.res
@ -49,7 +49,7 @@ function do_build_x64() {
function do_build_arm64() {
create-windows-output-folders
build_version.res
run_in_vs_env rc versionarm64.rc
sed "s/Keyman Engine HP/Keyman Engine arm64/g;
s/arch64/arm64/g" manifesthp.in > manifest.in
build_manifest.res

6
windows/src/engine/keymanhp/keymanarm64.rc Normal file
View file

@ -0,0 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
#include "versionarm64.rc"
#include "manifest.rc"
1 ICON "..\\..\\desktop\\branding\\keymandesktop90-64.ico"

2
windows/src/engine/keymanhp/keymanhp.cpp
View file

@ -70,7 +70,7 @@ BOOL KeymanStarted = FALSE;
#define ARCH_LOG_FILE ".keymanhp-x64"
#elif defined(_M_ARM64)
#define WINDOW_TITLE L"Keymanhp-arm64"
#define EXECUTABLE_TITLE L"Keyman Engine arm64"
#define EXECUTABLE_TITLE L"Keyman Engine Arm64"
#define ARCH_LOG_FILE ".keymanhp-arm64"
#else
#error Unknown architecture

11
windows/src/engine/keymanhp/keymanhp.vcxproj
View file

@ -283,7 +283,16 @@
<ClInclude Include="resource.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="keymanhp.rc" />
<ResourceCompile Include="keymanarm64.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">true</ExcludedFromBuild>
</ResourceCompile>
<ResourceCompile Include="keymanx64.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
</ResourceCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

5
windows/src/engine/keymanhp/keymanhp.vcxproj.filters
View file

@ -34,7 +34,10 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="keymanhp.rc">
<ResourceCompile Include="keymanx64.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
<ResourceCompile Include="keymanarm64.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>

2
windows/src/engine/keymanhp/keymanhp.rc → windows/src/engine/keymanhp/keymanx64.rc
View file

@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
#include "version.rc"
#include "versionx64.rc"
#include "manifest.rc"
1 ICON "..\\..\\desktop\\branding\\keymandesktop90-64.ico"

32
windows/src/engine/keymanhp/versionarm64.rc Normal file
View file

@ -0,0 +1,32 @@
#include "../../../../common/windows/cpp/include/keymanversion.h"
1 VERSIONINFO
FILEVERSION KV_FILEVERSION
PRODUCTVERSION KV_PRODUCTVERSION
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "0C0904E4"
BEGIN
VALUE "CompanyName", KV_COMPANY_NAME
VALUE "FileDescription", "Keyman Engine Arm64\0"
VALUE "FileVersion", KV_VERSION_STRING
VALUE "InternalName", "KEYMANARM64\0"
VALUE "LegalCopyright", KV_LEGAL_COPYRIGHT
VALUE "LegalTrademarks", KV_LEGAL_TRADEMARKS
VALUE "OriginalFilename", "KEYMAN.HP.ARM64.EXE\0"
VALUE "ProductName", "Keyman Engine\0"
VALUE "ProductVersion", KV_VERSION_STRING
VALUE "Comments", "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0xc09, 1252
END
END

2
windows/src/engine/keymanhp/version.rc → windows/src/engine/keymanhp/versionx64.rc
View file

@ -19,7 +19,7 @@
VALUE "InternalName", "KEYMANX64\0"
VALUE "LegalCopyright", KV_LEGAL_COPYRIGHT
VALUE "LegalTrademarks", KV_LEGAL_TRADEMARKS
VALUE "OriginalFilename", "KEYMANX64.EXE\0"
VALUE "OriginalFilename", "KEYMAN.HP.64.EXE\0"
VALUE "ProductName", "Keyman Engine\0"
VALUE "ProductVersion", KV_VERSION_STRING
VALUE "Comments", "\0"