s/Released/Project_Release/

This commit is contained in:
Alejandro R Mosteo
2018-05-09 16:41:57 +02:00
parent 52b600c9ba
commit 515e7719ae
19 changed files with 38 additions and 44 deletions
+2 -2
View File
@@ -15,7 +15,7 @@ package Alire.Index.Adacurses is
Base : constant Release := Project.Unreleased
(Properties => Comments);
package V_6 is new Released
package V_6 is new Project_Release
(Base
.Replacing
(Git (Repo, "4ccb20409becb50c0b5fd29effb676b650608326"))
@@ -24,7 +24,7 @@ package Alire.Index.Adacurses is
((Debian | Ubuntu => NcursesAda.V_6.Within_Major,
others => Unavailable))));
package V_5 is new Released
package V_5 is new Project_Release
(Base
.Replacing
(Git (Repo, "4ccb20409becb50c0b5fd29effb676b650608326"))
+2 -2
View File
@@ -28,7 +28,7 @@ package Alire.Index.AdaYaml is
Private_Properties =>
Project_File ("yaml-tests.gpr"));
package V_0_3 is new Released
package V_0_3 is new Project_Release
(Base
.Replacing (Git (Prj_Repo, "2017a7c2523499c03b8d7fe06546a5a8bae6476d"))
.Extending (Properties =>
@@ -38,7 +38,7 @@ package Alire.Index.AdaYaml is
Executable ("yaml-loading_tests-harness") and
Executable ("yaml-transformation_tests-harness")));
package V_0_2 is new Released
package V_0_2 is new Project_Release
(Base
.Replacing (Git (Prj_Repo, "0264b03fd92eeedfe3e2713ed1da3f0d255c1727"))
.Extending (Private_Properties =>
+1 -1
View File
@@ -20,7 +20,7 @@ package Alire.Index.Agpl is
Author ("alejandro@mosteo.com") and
License (LGPL_3_0));
package V_1_0_0 is new Released
package V_1_0_0 is new Project_Release
(Base
.Replacing (Git (Repo, "00ac879f8d049171206699da39ac01f126b196e0")));
+1 -1
View File
@@ -15,7 +15,7 @@ package Alire.Index.AJUnitGen is
Dependencies =>
XML_EZ_Out.V_1_6.Within_Major);
package V_1_0_0 is new Released
package V_1_0_0 is new Project_Release
(Base
.Replacing (Git (Repo, "d2d110f92b8175ace6668dfdb639ea10ece5a822")));
+4 -4
View File
@@ -120,7 +120,7 @@ package Alire.Index.Alire is
-- Conditions on compiler version
On_Condition
(Distro_Release = Ubuntu_Artful,
(Distro_Release = Ubuntu_Bionic,
When_True => Comment ("Living on the edge"),
When_False => Comment ("I am a rock")) and
-- Conditions on distribution release
@@ -139,9 +139,9 @@ package Alire.Index.Alire is
--
-- Base : constant Release := Project.Unreleased;
--
-- package V1 is new Released (Base);
-- package V2 is new Released (Base);
-- package V3 is new Released (Base);
-- package V1 is new Project_Release (Base);
-- package V2 is new Project_Release (Base);
-- package V3 is new Project_Release (Base);
--
-- package Greedy_Breaker is
--
+7 -10
View File
@@ -20,16 +20,13 @@ package Alire.Index.Alr is
-- Add AJUnitGen and remove XML_EZ_Out in v0.5
V_0_4 : constant Release :=
Project.Register
(Base
.Upgrading
(V ("0.4"),
Git (Repo, "721d111225cf30b9c298ff23587664510f4c4ea1"))
.Extending
(Dependencies =>
Alire.V_0_4.Within_Minor and
XML_EZ_Out.V_1_6.Within_Minor));
package V_0_4 is new Project_Release
(Base
.Replacing (Git (Repo, "721d111225cf30b9c298ff23587664510f4c4ea1"))
.Extending
(Dependencies =>
Alire.V_0_4.Within_Minor and
XML_EZ_Out.V_1_6.Within_Minor));
V_0_2 : constant Release :=
Project.Register
+2 -2
View File
@@ -41,7 +41,7 @@ package Alire.Index.GNATCOLL is
function Project is new Catalogued_Project
("GNAT Components Collection - Slim version (no dependencies)");
package V_20180425 is new Released
package V_20180425 is new Project_Release
(Base
.Replacing (Git (Repo_Alire,
"81bc37d7548fe40024eb0f647df65ec42f65443b")));
@@ -53,7 +53,7 @@ package Alire.Index.GNATCOLL is
function Project is new Catalogued_Project
("GNAT Components Collection - Strings-only");
package V_20180425 is new Released
package V_20180425 is new Project_Release
(Base
.Replacing (Git (Repo_Alire,
"7823e31add7133b9fbc6e037d9986a823e840dc0")));
+1 -1
View File
@@ -14,7 +14,7 @@ package Alire.Index.Hungarian is
Author ("alejandro@mosteo.com") and
License (LGPL_3_0));
package V_1_0_0 is new Released
package V_1_0_0 is new Project_Release
(Base
.Replacing (Git (Repo, "c784e09b8f9bd02c76d89b458ad6a32f65cfd146")));
+1 -1
View File
@@ -20,7 +20,7 @@ package Alire.Index.PNG_IO is
Website ("http://png-io.sourceforge.net/") and
License (GPL_3_0));
package V_4_6_0 is new Released
package V_4_6_0 is new Project_Release
(Base
.Replacing (Git (Repo, "bb31fe1c1566e13339dec26ae359564364c00999"))
.Extending (Dependencies => Zlib_Ada.V_1_3_0.Within_Major));
+1 -1
View File
@@ -11,7 +11,7 @@ package Alire.Index.RSFile is
Author ("alejandro@mosteo.com") and
License (GPL_3_0));
package V_1_0_0 is new Released
package V_1_0_0 is new Project_Release
(Base
.Replacing (Git (Repo, "d1a368be007c9e4dd92cdaa9d031324121b9f4c7"))
.Extending (Properties => Executable ("rsfile")));
+1 -1
View File
@@ -13,7 +13,7 @@ package Alire.Index.Template is
-- Website ("") and
-- License (Unknown));
--
-- package V_0_0_0 is new Released
-- package V_0_0_0 is new Project_Release
-- (Base
-- .Replacing (Git (Repo, "commit"))
-- .Extending
+1 -1
View File
@@ -17,7 +17,7 @@ package Alire.Index.XStrings is
Author ("alejandro@mosteo.com") and
License (GPL_3_0));
package V_1_0_0 is new Released
package V_1_0_0 is new Project_Release
(Base
.Replacing (Git (Repo, "827d9108fbc873299016e924815fe2dd8af8071d")));
+1 -1
View File
@@ -20,7 +20,7 @@ package Alire.Index.ZLib_Ada is
Website ("http://zlib-ada.sourceforge.net/") and
License (Unknown));
package V_1_3_0 is new Released
package V_1_3_0 is new Project_Release
(Base
.Replacing (Git (Repo, "2bacba46c2d4d753c300848fe8134ee150078167"))
.Extending (Dependencies => Zlib.V_1_2.Within_Major));
+1 -1
View File
@@ -5,7 +5,7 @@ package Alire.Index.Libgsl is
Base : constant Release := Project.Unreleased;
package V_0 is new Released
package V_0 is new Project_Release
(Base
.Replacing
(Native ((Debian | Ubuntu => Packaged_As ("libgsl-dev"),
+1 -1
View File
@@ -5,7 +5,7 @@ package Alire.Index.ZLib is
Base : constant Release := Project.Unreleased;
package V_1_2 is new Released
package V_1_2 is new Project_Release
(Base
.Replacing
(Native ((Debian | Ubuntu => Packaged_As ("zlib1g-dev"),
+2 -2
View File
@@ -249,7 +249,7 @@ package body Alire.Index is
-- New_Release --
-----------------
package body Released is
package body Project_Release is
The_Release : constant Index.Release :=
Project.Register -- Add to catalog
@@ -282,6 +282,6 @@ package body Alire.Index is
function Within_Minor return Conditional.Dependencies is
(The_Release.Within_Minor);
end Released;
end Project_Release;
end Alire.Index;
+2 -2
View File
@@ -126,7 +126,7 @@ package Alire.Index is
generic
Base : Release;
with function Project return Catalog_Entry is <>;
package Released is
package Project_Release is
function Release return Index.Release;
@@ -137,7 +137,7 @@ package Alire.Index is
function Within_Major return Conditional.Dependencies;
function Within_Minor return Conditional.Dependencies;
end Released;
end Project_Release;
------------------------------------------------------------------
+1 -4
View File
@@ -23,10 +23,7 @@ package Alire.Platforms with Preelaborate is
Distro_Unknown);
type Versions is (Debian_Buster,
Ubuntu_Xenial,
Ubuntu_Yakkety,
Ubunty_Zesty,
Ubuntu_Artful,
Ubuntu_Bionic,
Distro_Version_Unknown);
-- Known flavors of OSs
-- It turns out that Debian uses no numbers for its non-stable releases, so we'll prefer the codename
+6 -6
View File
@@ -25,8 +25,8 @@ package Alire.Roots is
private
type Root (Name_Len : Natural; Released : Boolean) is tagged record
case Released is
type Root (Name_Len : Natural; Project_Release : Boolean) is tagged record
case Project_Release is
when False =>
Project : Alire.Project (1 .. Name_Len);
Dependencies : Conditional.Dependencies;
@@ -44,19 +44,19 @@ private
(Name'Length, False, Name, Dependencies);
function Default_Executable (R : Root) return String is
(if R.Released
(if R.Project_Release
then R.Release.Constant_Reference.Default_Executable
else +R.Project & OS_Lib.Exe_Suffix);
function Dependencies (R : Root) return Conditional.Dependencies is
(if R.Released
(if R.Project_Release
then R.Release.Constant_Reference.Depends
else R.Dependencies);
function Is_Released (R : Root) return Boolean is (R.Released);
function Is_Released (R : Root) return Boolean is (R.Project_Release);
function Project (R : Root) return Alire.Project is
(if R.Released
(if R.Project_Release
then R.Release.Constant_Reference.Project
else R.Project);