From 3212ed07594afd3a0b7bc1f5819301cd108d6054 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 1 May 2023 13:20:48 +0300 Subject: [PATCH 38/38] Msys2: Rearrange Registry keys hierarchy Move also Freeciv-ruledit keys under Freeciv/ Key paths now: Freeciv/// where either "client-" or "ruledit" See osdn #47972 Signed-off-by: Marko Lindqvist --- .../create-freeciv-gtk-qt-nsi.sh | 32 ++++++++++--------- .../create-freeciv-ruledit-nsi.sh | 29 +++++++++-------- .../create-freeciv-sdl2-nsi.sh | 30 +++++++++-------- 3 files changed, 49 insertions(+), 42 deletions(-) diff --git a/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh b/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh index b87b3d461b..406fe4d310 100644 --- a/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh +++ b/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh @@ -37,17 +37,19 @@ SetCompressor /SOLID lzma !define WIN_ARCH $5 !define ARCH_KEY_PART ${ARCH_KEY_PART} !define ARCH_INST_PART ${ARCH_INST_PART} +!define KEYROOT "Freeciv" +!define APP_KEY_PART "client-\${GUI_ID}" !define APPID "\${APPNAME}-\${VERSION}\${ARCH_INST_PART}-\${GUI_ID}" !define MULTIUSER_EXECUTIONLEVEL Highest !define MULTIUSER_MUI !define MULTIUSER_INSTALLMODE_COMMANDLINE -!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "Software\\\${APPNAME}\\\${VERSION}\\\${ARCH_KEY_PART}\\\${GUI_ID}" +!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "Software\\\${KEYROOT}\\\${VERSION}\\\${ARCH_KEY_PART}\\\${APP_KEY_PART}" !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME "" -!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "Software\\\${APPNAME}\\\${VERSION}\\\${ARCH_KEY_PART}\\\${GUI_ID}" +!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "Software\\\${KEYROOT}\\\${VERSION}\\\${ARCH_KEY_PART}\\\${APP_KEY_PART}" !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME "" -!define MULTIUSER_INSTALLMODE_INSTDIR "\${APPNAME}-\${VERSION}\${ARCH_INST_PART}-\${GUI_ID}" +!define MULTIUSER_INSTALLMODE_INSTDIR "\${APPNAME}-\${VERSION}\${ARCH_INST_PART}-\${APP_KEY_PART}" !include "MultiUser.nsh" !include "MUI2.nsh" @@ -74,8 +76,8 @@ Page custom DefaultLanguage DefaultLanguageLeave !insertmacro MUI_PAGE_DIRECTORY ; Start Menu Folder Page Configuration -!define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" -!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\\\${APPNAME}\\\${VERSION}\\\${ARCH_KEY_PART}\\\${GUI_ID}" +!define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" +!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\\\${KEYROOT}\\\${VERSION}\\\${ARCH_KEY_PART}\\\${APP_KEY_PART}" !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !define MUI_STARTMENUPAGE_DEFAULTFOLDER "\$(^Name)" @@ -126,7 +128,7 @@ EOF cat <