From f37afb13ea118a25619d2e87de9a7683578c6e8b Mon Sep 17 00:00:00 2001 From: yoogx Date: Wed, 15 Oct 2014 10:31:09 +0200 Subject: [PATCH] * Finally include machinery to compile Python code --- projects/Makefile.am | 8 +++++--- src/python/ocarina-python.adb | 4 +++- src/python/ocarina-python_cmd.adb | 3 +++ src/python/ocarina-python_cmd.ads | 3 +++ src/python/ocarina-utils.adb | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/projects/Makefile.am b/projects/Makefile.am index aa2fbe09..441daaa0 100644 --- a/projects/Makefile.am +++ b/projects/Makefile.am @@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.common BUILD_PROJECTS= ocarina-core.gpr ocarina-frontends.gpr \ ocarina-backends.gpr ocarina-config.gpr ocarina-transfo.gpr \ - ocarina-main.gpr + ocarina-main.gpr $(PYTHON_PRJ) # All project files have to be packaged with "make dist" @@ -26,7 +26,8 @@ OBJECT_DIRS = $(top_builddir)/src/core/objects \ $(top_builddir)/src/frontends/objects \ $(top_builddir)/src/backends/objects \ $(top_builddir)/src/transfo/objects \ - $(top_builddir)/src/main/objects + $(top_builddir)/src/main/objects \ + $(top_builddir)/src/python/objects # Library directories (*.ali, *.a) @@ -34,7 +35,8 @@ LIB_DIRS = $(top_builddir)/src/core/libs \ $(top_builddir)/src/frontends/libs \ $(top_builddir)/src/backends/libs \ $(top_builddir)/src/transfo/libs \ - $(top_builddir)/src/config/libs $(top_builddir)/src/main/libs + $(top_builddir)/src/config/libs $(top_builddir)/src/main/libs \ + $(top_builddir)/src/python/libs # All directories used for the build process. If the configure is # performed from a directory different from the top source directory, diff --git a/src/python/ocarina-python.adb b/src/python/ocarina-python.adb index ed692368..f2654d89 100644 --- a/src/python/ocarina-python.adb +++ b/src/python/ocarina-python.adb @@ -31,12 +31,14 @@ -- -- ------------------------------------------------------------------------------ +pragma Warnings (Off); +-- Silence all warnings + with Ada.Directories; use Ada.Directories; with Ada.Environment_Variables; use Ada.Environment_Variables; with Ada.Text_IO; use Ada.Text_IO; with GNATCOLL.Scripts; use GNATCOLL.Scripts; - with Ocarina.Python_Cmd; package body Ocarina.Python is diff --git a/src/python/ocarina-python_cmd.adb b/src/python/ocarina-python_cmd.adb index f416766b..bde2135d 100644 --- a/src/python/ocarina-python_cmd.adb +++ b/src/python/ocarina-python_cmd.adb @@ -31,6 +31,9 @@ -- -- ------------------------------------------------------------------------------ +pragma Warnings (Off); +-- Silence all warnings + with GNATCOLL.Scripts; use GNATCOLL.Scripts; with GNATCOLL.Scripts.Python; use GNATCOLL.Scripts.Python; diff --git a/src/python/ocarina-python_cmd.ads b/src/python/ocarina-python_cmd.ads index 16ef5cf7..0afff67a 100644 --- a/src/python/ocarina-python_cmd.ads +++ b/src/python/ocarina-python_cmd.ads @@ -31,6 +31,9 @@ -- -- ------------------------------------------------------------------------------ +pragma Warnings (Off); +-- Silence all warnings + with GNATCOLL.Scripts; package Ocarina.Python_Cmd is diff --git a/src/python/ocarina-utils.adb b/src/python/ocarina-utils.adb index a0252c81..7fbc2236 100644 --- a/src/python/ocarina-utils.adb +++ b/src/python/ocarina-utils.adb @@ -93,7 +93,7 @@ package body Ocarina.Utils is begin Write_Line ("Ocarina " & Ocarina_Version - & " (" & Ocarina_SVN_Revision & ")"); + & " (" & Ocarina_Revision & ")"); if Ocarina_Last_Configure_Date /= "" then Write_Line ("Build date: " & Ocarina_Last_Configure_Date); -- GitLab