From 2b6d3f2a116cb7c18f392015c792038892815055 Mon Sep 17 00:00:00 2001 From: A Date: Mon, 19 Feb 2018 16:19:45 +0100 Subject: [PATCH] Bump indexed versions --- index/alire-index-alire.ads | 21 +++++++++++++++++++++ index/alire-index-alr.ads | 10 ++++++++-- index/alire-index-semantic_versioning.ads | 15 +++++++++++++++ index/alire-index-simple_logging.ads | 2 +- src/alire-index.ads | 5 ++--- 5 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 index/alire-index-alire.ads create mode 100644 index/alire-index-semantic_versioning.ads diff --git a/index/alire-index-alire.ads b/index/alire-index-alire.ads new file mode 100644 index 00000000..6ccbafdd --- /dev/null +++ b/index/alire-index-alire.ads @@ -0,0 +1,21 @@ +with Alire.Index.Semantic_Versioning; +with Alire.Index.Simple_Logging; + +package Alire.Index.Alire is + + Name : constant Project_Name := "alire"; + Repo : constant URL := "https://bitbucket.org/aleteolabs/alire.git"; + + Desc : constant Project_Description := "Alire project catalog and support files"; + + Latest : constant Release := + Register_Git (Name, + V ("0.1.0"), + Desc, + Repo, + "ce78e7706c9d3f97605df48d8befca5407f8d328", + Depends_On => + Within_Major (Semantic_Versioning.Latest) and + Within_Major (Simple_Logging.V_1_0_0)); + +end Alire.Index.Alire; diff --git a/index/alire-index-alr.ads b/index/alire-index-alr.ads index 7ef348d9..275badee 100644 --- a/index/alire-index-alr.ads +++ b/index/alire-index-alr.ads @@ -1,3 +1,6 @@ +with Alire.Index.Alire; +with Alire.Index.Simple_Logging; + package Alire.Index.Alr is Name : constant Project_Name := "alr"; @@ -5,11 +8,14 @@ package Alire.Index.Alr is Desc : constant Project_Description := "Command-line tool from the Alire project"; - V_1_0_0 : constant Release := + Latest : constant Release := Register_Git (Name, V ("0.1.0"), Desc, Repo, - "ce78e7706c9d3f97605df48d8befca5407f8d328"); + "ce78e7706c9d3f97605df48d8befca5407f8d328", + Depends_On => + Within_Major (Alire.Latest) and + Within_Major (Simple_Logging.V_1_0_0)); end Alire.Index.Alr; diff --git a/index/alire-index-semantic_versioning.ads b/index/alire-index-semantic_versioning.ads new file mode 100644 index 00000000..82fd598e --- /dev/null +++ b/index/alire-index-semantic_versioning.ads @@ -0,0 +1,15 @@ +package Alire.Index.Semantic_Versioning is + + Name : constant Project_Name := "semantic_versioning"; + Repo : constant URL := "https://bitbucket.org/aleteolabs/semver.git"; + + Desc : constant Project_Description := "Semantic Versioning for Ada"; + + Latest : constant Release := + Register_Git (Name, + V ("0.1.0"), + Desc, + Repo, + "9f35b00a31861ea96085ee553fb6335d74831f5c"); + +end Alire.Index.Semantic_Versioning; diff --git a/index/alire-index-simple_logging.ads b/index/alire-index-simple_logging.ads index 6e5a67f7..8db94ff0 100644 --- a/index/alire-index-simple_logging.ads +++ b/index/alire-index-simple_logging.ads @@ -10,6 +10,6 @@ package Alire.Index.Simple_Logging is V ("1.0.0"), Desc, Repo, - "77896e4a9d0539a63e6bfb657ab955656c2e3c0f"); + "81a00b835cc84a74e7008015623bce018b2fa72a"); end Alire.Index.Simple_Logging; diff --git a/src/alire-index.ads b/src/alire-index.ads index 67ab1720..638bf5cc 100644 --- a/src/alire-index.ads +++ b/src/alire-index.ads @@ -82,6 +82,7 @@ package Alire.Index is use all type Compilers.Compilers; use all type Operating_Systems.Operating_Systems; + use all type Dependencies; use all type Properties.Property'Class; -- for "and" operator use all type Requisites.Requisite'Class; use all type Requisites.Tree; -- for logical operators @@ -134,9 +135,7 @@ private Requisites => Requisites, Native => False)); - use Semantic_Versioning; - - use all type Dependencies; + use Semantic_Versioning; function Within_Major (R : Release) return Dependencies is (New_Dependency (R.Project, Within_Major (R.Version)));