Skip to content

Commit

Permalink
Rebase fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mosteo committed Jan 28, 2021
1 parent 6c1a8f0 commit a03f105
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 58 deletions.
3 changes: 3 additions & 0 deletions src/alire/alire-config-edit.adb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ package body Alire.Config.Edit is
use Ada.Strings.Unbounded;
use TOML;

type String_Access is access String;
Config_Path : String_Access;

procedure Write_Config_File (Table : TOML_Value; Path : Absolute_Path)
with Pre => Table.Kind = TOML_Table;

Expand Down
7 changes: 6 additions & 1 deletion src/alire/alire-config-edit.ads
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,12 @@ private
(+Keys.Distribution_Disable_Detection,
Cfg_Bool,
+("If true, Alire will report an unknown distribution and will not"
& " attempt to use the system package manager."))
& " attempt to use the system package manager.")),

(+Keys.Warning_Caret,
Cfg_Bool,
+("If true, Alire will warn about the use of caret (^) "
& "for pre-1 dependencies."))

);

Expand Down
57 changes: 0 additions & 57 deletions src/alire/alire-config.ads
Original file line number Diff line number Diff line change
Expand Up @@ -141,61 +141,4 @@ private
function "+" (Source : String) return Ada.Strings.Unbounded.Unbounded_String
renames Ada.Strings.Unbounded.To_Unbounded_String;

Builtins : constant array (Natural range <>) of Builtin_Entry :=
(
(+Keys.User_Name,
Cfg_String,
+("User full name. Used for the authors and " &
"maintainers field of a new crate.")),
(+Keys.User_Email,
Cfg_Email,
+("User email address. Used for the authors and" &
" maintainers field of a new crate.")),
(+Keys.User_Github_Login,
Cfg_GitHub_Login,
+("User GitHub login/username. Used to for the maintainers-logins " &
"field of a new crate.")),

(+Keys.Editor_Cmd,
Cfg_String,
+("Editor command and arguments for editing crate code (alr edit)." &
" The executables and arguments are separated by a single space" &
" character. The token ${GPR_FILE} is replaced by" &
" a path to the project file to open.")),

(+"msys2.do_not_install",
Cfg_Bool,
+("If true, Alire will not try to automatically" &
" install msys2 system package manager. (Windows only)")),

(+"msys2.install_dir",
Cfg_Absolute_Path,
+("Directory where Alire will detect and/or install" &
" msys2 system package manager. (Windows only)")),

(+"auto-gpr-with",
Cfg_Bool,
+("If true, Alire will automatically add/edit a list of 'with' " &
"statements in the root GPR project file based on the " &
"dependencies of the crate.")),

(+Keys.Update_Manually,
Cfg_Bool,
+("If true, Alire will not attempt to update dependencies even after "
& "the manifest is manually edited, or when no valid solution has "
& "been ever computed. All updates have to be manually requested "
& "through `alr update`")),

(+Keys.Distribution_Disable_Detection,
Cfg_Bool,
+("If true, Alire will report an unknown distribution and will not"
& " attempt to use the system package manager.")),

(+Keys.Warning_Caret,
Cfg_Bool,
+("If true, Alire will warn about the use of caret (^) "
& "for pre-1 dependencies."))

);

end Alire.Config;

0 comments on commit a03f105

Please sign in to comment.