From 05ebc5b815c9f6d9722436a8bc15dea5d4ad23b3 Mon Sep 17 00:00:00 2001 From: "Alejandro R. Mosteo" Date: Sun, 4 Mar 2018 23:47:54 +0100 Subject: [PATCH] more releases --- index/alire-index-alire.ads | 6 ++--- index/alire-index-alr.ads | 6 ++--- index/alire-index-apq.ads | 24 +++++++++++++++++ index/alire-index-hello.ads | 2 -- index/alire-index-libadacrypt.ads | 21 +++++++++++++++ index/alire-index-semantic_versioning.ads | 2 +- index/alire-index-simple_logging.ads | 10 +++---- index/alire-index-template.ads | 29 ++++++++++++++++++++ index/alire-index-whitakers_words.ads | 32 +++++++++++++++++++++++ src/alire-gpr.ads | 3 +-- 10 files changed, 119 insertions(+), 16 deletions(-) create mode 100644 index/alire-index-apq.ads create mode 100644 index/alire-index-libadacrypt.ads create mode 100644 index/alire-index-template.ads create mode 100644 index/alire-index-whitakers_words.ads diff --git a/index/alire-index-alire.ads b/index/alire-index-alire.ads index fd44fd6b..3b5b097b 100644 --- a/index/alire-index-alire.ads +++ b/index/alire-index-alire.ads @@ -8,14 +8,14 @@ package Alire.Index.Alire is Desc : constant Project_Description := "Alire project catalog and support files"; - V_0_1 : constant Release := + V_0_1_2 : constant Release := Register (Name, V ("0.1.2"), Desc, Git (Repo, "e2dee2e147ae9e4d666567b53b108cbe61bc06e8"), Dependencies => - Within_Minor (Semantic_Versioning.V_0_1) and - Within_Major (Simple_Logging.V_1) + Within_Minor (Semantic_Versioning.V_0_1_2) and + Within_Major (Simple_Logging.V_1_0_0) ); diff --git a/index/alire-index-alr.ads b/index/alire-index-alr.ads index 1ff26564..19f11d0e 100644 --- a/index/alire-index-alr.ads +++ b/index/alire-index-alr.ads @@ -8,13 +8,13 @@ package Alire.Index.Alr is Desc : constant Project_Description := "Command-line tool from the Alire project"; - V_0_1 : constant Release := + V_0_1_2 : constant Release := Register (Name, V ("0.1.2"), Desc, Git (Repo, "4002536beea8aee12b455077df4dd144b409bde4"), Dependencies => - Within_Major (Alire.V_0_1) and - Within_Major (Simple_Logging.V_1)); + Within_Major (Alire.V_0_1_2) and + Within_Major (Simple_Logging.V_1_0_0)); end Alire.Index.Alr; diff --git a/index/alire-index-apq.ads b/index/alire-index-apq.ads new file mode 100644 index 00000000..a47fa145 --- /dev/null +++ b/index/alire-index-apq.ads @@ -0,0 +1,24 @@ +package Alire.Index.APQ is + + Name : constant Project_Name := "apq"; + Repo : constant URL := "https://github.com/alire-project/apq.git"; + + Desc : constant Project_Description := "APQ Ada95 Database Library "; + + V_3_2_0 : constant Release := + Register (Name, + V ("3.2.0"), + Desc & "(core)", + Git (Repo, "3b5b4b99f528f853e02abf239da7db3d8c9962b4"), + Properties => + GPR_File ("apq.gpr") and + GPR_File ("samples" / "apq-samples.gpr") and + + GPR_Scenario ("OS", "Windows_NT" or "GNU/Linux" or "Darwin") and + GPR_Scenario ("DEBUG", "true" or "false") and + + License (GMGPL_2_0) and + License (GMGPL_3_0) + ); + +end Alire.Index.APQ; diff --git a/index/alire-index-hello.ads b/index/alire-index-hello.ads index 9d22cfd1..870347ce 100644 --- a/index/alire-index-hello.ads +++ b/index/alire-index-hello.ads @@ -21,6 +21,4 @@ package Alire.Index.Hello is Git (Repo, "65725c20778875eef12b61a01b437120932965f3"), Dependencies => Within_Major (Libhello.V_1_0_0)); - V_1_0 : Release renames V_1_0_1; - end Alire.Index.Hello; diff --git a/index/alire-index-libadacrypt.ads b/index/alire-index-libadacrypt.ads new file mode 100644 index 00000000..a8afaae2 --- /dev/null +++ b/index/alire-index-libadacrypt.ads @@ -0,0 +1,21 @@ +package Alire.Index.Libadacrypt is + + Prj_Name : constant Project_Name := "libadacrypt"; + Prj_Desc : constant Project_Description := "A crypto library for Ada with a nice API"; + Prj_Repo : constant URL := "https://github.com/cforler/Ada-Crypto-Library.git"; + + Prj_Author : constant String := "Christian Forler"; + + V_0_8_7 : constant Release := + Register (Prj_Name, + V ("0.8.7"), + Prj_Desc, + Git (Prj_Repo, "06b4907c6ae6dcdce62339ff8fd2913d7bbbc0d9"), + Properties => + Author (Prj_Author) and + + License (GMGPL_2_0) and + License (GMGPL_3_0) + ); + +end Alire.Index.Libadacrypt; diff --git a/index/alire-index-semantic_versioning.ads b/index/alire-index-semantic_versioning.ads index cf2cd4b5..3e24f2e3 100644 --- a/index/alire-index-semantic_versioning.ads +++ b/index/alire-index-semantic_versioning.ads @@ -5,7 +5,7 @@ package Alire.Index.Semantic_Versioning is Desc : constant Project_Description := "Semantic Versioning for Ada"; - V_0_1 : constant Release := + V_0_1_2 : constant Release := Register (Name, V ("0.1.2"), Desc, diff --git a/index/alire-index-simple_logging.ads b/index/alire-index-simple_logging.ads index f2824c47..fded0d27 100644 --- a/index/alire-index-simple_logging.ads +++ b/index/alire-index-simple_logging.ads @@ -5,10 +5,10 @@ package Alire.Index.Simple_Logging is Desc : constant Project_Description := "Simple logging to console"; - V_1 : constant Release := - Register (Name, - V ("1.0.0"), - Desc, - Git (Repo, "d98242b8bd1c7f964cebc454e9b1206ffdbb0ca9")); + V_1_0_0 : constant Release := + Register (Name, + V ("1.0.0"), + Desc, + Git (Repo, "d98242b8bd1c7f964cebc454e9b1206ffdbb0ca9")); end Alire.Index.Simple_Logging; diff --git a/index/alire-index-template.ads b/index/alire-index-template.ads new file mode 100644 index 00000000..969f9048 --- /dev/null +++ b/index/alire-index-template.ads @@ -0,0 +1,29 @@ +package Alire.Index.Template is + + -- A Template with common fields ready to save-as + +-- Prj_Name : constant Project_Name := ""; +-- Prj_Desc : constant Project_Description := ""; +-- Prj_Repo : constant URL := ""; +-- +-- Prj_Author : constant String := ""; +-- Prj_Maintainer : constant String := ""; +-- Prj_Website : constant URL := ""; + +-- V_0_0_0 : constant Release := +-- Register (Prj_Name, +-- V (""), +-- Prj_Desc, +-- Git (Prj_Repo, "commit"), +-- Properties => +-- GPR_File ("") and +-- +-- Executable ("main") and +-- +-- Author (Prj_Author) and +-- Maintainer (Prj_Maintainer) and +-- Website (Prj_Website) and +-- License (GMGPL_2_0) +-- ); + +end Alire.Index.Template; diff --git a/index/alire-index-whitakers_words.ads b/index/alire-index-whitakers_words.ads new file mode 100644 index 00000000..e5aab6d9 --- /dev/null +++ b/index/alire-index-whitakers_words.ads @@ -0,0 +1,32 @@ +package Alire.Index.Whitakers_Words is + + -- A Template with common fields ready to save-as + + Prj_Name : constant Project_Name := "whitakers_words"; + Prj_Desc : constant Project_Description := "William Whitaker's WORDS, a Latin dictionary"; + Prj_Repo : constant URL := "https://github.com/mk270/whitakers-words.git"; + + Prj_Author : constant String := "William A. Whitaker"; + Prj_Maintainer : constant String := "Martin Keegan"; + Prj_Website : constant URL := "http://mk270.github.io/whitakers-words/"; + + V_0_0_0 : constant Release := + Register (Prj_Name, + V ("2017.09.10"), + Prj_Desc, + Git (Prj_Repo, "27be95b8a06d7b22c0600c824cf929ab43efcf25"), + Properties => + GPR_File ("words.gpr") and + + Executable ("words") and + + Author (Prj_Author) and + Maintainer (Prj_Maintainer) and + Website (Prj_Website) and + License (Public_Domain) and + + Comment ("This package builds the binary but additional steps are needed") and + Comment ("See the README file for further instructions") + ); + +end Alire.Index.Whitakers_Words; diff --git a/src/alire-gpr.ads b/src/alire-gpr.ads index e14695b5..9c89c528 100644 --- a/src/alire-gpr.ads +++ b/src/alire-gpr.ads @@ -12,8 +12,7 @@ package Alire.GPR with Preelaborate is function Free_Variable (Name : String) return Variable; - subtype Value is String - with Dynamic_Predicate => (for all C of Value => C in 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '-'); + subtype Value is String; type Value_Vector is new Utils.String_Vector with null record;