Skip to content

Commit

Permalink
Fix inno setup build warnings (#1321)
Browse files Browse the repository at this point in the history
* Fix deprecated constant "pf"

* Fix deprecated architecture identifier

* Fix minimum version warning

* Disable read version info
  • Loading branch information
heatray authored Aug 30, 2024
1 parent a5e40ba commit ae57047
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions win-linux/package/windows/common.iss
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -75,17 +79,15 @@ 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
#endif
#endif

#ifndef _WIN_XP
MinVersion = 6.1
#else
#ifdef _WIN_XP
MinVersion = 5.0
OnlyBelowVersion = 6.1
#endif
Expand Down Expand Up @@ -1050,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;
Expand Down

0 comments on commit ae57047

Please sign in to comment.