Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix inno setup build warnings #1321

Merged
merged 4 commits into from
Aug 30, 2024
Merged

Fix inno setup build warnings #1321

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d6b180
Fix deprecated constant "pf"
heatray Aug 29, 2024
7b5df4c
Fix deprecated architecture identifier
heatray Aug 29, 2024
83e33db
Fix minimum version warning
heatray Aug 29, 2024
81b0c6c
Disable read version info
heatray Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions win-linux/package/windows/common.iss
View file
Open in desktop
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