Skip to content

Commit

Permalink
Remove obsolescent files (#1105)
Browse files Browse the repository at this point in the history
  • Loading branch information
mosteo authored Jul 25, 2022
1 parent 29f70db commit 817e271
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 121 deletions.
3 changes: 1 addition & 2 deletions src/alire/alire-paths.ads
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ package Alire.Paths with Preelaborate is

Temp_Folder_Inside_Working_Folder : constant Relative_Path := "tmp";

function Working_Folder_Inside_Root return Relative_Path
is ("alire");
Working_Folder_Inside_Root : constant Relative_Path := "alire";
-- Folder within a working release that will contain metadata/build files,
-- dependency releases, and session.

Expand Down
12 changes: 7 additions & 5 deletions src/alr/alr-commands-test.adb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ with Alire.Directories;
with Alire.Index;
with Alire.Milestones;
with Alire.OS_Lib.Subprocess;
with Alire.Paths;
with Alire.Platforms.Current;
with Alire.Properties.Actions.Executor;
with Alire.Releases.Containers;
Expand All @@ -18,7 +19,6 @@ with Alire.Solver;
with Alire.Utils;

with Alr.Files;
with Alr.Paths;
with Alr.Testing.Collections;
with Alr.Testing.Console;
with Alr.Testing.JUnit;
Expand All @@ -33,6 +33,7 @@ package body Alr.Commands.Test is

use type Ada.Containers.Count_Type;

package Paths renames Alire.Paths;
package Platform renames Alire.Platforms.Current;
package Query renames Alire.Solver;

Expand Down Expand Up @@ -322,11 +323,12 @@ package body Alr.Commands.Test is
end if;

Make_Dir
(Create (+R.Base_Folder) / Create (+Paths.Alr_Working_Folder));
(Create (+R.Base_Folder)
/ Create (+Paths.Working_Folder_Inside_Root));
-- Might not exist for system/failed/skipped
Output.Write (R.Base_Folder /
Paths.Alr_Working_Folder /
"alr_test_" & Timestamp & ".log");
Output.Write (R.Base_Folder
/ Paths.Working_Folder_Inside_Root
/ "alr_test_" & Timestamp & ".log");
end Test_Release;

begin
Expand Down
3 changes: 1 addition & 2 deletions src/alr/alr-commands-version.adb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ with Alire.Toolchains;
with Alire.Utils.Tables;

with Alr.Bootstrap;
with Alr.Paths;

with GNAT.Compiler_Version;
with GNAT.Source_Info;
Expand Down Expand Up @@ -51,7 +50,7 @@ package body Alr.Commands.Version is

Table.Append ("").New_Row;
Table.Append ("CONFIGURATION").New_Row;
Table.Append ("config folder:").Append (Paths.Alr_Config_Folder).New_Row;
Table.Append ("config folder:").Append (Alire.Config.Edit.Path).New_Row;
Table.Append ("force flag:").Append (Alire.Force'Image).New_Row;
Table.Append ("non-interactive flag:")
.Append (CLIC.User_Input.Not_Interactive'Image).New_Row;
Expand Down
16 changes: 0 additions & 16 deletions src/alr/alr-defaults.ads

This file was deleted.

96 changes: 0 additions & 96 deletions src/alr/alr-paths.ads

This file was deleted.

0 comments on commit 817e271

Please sign in to comment.