remove erlang path stuff from web installer, consolidate/case source files

Author: chyndman

Elixir.iss

@@ -68,9 +68,9 @@ Name: elixirpath; Description: "Append {#ELIXIR_PATH} to system PATH"; Check: Ch
 Name: escriptpath; Description: "Append {#ESCRIPT_PATH} to system PATH"; Check: CheckToAppendEscriptPath
 
 [Code]
-#include "src\util.iss"
-#include "src\path.iss"
-#include "src\erlang_env.iss"
+#include "src\Util.iss"
+#include "src\Path.iss"
+#include "src\ErlangInstall.iss"
 
 var
   GlobalPageErlangDir: TInputDirWizardPage;

ElixirWeb.iss

@@ -33,9 +33,6 @@ DisableWelcomePage=no
 CreateAppDir=no
 Uninstallable=no
 
-; Because we may be adding Erlang to Path
-ChangesEnvironment=yes
-
 ; The user will see the offline installer's finished page instead
 DisableFinishedPage=yes
 
@@ -54,9 +51,9 @@ Source: "Elixir.iss"; DestDir: "{tmp}"; Flags: deleteafterinstall
 Source: "assets\drop.ico"; DestDir: "{tmp}\assets"; Flags: deleteafterinstall
 Source: "assets\drop_banner.bmp"; DestDir: "{tmp}\assets"; Flags: deleteafterinstall
 Source: "assets\null.bmp"; DestDir: "{tmp}\assets"; Flags: deleteafterinstall
-Source: "src\util.iss"; DestDir: "{tmp}\src"; Flags: deleteafterinstall
-Source: "src\path.iss"; DestDir: "{tmp}\src"; Flags: deleteafterinstall
-Source: "src\erlang_env.iss"; DestDir: "{tmp}\src"; Flags: deleteafterinstall
+Source: "src\Util.iss"; DestDir: "{tmp}\src"; Flags: deleteafterinstall
+Source: "src\Path.iss"; DestDir: "{tmp}\src"; Flags: deleteafterinstall
+Source: "src\ErlangInstall.iss"; DestDir: "{tmp}\src"; Flags: deleteafterinstall
 ; 7-Zip portable extractor
 Source: "bin\7za.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall
 ; Compiler files
@@ -85,17 +82,14 @@ Name: "unins_previous"; Description: "Uninstall previous version at {#StrInspect
 Name: "erlang"; Description: "Install Erlang"; Check: CheckToInstallErlang
 Name: "erlang\32"; Description: "{#StrInspectScriptConst('GlobalErlangData.Name32')}"; Flags: exclusive
 Name: "erlang\64"; Description: "{#StrInspectScriptConst('GlobalErlangData.Name64')}"; Flags: exclusive; Check: IsWin64
-Name: "erlang\newpath"; Description: "Append Erlang directory to system PATH"
-Name: "existingpath"; Description: "Append {#StrInspectScriptConst('GetLatestErlangPath')}\bin to system PATH"; Check: CheckToAddExistingErlangPath
 
 [Code]
-#include "src\util.iss"
-#include "src\path.iss"
-#include "src\elixir_release.iss"
-#include "src\elixir_lookup.iss"
-#include "src\erlang_data.iss"
-#include "src\erlang_env.iss"
-#include "src\unins_previous.iss"
+#include "src\Util.iss"
+#include "src\Path.iss"
+#include "src\TErlangData.iss"
+#include "src\TElixirRelease.iss"
+#include "src\ErlangInstall.iss"
+#include "src\ElixirInstall.iss"
 
 var
   GlobalPageSelRelease: TInputOptionWizardPage;
@@ -109,16 +103,6 @@ var
 
   CacheSelectedRelease: TElixirRelease;
 
-procedure CurStepChanged(CurStep: TSetupStep);
-begin
-  if CurStep = ssPostInstall then begin
-    // The other sections ([Files], [Run]) have been processed
-    if IsTaskSelected('erlang\newpath') or IsTaskSelected('existingpath') then
-      // An Erlang Path-related task was selected, so it is performed here
-      AppendPath(GetLatestErlangPath + '\bin');
-  end;
-end;
-
 procedure CurPageChanged(CurPageID: Integer);
 var
   ListBoxesToCheck: array[0..1] of TNewCheckListBox;
