From b596c8386a9cfcb438fffa4d5e9bdcdfb0d00257 Mon Sep 17 00:00:00 2001 From: "Alejandro R. Mosteo" Date: Wed, 7 Mar 2018 12:54:38 +0100 Subject: [PATCH] testing on 7.2 --- index/alire-index-alire.ads | 2 +- index/alire-index-dak.ads | 4 ++-- index/alire-index-libadacrypt.ads | 8 ++++++-- index/alire-index-openglada.ads | 2 +- index/alire-index-sdlada.ads | 2 +- src/alire-index.adb | 6 +++--- src/alire-index.ads | 4 ++-- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/index/alire-index-alire.ads b/index/alire-index-alire.ads index dbf2a774..ebbf870b 100644 --- a/index/alire-index-alire.ads +++ b/index/alire-index-alire.ads @@ -41,7 +41,7 @@ package Alire.Index.Alire is (Preferred => Within_Major ("alire_alt", V ("1.0")), Otherwise => Within_Major ("alire", V ("0.5")))), - Alr_Properties => -- These are only interesting to alr, not users + Private_Properties => -- These are only interesting to alr, not users GPR_External ("Profile", "False"), -- Sample extra params for build diff --git a/index/alire-index-dak.ads b/index/alire-index-dak.ads index 2454e8a1..8d94c490 100644 --- a/index/alire-index-dak.ads +++ b/index/alire-index-dak.ads @@ -23,7 +23,7 @@ package Alire.Index.DAK is Register (Base & "strings_edit", V ("4.27"), Desc_Pre & "(strings)" & Desc_Post, - Git (Repo, "44ac8e0c817558b8641f746ce225b3d2fa90b7a1"), + Git (Repo, "8ac67a28d666dde3a0f96b5a08a7016e4f29d491"), Properties => GPR_File ("strings_edit.gpr") and @@ -249,7 +249,7 @@ package Alire.Index.DAK is Author (DAK_Author) and Website (DAK_Website), - Alr_Properties => + Private_Properties => On_Condition (System_Is (GNU_Linux), GPR_External ("odbc", "unixODBC")) and diff --git a/index/alire-index-libadacrypt.ads b/index/alire-index-libadacrypt.ads index a87ecfcc..9e28e368 100644 --- a/index/alire-index-libadacrypt.ads +++ b/index/alire-index-libadacrypt.ads @@ -34,13 +34,17 @@ package Alire.Index.Libadacrypt is License (GMGPL_2_0) and License (GMGPL_3_0), - Alr_Properties => + Private_Properties => On_Condition (System_Is (GNU_Linux), GPR_External ("system", "unix")) and On_Condition (System_Is (Windows), - GPR_External ("system", "windows")) + GPR_External ("system", "windows")), + + Available_When => + not Compiler_Is (GNAT_FSF_7_2) + -- It fails self-tests; might be a spureous warning ); end Alire.Index.Libadacrypt; diff --git a/index/alire-index-openglada.ads b/index/alire-index-openglada.ads index 1d8cb2bd..d67d6bf0 100644 --- a/index/alire-index-openglada.ads +++ b/index/alire-index-openglada.ads @@ -42,7 +42,7 @@ package Alire.Index.OpenGLAda is Website (Prj_Website) and License (MIT), - Alr_Properties => + Private_Properties => On_Condition (System_Is (GNU_Linux), GPR_External ("Windowing_System", "x11")), diff --git a/index/alire-index-sdlada.ads b/index/alire-index-sdlada.ads index 32811576..a817843e 100644 --- a/index/alire-index-sdlada.ads +++ b/index/alire-index-sdlada.ads @@ -28,7 +28,7 @@ package Alire.Index.SDLAda is Author (Prj_Author) and License (Zlib), - Alr_Properties => + Private_Properties => GPR_Path ("build/gnat") and GPR_File ("build/gnat/sdlada.gpr") and diff --git a/src/alire-index.adb b/src/alire-index.adb index 3d74fbe3..43831168 100644 --- a/src/alire-index.adb +++ b/src/alire-index.adb @@ -52,7 +52,7 @@ package body Alire.Index is -- Optional Dependencies : Release_Dependencies := No_Dependencies; Properties : Release_Properties := No_Properties; - Alr_Properties : Build_Properties := No_Properties; + Private_Properties : Build_Properties := No_Properties; Available_When : Alire.Requisites.Tree := No_Requisites) return Release is @@ -69,7 +69,7 @@ package body Alire.Index is -- end if; -- end loop; -- --- for P of Alr_Properties.All_Values loop +-- for P of Private_Properties.All_Values loop -- if P not in Alire.Properties.Labeled.Label and then -- Alire.Properties.Labeled.Label (P).Name /= GPR_Config -- then @@ -83,7 +83,7 @@ package body Alire.Index is Version, Origin, Dependencies, - Properties => Alr_Properties and Properties, + Properties => Private_Properties and Properties, Available => Available_When) do if Catalog.Contains (Rel) then diff --git a/src/alire-index.ads b/src/alire-index.ads index 7b8baba4..ac23afe6 100644 --- a/src/alire-index.ads +++ b/src/alire-index.ads @@ -59,11 +59,11 @@ package Alire.Index is -- Optional Dependencies : Release_Dependencies := No_Dependencies; Properties : Release_Properties := No_Properties; - Alr_Properties : Build_Properties := No_Properties; + Private_Properties : Build_Properties := No_Properties; Available_When : Alire.Requisites.Tree := No_Requisites) return Release; -- Properties are generally interesting to the user - -- Alr_Properties are only interesting to alr + -- Private_Properties are only interesting to alr subtype Platform_Independent_Path is String with Dynamic_Predicate => (for all C of Platform_Independent_Path => C /= '\');