@@ -57,21 +57,22 @@ Source: "compiler:Setup.e32"; DestDir: "{tmp}"; Flags: deleteafterinstall
5757Source : " 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)
6262Filename : " {tmp} \7za.exe" ; Parameters : " x -oelixir Precompiled.zip" ; WorkingDir : " {tmp} " ; StatusMsg : " Extracting Precompiled.zip archive..."
6363Filename : " {tmp} \ISCC.exe" ; Parameters : " /dElixirVersion={code:ConstGetSelectedReleaseVersion} /dSkipWelcome /dNoCompression Elixir.iss" ; WorkingDir : " {tmp} " ; StatusMsg : " Compiling Elixir installer..."
6464Filename : " {tmp} \Output\elixir-v{code:ConstGetSelectedReleaseVersion}-setup.exe" ; Flags : nowait ; StatusMsg : " Starting Elixir installer..."
6565
6666[Tasks]
6767Name : " 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
7070Name : " erlpath" ; Description : " Append Erlang directory to Path environment variable" ; GroupDescription: " Erlang" ; Check : CheckToAddErlangPath
7171
7272[Code]
7373type
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
362363function 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