Better expression requisites
This commit is contained in:
Alejandro R Mosteo
@@ -19,7 +19,7 @@ package Alire.Index.Adacurses is
|
||||
|
||||
Dependencies =>
|
||||
On_Condition
|
||||
(Distribution_Is (Debian) or Distribution_Is (Ubuntu),
|
||||
(Distribution = Debian or Distribution = Ubuntu,
|
||||
When_True => When_Available (Within_Major (NcursesAda.V_5)),
|
||||
When_False => Unavailable),
|
||||
|
||||
@@ -35,7 +35,7 @@ package Alire.Index.Adacurses is
|
||||
|
||||
Dependencies =>
|
||||
On_Condition
|
||||
(Distribution_Is (Debian) or Distribution_Is (Ubuntu),
|
||||
(Distribution = Debian or Distribution = Ubuntu,
|
||||
When_True => When_Available (Within_Major (NcursesAda.V_3)),
|
||||
When_False => Unavailable),
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ package Alire.Index.Alire is
|
||||
Dependencies =>
|
||||
Current ("half_life_3") and -- unconditional
|
||||
On_Condition -- conditional
|
||||
(System_Is (GNU_Linux),
|
||||
(Operating_System = GNU_Linux,
|
||||
When_True => At_Least ("elite_horizons", V ("2.0")) and
|
||||
At_Least ("star_citizen", V ("3.0")), -- Wish...
|
||||
When_False => At_Least ("windows_100", V ("1.0"))) and
|
||||
@@ -55,26 +55,26 @@ package Alire.Index.Alire is
|
||||
-- Path separators are always "/" and internally converted to native ones
|
||||
|
||||
On_Condition
|
||||
(System_Is (Windows),
|
||||
(Operating_System = Windows,
|
||||
GPR_File ("project_win.gpr")) and
|
||||
On_Condition
|
||||
(System_Is (GNU_Linux),
|
||||
On_Condition (Distribution_Is (Ubuntu), -- Nested conditions
|
||||
(Operating_System = GNU_Linux,
|
||||
On_Condition (Distribution = Ubuntu, -- Nested conditions
|
||||
GPR_File ("project_ubuntu.gpr"))) and
|
||||
-- Conditional project file
|
||||
|
||||
On_Condition
|
||||
(System_Is (GNU_Linux),
|
||||
(Operating_System = GNU_Linux,
|
||||
Comment ("Long life the penguin")) and
|
||||
-- Conditions on operating system
|
||||
|
||||
On_Condition
|
||||
(not Compiler_Is (GNAT_Unknown),
|
||||
(Compiler = GNAT_Unknown, -- /= also works
|
||||
Comment ("Never saw that compiler") and Comment ("But I would like to")) and
|
||||
-- Conditions on compiler version
|
||||
|
||||
On_Condition
|
||||
(Version_Is (Ubuntu_Artful),
|
||||
(Distro_Release = Ubuntu_Artful,
|
||||
When_True => Comment ("Living on the edge"),
|
||||
When_False => Comment ("I am a rock")) and
|
||||
-- Conditions on distribution release
|
||||
@@ -84,8 +84,7 @@ package Alire.Index.Alire is
|
||||
-- Unconditional properties
|
||||
|
||||
Available_When => -- Impossible mix
|
||||
OS = GNU_Linux or OS /= GNU_Linux or
|
||||
(System_Is (Windows) and System_Is (GNU_Linux)) or
|
||||
(Compiler_Is (GNAT_Unknown) and not Compiler_Is (GNAT_Unknown)));
|
||||
(Operating_System = Windows and Operating_System /= GNU_Linux) or
|
||||
(Compiler = GNAT_Unknown and Compiler /= GNAT_Unknown));
|
||||
|
||||
end Alire.Index.Alire;
|
||||
|
||||
@@ -279,16 +279,16 @@ package Alire.Index.DAK is
|
||||
GPR_File ("test_components/components-odbc-odbc_bindings_tests.gpr") and
|
||||
|
||||
On_Condition
|
||||
(System_Is (GNU_Linux),
|
||||
(Operating_System = GNU_Linux,
|
||||
GPR_External ("odbc", "unixODBC")) and
|
||||
On_Condition
|
||||
(System_Is (Windows),
|
||||
(Operating_System = Windows,
|
||||
GPR_External ("odbc", "ODBC32")) and
|
||||
On_Condition
|
||||
(Word_Size_Is (Bits_32),
|
||||
(Word_Size = Bits_32,
|
||||
GPR_External ("arch", "i686")) and
|
||||
On_Condition
|
||||
(Word_Size_Is (Bits_64),
|
||||
(Word_Size = Bits_64,
|
||||
GPR_External ("arch", "x86_64"))
|
||||
);
|
||||
|
||||
|
||||
@@ -36,14 +36,14 @@ package Alire.Index.Libadacrypt is
|
||||
GPR_File ("acltest.gpr") and
|
||||
|
||||
On_Condition
|
||||
(System_Is (GNU_Linux),
|
||||
(Operating_System = GNU_Linux,
|
||||
GPR_External ("system", "unix")) and
|
||||
On_Condition
|
||||
(System_Is (Windows),
|
||||
(Operating_System = Windows,
|
||||
GPR_External ("system", "windows")),
|
||||
|
||||
Available_When =>
|
||||
not Compiler_Is (GNAT_FSF_7_2)
|
||||
Compiler > GNAT_FSF_7_2
|
||||
-- It fails self-tests; might be a spureous warning
|
||||
);
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ package Alire.Index.OpenGLAda is
|
||||
|
||||
Dependencies =>
|
||||
On_Condition
|
||||
(System_Is (GNU_Linux),
|
||||
(Operating_System = GNU_Linux,
|
||||
Within_Major (Libglfw3.V_3) and Within_Major (LibX11.V_2)),
|
||||
|
||||
Properties =>
|
||||
@@ -49,10 +49,10 @@ package Alire.Index.OpenGLAda is
|
||||
GPR_File ("opengl-test.gpr") and
|
||||
|
||||
On_Condition
|
||||
(System_Is (GNU_Linux), GPR_External ("Windowing_System", "x11")),
|
||||
(Operating_System = GNU_Linux, GPR_External ("Windowing_System", "x11")),
|
||||
|
||||
Available_When =>
|
||||
System_Is (GNU_Linux)
|
||||
Operating_System = GNU_Linux
|
||||
);
|
||||
|
||||
end Alire.Index.OpenGLAda;
|
||||
|
||||
@@ -54,11 +54,11 @@ package Alire.Index.SDLAda is
|
||||
GPR_External ("SDL_MODE", "release") and
|
||||
|
||||
On_Condition
|
||||
(System_Is (GNU_Linux),
|
||||
(Operating_System = GNU_Linux,
|
||||
GPR_External ("SDL_PLATFORM", "linux")),
|
||||
|
||||
Available_When =>
|
||||
System_Is (GNU_Linux)
|
||||
Operating_System = GNU_Linux
|
||||
);
|
||||
|
||||
end Alire.Index.SDLAda;
|
||||
|
||||
@@ -32,7 +32,7 @@ package Alire.Index.Whitakers_Words is
|
||||
GPR_File ("words.gpr"),
|
||||
|
||||
Available_When =>
|
||||
not Compiler_Is (GNAT_FSF_7_2) -- bug with SAL library not binding
|
||||
Compiler > GNAT_FSF_7_2 -- bug with SAL library failing binding
|
||||
);
|
||||
|
||||
end Alire.Index.Whitakers_Words;
|
||||
|
||||
Reference in New Issue
Block a user