From 0f9b9473a11322541a4d1efe2c371b6ab83c0a39 Mon Sep 17 00:00:00 2001 From: Alejandro R Mosteo Date: Fri, 9 Mar 2018 14:07:51 +0100 Subject: [PATCH] + globe_3d --- deps/semver | 2 +- index/alire-index-globe_3d.ads | 50 +++++++++++++++++++++++++++++++ index/alire-projects.ads | 3 ++ index/native/alire-index-glut.ads | 13 ++++++++ src/alire-root_release.adb | 8 ++--- 5 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 index/alire-index-globe_3d.ads create mode 100644 index/native/alire-index-glut.ads diff --git a/deps/semver b/deps/semver index 81a1fddd..cae9a676 160000 --- a/deps/semver +++ b/deps/semver @@ -1 +1 @@ -Subproject commit 81a1fddd0164cb5a82e0f2f97afe4511b2d8efbf +Subproject commit cae9a67626c6546e358eb46e97b04b905d63923b diff --git a/index/alire-index-globe_3d.ads b/index/alire-index-globe_3d.ads new file mode 100644 index 00000000..709a838b --- /dev/null +++ b/index/alire-index-globe_3d.ads @@ -0,0 +1,50 @@ +with Alire.Index.GLUT; + +package Alire.Index.Globe_3D is + + Prj_Name : constant Project_Name := "globe_3d"; + Prj_Desc : constant Project_Description := "GL Object Based Engine for 3D in Ada"; + Prj_Repo : constant URL := "https://github.com/svn2github/GLOBE_3D.git"; + + Prj_Author : constant String := "Gautier de Montmollin"; + Prj_Website : constant URL := "https://globe3d.sourceforge.io/"; + + V_20180111 : constant Release := + Register (Prj_Name, + V ("20180111"), + Prj_Desc, + Git (Prj_Repo, "93f7185130e2fb0db7f1f7e67eaf1b6ca561d651"), + + Dependencies => + Within_Major (GLUT.V_2_8_1), + + Properties => + Project_File ("globe_3d.gpr") and + GPR_Scenario ("OS_Kind", "linux" or "macosx" or "win32") and + + Executable ("globe_3d_demo") and + Executable ("launch_armada") and + Executable ("launch_multi_window") and + Executable ("launch_sprite_demo") and + Executable ("mini") and + + Author (Prj_Author) and + Website (Prj_Website) and + License (Unknown), + + Private_Properties => + GPR_File ("globe_3d.gpr") and + GPR_File ("demo/globe_3d_demos.gpr") and + GPR_File ("demo/multi_window/multi_window.gpr") and + GPR_File ("demo/sprite/sprite_demo.gpr") and + + On_Condition + (Operating_System = GNU_Linux, + GPR_External ("OS_Kind", "linux")), + + Available_When => + Operating_System = GNU_Linux + -- It's available in more platforms, but still untested and with unknown dependencies + ); + +end Alire.Index.Globe_3D; diff --git a/index/alire-projects.ads b/index/alire-projects.ads index 55e836a1..4c167751 100644 --- a/index/alire-projects.ads +++ b/index/alire-projects.ads @@ -19,6 +19,7 @@ package Alire.Projects is Eagle_Lander, + Globe_3D, GtkAda, Hello, @@ -84,6 +85,8 @@ package Alire.Projects is when Eagle_Lander => "Apollo 11 lunar lander simulator (Ada/Gtk/Cairo)", + when Globe_3D => + "GL Object Based Engine for 3D in Ada", when GtkAda => "Ada binding for the GTK+ GUI", diff --git a/index/native/alire-index-glut.ads b/index/native/alire-index-glut.ads new file mode 100644 index 00000000..a6b6dc33 --- /dev/null +++ b/index/native/alire-index-glut.ads @@ -0,0 +1,13 @@ +package Alire.Index.GLUT is + + Name : constant String := "glut"; + Desc : constant String := "OpenGL Utility Toolkit"; + + V_2_8_1 : constant Release := + Register (Name, + V ("2.8.1-3"), + Desc, + Native ((Debian | Ubuntu => Packaged_As ("freeglut3-dev"), + others => Unavailable))); + +end Alire.Index.GLUT; diff --git a/src/alire-root_release.adb b/src/alire-root_release.adb index 735b8b54..7199c5a4 100644 --- a/src/alire-root_release.adb +++ b/src/alire-root_release.adb @@ -11,7 +11,7 @@ package body Alire.Root_Release is Root : Alire.Containers.Release_H; -- Root dependency (the working project). If Is_Empty we know we must recompile, -- unless the hash already matches. In this case, we know the project file is - -- missing the Set_Root_Project call + -- missing the Set call ------------- -- Current -- @@ -26,9 +26,9 @@ package body Alire.Root_Release is function Is_Set return Boolean is (not Root.Is_Empty); - ---------------------- - -- Set_Root_Project -- - ---------------------- + --------- + -- Set -- + --------- function Set (Project : Alire.Project_Name; Version : Semantic_Versioning.Version;