From 4d6b180d01b9ca1d8f74778b9296548c58f2a9c7 Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Thu, 29 Aug 2024 16:42:23 +0300 Subject: [PATCH 1/4] Fix deprecated constant "pf" --- win-linux/package/windows/common.iss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/win-linux/package/windows/common.iss b/win-linux/package/windows/common.iss index 25e750add..06b31a1b4 100644 --- a/win-linux/package/windows/common.iss +++ b/win-linux/package/windows/common.iss @@ -57,7 +57,11 @@ AppComments = {cm:defprogAppDescription} DefaultGroupName = {#sCompanyName} ;UsePreviousAppDir =no DirExistsWarning =no +#if Int(DecodeVer(PREPROCVER,1)) >= 6 +DefaultDirName ={commonpf}\{#APP_PATH} +#else DefaultDirName ={pf}\{#APP_PATH} +#endif DisableProgramGroupPage = yes DisableWelcomePage = no DEPCompatible = no From 7b5df4cb737cf2b710f55b223e55fe174f883b8c Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Thu, 29 Aug 2024 16:54:24 +0300 Subject: [PATCH 2/4] Fix deprecated architecture identifier --- win-linux/package/windows/common.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win-linux/package/windows/common.iss b/win-linux/package/windows/common.iss index 06b31a1b4..4b6c166ae 100644 --- a/win-linux/package/windows/common.iss +++ b/win-linux/package/windows/common.iss @@ -79,8 +79,8 @@ SetupMutex =ASC #if str(ARCH) == "x64" #if Int(DecodeVer(PREPROCVER,1)) >= 6 -ArchitecturesAllowed = x64 arm64 -ArchitecturesInstallIn64BitMode = x64 arm64 +ArchitecturesAllowed = x64compatible +ArchitecturesInstallIn64BitMode = x64compatible #else ArchitecturesAllowed = x64 ArchitecturesInstallIn64BitMode = x64 From 83e33dbf8a24593260608745738f669aeeb82e7b Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Thu, 29 Aug 2024 16:58:42 +0300 Subject: [PATCH 3/4] Fix minimum version warning --- win-linux/package/windows/common.iss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/win-linux/package/windows/common.iss b/win-linux/package/windows/common.iss index 4b6c166ae..9f64e86e6 100644 --- a/win-linux/package/windows/common.iss +++ b/win-linux/package/windows/common.iss @@ -87,9 +87,7 @@ ArchitecturesInstallIn64BitMode = x64 #endif #endif -#ifndef _WIN_XP -MinVersion = 6.1 -#else +#ifdef _WIN_XP MinVersion = 5.0 OnlyBelowVersion = 6.1 #endif From 81b0c6cb6e138604385e6f789686bb0b6a77ab1e Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Thu, 29 Aug 2024 16:35:41 +0300 Subject: [PATCH 4/4] Disable read version info --- win-linux/package/windows/common.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win-linux/package/windows/common.iss b/win-linux/package/windows/common.iss index 9f64e86e6..57da9e66c 100644 --- a/win-linux/package/windows/common.iss +++ b/win-linux/package/windows/common.iss @@ -1052,9 +1052,9 @@ Source: "data\vcredist_{#ARCH}.exe"; DestDir: {app}; Flags: deleteafterinstall; Source: "{#BRANDING_DIR}\data\VisualElementsManifest.xml"; DestDir: {app}; DestName: {#VISEFFECTS_MANIFEST_NAME}; MinVersion: 6.3; Source: "{#BRANDING_DIR}\data\visual_elements_icon_*"; DestDir: {app}\browser; MinVersion: 6.3; -Source: "{#BUILD_DIR}\desktop\*"; DestDir: {app}; Flags: recursesubdirs; +Source: "{#BUILD_DIR}\desktop\*"; DestDir: {app}; Flags: ignoreversion recursesubdirs; #if defined(_WIN_XP) | defined(EMBED_HELP) -Source: "{#BUILD_DIR}\help\*"; DestDir: {app}; Flags: recursesubdirs; +Source: "{#BUILD_DIR}\help\*"; DestDir: {app}; Flags: ignoreversion recursesubdirs; #endif Source: "{#BUILD_DIR}\desktop\*.exe"; DestDir: {app}; Flags: signonce; Source: "{#BUILD_DIR}\desktop\*.dll"; DestDir: {app}; Flags: signonce;