From 99fb16bdf525696b12c6a90ea0d483244221f74b Mon Sep 17 00:00:00 2001 From: Jano at Zelda Date: Tue, 6 Feb 2018 13:11:56 +0100 Subject: [PATCH] Removed ill-advised License ideas --- src/alire-index.adb | 4 +- src/alire-index.ads | 12 ++---- src/alire.ads | 91 ++++++++++++++++++++++----------------------- 3 files changed, 49 insertions(+), 58 deletions(-) diff --git a/src/alire-index.adb b/src/alire-index.adb index 6c579e3c..b22b8a7f 100644 --- a/src/alire-index.adb +++ b/src/alire-index.adb @@ -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, diff --git a/src/alire-index.ads b/src/alire-index.ads index 49b93e6c..ecf9ac40 100644 --- a/src/alire-index.ads +++ b/src/alire-index.ads @@ -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; diff --git a/src/alire.ads b/src/alire.ads index 5c81c04b..57ed17d5 100644 --- a/src/alire.ads +++ b/src/alire.ads @@ -2,82 +2,79 @@ private with Ada.Containers.Indefinite_Holders; with Semantic_Versioning; -package Alire with Preelaborate is - +package Alire with Preelaborate is + File_Error : exception; - - - type URL is new String; - - + + + type URL is new String; + + 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; - + + type Dependency (<>) is tagged private; + function Project (Dep : Dependency) return Project_Name; - + function Versions (Dep : Dependency) return Semantic_Versioning.Version_Set; - - + + type Milestone (<>) is tagged private; - + function "<" (L, R : Milestone) return Boolean; - - function New_Milestone (Name : Project_Name; + + function New_Milestone (Name : Project_Name; Version : Semantic_Versioning.Version) return Milestone; - + function Project (M : Milestone) return Project_Name; - + function Version (M : Milestone) return Semantic_Versioning.Version; - + -- LOGGING -- - + type Verbosities is (Debug, Verbose, Terse); - + Verbosity : Verbosities := Terse; - + procedure Log (S : String; Level : Verbosities := Terse); - -private - + +private + use all type Semantic_Versioning.Version; - + package Version_Holders is new Ada.Containers.Indefinite_Holders (Semantic_Versioning.Version_Set, Semantic_Versioning."="); - + type Version_Set_Holder is new Version_Holders.Holder with null record; - + type Dependency (Name_Len : Positive) is tagged record Project : Project_Name (1 .. Name_Len); Versions_H : Version_Set_holder; - end record; - + end record; + function Project (Dep : Dependency) return Project_Name is (Dep.Project); - - function Versions (Dep : Dependency) return Semantic_Versioning.Version_Set is + + function Versions (Dep : Dependency) return Semantic_Versioning.Version_Set is (Dep.Versions_H.Element); - - + + type Milestone (Name_Len : Positive) is tagged record Name : Project_Name (1 .. Name_Len); Version : Semantic_Versioning.Version; end record; - - function "<" (L, R : Milestone) return Boolean is + + function "<" (L, R : Milestone) return Boolean is (L.Name < R.Name or else (L.Name = R.Name and then L.Version < R.Version)); - - function New_Milestone (Name : Project_Name; - Version : Semantic_Versioning.Version) return Milestone is - (Name'Length, Name, Version); - + + function New_Milestone (Name : Project_Name; + Version : Semantic_Versioning.Version) return Milestone is + (Name'Length, Name, Version); + function Project (M : Milestone) return Project_Name is (M.Name); - - function Version (M : Milestone) return Semantic_Versioning.Version is (M.Version); - + + function Version (M : Milestone) return Semantic_Versioning.Version is (M.Version); + end Alire;