@@ -249,9 +233,5 @@ function CheckToInstallErlang: Boolean; begin
   // Erlang should be installed if there's no Erlang path in the registry
   Result := (GetLatestErlangPath = ''); end;
 
-function CheckToAddExistingErlangPath: Boolean; begin
-  // We shouldn't add an existing Erlang path if it's already in Path or it isn't installed at all
-  Result := not (CheckToInstallErlang or ErlangInPath); end;
-
 // Scripted constants expand here  
 {#StrInspectAllFuncs}

src/unins_previous.iss renamed to src/ElixirInstall.iss

@@ -1,4 +1,4 @@
-// unins_previous.iss - Functionality to check for previous Elixir installations
+// ElixirInstall.iss - Functions relating to existing installations of Elixir
 // Copyright (c) Chris Hyndman
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");

src/erlang_env.iss renamed to src/ErlangInstall.iss

@@ -1,4 +1,4 @@
-// erlang_env.iss - Functions relating to Erlang's environment properties
+// ErlangInstall.iss - Functions relating to existing installations of Erlang
 // Copyright (c) Chris Hyndman
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,12 +46,3 @@ begin
   if Result = '' then
     Result := GetLatestErlangPathOfArch(False);
 end;
-
-// Returns true or false depending on if some erl.exe is in the
-// system's Path variable
-function ErlangInPath: Boolean;
-var
-  _int: Integer;
-begin
-  Result := Exec('erl.exe', '+V', '', SW_HIDE, ewWaitUntilTerminated, _int);
-end;

src/elixir_release.iss renamed to src/TElixirRelease.iss

@@ -1,4 +1,4 @@
-// elixir_release.iss - TElixirRelease and related functions
+// TElixirRelease.iss - TElixirRelease and related functions
 // Copyright (c) Chris Hyndman
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");
@@ -126,3 +126,47 @@ begin
     end
   end;
 end;
+
+// Given an array of Elixir releases and a release type, return the first release in the array of that type
+function FindFirstReleaseOfType(Releases: array of TElixirRelease; ReleaseType: TElixirReleaseType): TElixirRelease;
+var
+  i: Integer;
+begin
+  for i := 0 to GetArrayLength(Releases) - 1 do begin
+    if Releases[i].ReleaseType = ReleaseType then begin
+      Result := Releases[i];
+      exit;
+    end;
+  end;
+end;
+
+// Given an array of Elixir releases and a reference object, return the first release in the array which
+// points to the same object
+function FindFirstReleaseMatchingRef(Releases: array of TElixirRelease; RefMatch: TObject): TElixirRelease;
+var
+  i: Integer;
+begin
+  for i := 0 to GetArrayLength(Releases) - 1 do begin
+    if Releases[i].Ref = RefMatch then begin
+      Result := Releases[i];
+      exit;
+    end;
+  end;
+end;
+
+// Given an array of list boxes and an array of Elixir releases, search for a selected radio button that
+// points to an Elixir release reference object, and return the Elixir release which shares that reference
+// object
+function FindSelectedRelease(ListBoxes: array of TNewCheckListBox; Releases: array of TElixirRelease): TElixirRelease;
+var
+  i, j: Integer;
+begin
+  for i := 0 to GetArrayLength(ListBoxes) - 1 do begin
+    for j := 0 to ListBoxes[i].Items.Count - 1 do begin
+      if ListBoxes[i].ItemObject[j] <> nil then begin
+        Result := FindFirstReleaseMatchingRef(Releases, ListBoxes[i].ItemObject[j]);
+        exit;
+      end;
+    end;
+  end;
+end;

src/erlang_data.iss renamed to src/TErlangData.iss

@@ -1,4 +1,4 @@
-// erlang_data.iss - TErlangData and related functions
+// TErlangData.iss - TErlangData and related functions
 // Copyright (c) Chris Hyndman
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");

src/elixir_lookup.iss

@@ -1,4 +1,4 @@
-// path.iss - Manipulate the PATH variable
+// Path.iss - Manipulate the PATH variable
 // Copyright (c) Chris Hyndman
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");

src/path.iss

@@ -1,4 +1,4 @@
-// util.iss - Useful helper functions
+// Util.iss - Useful helper functions
 // Copyright (c) Chris Hyndman
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");