Refactor Alire.Shared into Alire.Toolchains (#1423)

alire-project · Aug 8, 2023 · 2068f31 · 2068f31
1 parent 7ca2956
commit 2068f31
Show file tree

Hide file tree

Showing 9 changed files with 312 additions and 337 deletions.
diff --git a/src/alire/alire-roots.adb b/src/alire/alire-roots.adb
@@ -14,7 +14,6 @@ with Alire.OS_Lib;
 with Alire.Paths.Vault;
 with Alire.Properties.Actions.Executor;
 with Alire.Roots.Optional;
-with Alire.Shared;
 with Alire.Solutions.Diffs;
 with Alire.Spawn;
 with Alire.Toolchains;
@@ -695,7 +694,7 @@ package body Alire.Roots is
             if Toolchains.Is_Tool (Rel) then
 
                --  Toolchain crates are installed to their own place
-               Shared.Share (Rel);
+               Toolchains.Deploy (Rel);
 
             else
 
@@ -1295,7 +1294,7 @@ package body Alire.Roots is
    is
    begin
       if Toolchains.Is_Tool (Rel) then
-         return Shared.Path;
+         return Toolchains.Path;
       elsif Builds.Sandboxed_Dependencies then
          --  Note that, even for releases not requiring a build (e.g.
          --  externals), in sandboxed mode we are creating a folder for them

diff --git a/src/alire/alire-shared.adb b/src/alire/alire-shared.adb
diff --git a/src/alire/alire-shared.ads b/src/alire/alire-shared.ads
diff --git a/src/alire/alire-solver.adb b/src/alire/alire-solver.adb
@@ -10,7 +10,6 @@ with Alire.Milestones;
 with Alire.Optional;
 with Alire.Platforms.Current;
 with Alire.Releases.Containers;
-with Alire.Shared;
 with Alire.Root;
 with Alire.Toolchains;
 with Alire.Utils.TTY;
@@ -259,7 +258,7 @@ package body Alire.Solver is
       --  solution is found).
 
       Installed : constant Releases.Containers.Release_Set :=
-                                  Shared.Available
+                                  Toolchains.Available
                                     (Detect_Externals =>
                                         Options.Detecting = Detect);
       --  Installed releases do not change during resolution, we make a local

diff --git a/src/alire/alire-toolchains-solutions.adb b/src/alire/alire-toolchains-solutions.adb
@@ -2,7 +2,6 @@ with AAA.Strings;
 
 with Alire.Index;
 with Alire.Root;
-with Alire.Shared;
 
 package body Alire.Toolchains.Solutions is
 
@@ -22,14 +21,14 @@ package body Alire.Toolchains.Solutions is
          use type Milestones.Milestone;
       begin
          --  Check that is not already there
-         if (for some Rel of Shared.Available => Rel.Milestone = Mil) then
+         if (for some Rel of Toolchains.Available => Rel.Milestone = Mil) then
             return;
          end if;
 
          --  It must be redeployed
          Put_Warning ("Tool " & Mil.TTY_Image & " is missing, redeploying...");
 
-         Shared.Share (Index.Find (Mil.Crate, Mil.Version));
+         Toolchains.Deploy (Index.Find (Mil.Crate, Mil.Version));
       end Redeploy_If_Needed;
 
       Result : Alire.Solutions.Solution := Solution;
@@ -53,7 +52,7 @@ package body Alire.Toolchains.Solutions is
 
             --  Add the configured tool release to the solution
             Result := Result.Including
-              (Release        => Shared.Release
+              (Release        => Toolchains.Release
                  (Target           => Tool_Milestone (Tool),
                   Detect_Externals => Tool_Is_External (Tool)),
                Env            => Root.Platform_Properties,