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

Add included prerequisites #301

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add included prerequisites #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions exe/common.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,9 @@ Source: ..\common\documentserver\nginx\includes\*.conf; DestDir: {#NGINX_SRV_DI
Source: ..\common\documentserver\nginx\*.tmpl; DestDir: {#NGINX_SRV_DIR}\conf; Flags: ignoreversion recursesubdirs; Components: Program
Source: ..\common\documentserver\nginx\ds.conf; DestDir: {#NGINX_SRV_DIR}\conf; Flags: onlyifdoesntexist uninsneveruninstall; Components: Program
Source: scripts\connectionRabbit.py; DestDir: "{app}"; Flags: ignoreversion; Components: Program
Source: data\vcredist\vcredist_2022_x64.exe; DestDir: {app}; Flags: deleteafterinstall; \
AfterInstall: installVCRedist(ExpandConstant('{app}\vcredist_2022_x64.exe'), ExpandConstant('{cm:InstallAdditionalComponents}')); \
Check: not checkVCRedist2022;

[Dirs]
Name: "{app}\server\App_Data"; Permissions: service-modify
Expand Down
22 changes: 22 additions & 0 deletions exe/products.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,26 @@ begin
end;
end;

function checkVCRedist2022(): Boolean;
var
upgradecode: String;
begin
if Is64BitInstallMode then
upgradecode := '{36F68A90-239C-34DF-B58C-64B30153CE35}' //x64
else
upgradecode := '{65E5BD06-6392-3027-8C26-853107D3CF1A}'; //x86
Result := msiproductupgrade(upgradecode, '14.30');
end;

procedure installVCRedist(FileName, LabelCaption: String);
var
Params: String;
ErrorCode: Integer;
begin
if Length(LabelCaption) > 0 then WizardForm.StatusLabel.Caption := LabelCaption;
Params := '/quiet /norestart';
ShellExec('', FileName, Params, '', SW_SHOW, ewWaitUntilTerminated, ErrorCode);
WizardForm.StatusLabel.Caption := SetupMessage(msgStatusExtractFiles);
end;

[Setup]