Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit 6adcb67

Browse files
committed
Rename scripted constant to match TErlangData record
1 parent c3560b0 commit 6adcb67

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

ElixirWeb.iss

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,22 @@ Source: "compiler:Setup.e32"; DestDir: "{tmp}"; Flags: deleteafterinstall
5757
Source: "compiler:SetupLdr.e32"; DestDir: "{tmp}"; Flags: deleteafterinstall
5858

5959
[Run]
60-
Filename: "{tmp}\{code:ConstGetOTP32Exe}"; Flags: hidewizard; StatusMsg: "Installing {code:ConstGetOTP32Name}..."; Tasks: erlang\32; AfterInstall: AppendErlangPathIfTaskSelected(False)
61-
Filename: "{tmp}\{code:ConstGetOTP64Exe}"; Flags: hidewizard; StatusMsg: "Installing {code:ConstGetOTP64Name}..."; Tasks: erlang\64; AfterInstall: AppendErlangPathIfTaskSelected(True)
60+
Filename: "{tmp}\{code:ConstGetErlangExe32}"; Flags: hidewizard; StatusMsg: "Installing {code:ConstGetErlangName32}..."; Tasks: erlang\32; AfterInstall: AppendErlangPathIfTaskSelected(False)
61+
Filename: "{tmp}\{code:ConstGetErlangExe64}"; Flags: hidewizard; StatusMsg: "Installing {code:ConstGetErlangName64}..."; Tasks: erlang\64; AfterInstall: AppendErlangPathIfTaskSelected(True)
6262
Filename: "{tmp}\7za.exe"; Parameters: "x -oelixir Precompiled.zip"; WorkingDir: "{tmp}"; StatusMsg: "Extracting Precompiled.zip archive..."
6363
Filename: "{tmp}\ISCC.exe"; Parameters: "/dElixirVersion={code:ConstGetSelectedReleaseVersion} /dSkipWelcome /dNoCompression Elixir.iss"; WorkingDir: "{tmp}"; StatusMsg: "Compiling Elixir installer..."
6464
Filename: "{tmp}\Output\elixir-v{code:ConstGetSelectedReleaseVersion}-setup.exe"; Flags: nowait; StatusMsg: "Starting Elixir installer..."
6565

6666
[Tasks]
6767
Name: "erlang"; Description: "Install Erlang"; GroupDescription: "Erlang"; Check: CheckToInstallErlang
68-
Name: "erlang\32"; Description: "{code:ConstGetOTP32Name}"; GroupDescription: "Erlang"; Flags: exclusive
69-
Name: "erlang\64"; Description: "{code:ConstGetOTP64Name}"; GroupDescription: "Erlang"; Flags: exclusive; Check: IsWin64
68+
Name: "erlang\32"; Description: "{code:ConstGetErlangName32}"; GroupDescription: "Erlang"; Flags: exclusive
69+
Name: "erlang\64"; Description: "{code:ConstGetErlangName32}"; GroupDescription: "Erlang"; Flags: exclusive; Check: IsWin64
7070
Name: "erlpath"; Description: "Append Erlang directory to Path environment variable"; GroupDescription: "Erlang"; Check: CheckToAddErlangPath
7171

7272
[Code]
7373
type
7474
TElixirReleaseType = (rtRelease, rtPrerelease, rtLatestRelease, rtLatestPrerelease, rtIncompatible);
75+
7576
TElixirRelease = record
7677
Version: String;
7778
URL: String;
@@ -362,8 +363,8 @@ function CheckToInstallErlang: Boolean; begin
362363
function CheckToAddErlangPath: Boolean; begin
363364
Result := not ErlangInPath; end;
364365
365-
function ConstGetOTP32Name(Param: String): String; begin Result := GetOTP32Name; end;
366-
function ConstGetOTP64Name(Param: String): String; begin Result := GetOTP64Name; end;
367-
function ConstGetOTP32Exe(Param: String): String; begin Result := GetOTP32Exe; end;
368-
function ConstGetOTP64Exe(Param: String): String; begin Result := GetOTP64Exe; end;
369-
function ConstGetSelectedReleaseVersion(Param: String): String; begin Result := GetVersion(GetSelectedRelease()); end;
366+
function ConstGetErlangName32(Param: String): String; begin Result := GlobalErlangData.Name32; end;
367+
function ConstGetErlangName64(Param: String): String; begin Result := GlobalErlangData.Name64; end;
368+
function ConstGetErlangExe32(Param: String): String; begin Result := GlobalErlangData.Exe32; end;
369+
function ConstGetErlangExe64(Param: String): String; begin Result := GlobalErlangData.Exe64; end;
370+
function ConstGetSelectedReleaseVersion(Param: String): String; begin Result := CacheSelectedRelease.Version; end;

0 commit comments

Comments
 (0)