Merge commit '99fb16b' into devel

This commit is contained in:
Jano at Zelda
2018-02-06 13:12:18 +01:00
3 changed files with 49 additions and 58 deletions
+1 -3
View File
@@ -8,10 +8,8 @@ package body Alire.Index is
Version : Semantic_Versioning.Version;
Hosting : Repositories.Repository'Class;
Id : Repositories.Release_Id;
Depends_On : Dependencies := Nothing;
License : Licenses := Unknown) return Release
Depends_On : Dependencies := Nothing) return Release
is
pragma Unreferenced (License);
begin
return Rel : constant Alire.Releases.Release :=
Alire.Releases.New_Release (Project,
+4 -8
View File
@@ -26,15 +26,13 @@ package Alire.Index is
Version : Semantic_Versioning.Version;
Hosting : Repositories.Repository'Class;
Id : Repositories.Release_Id;
Depends_On : Dependencies := Depends.Nothing;
License : Licenses := Unknown) return Release;
Depends_On : Dependencies := Depends.Nothing) return Release;
function Register_Git (Project : Project_Name;
Version : Semantic_Versioning.Version;
Hosting : URL;
Commit : Repositories.Git.Commit_ID;
Depends_On : Dependencies := Depends.Nothing;
License : Licenses := Unknown) return Release;
Depends_On : Dependencies := Depends.Nothing) return Release;
-- function Register_Local (Project : Project_Name;
-- Version : Semantic_Versioning.Version;
@@ -71,14 +69,12 @@ private
Version : Semantic_Versioning.Version;
Hosting : URL;
Commit : Repositories.Git.Commit_ID;
Depends_On : Dependencies := Depends.Nothing;
License : Licenses := Unknown) return Release
Depends_On : Dependencies := Depends.Nothing) return Release
is (Register (Project,
Version,
Repositories.Git.New_Repository (String (Hosting)),
Repositories.Release_Id (Commit),
Depends_On,
License));
Depends_On));
-- function Register_Local (Project : Project_Name;
-- Version : Semantic_Versioning.Version;
-3
View File
@@ -13,9 +13,6 @@ package Alire with Preelaborate is
subtype Project_Name is String;
-- FIXME: add predicate on valid characters (must be a valid gnat filename part)
type Licenses is (Unknown);
-- FIXME: use this information to look for solutions with compatible licenses
type Dependency (<>) is tagged private;