Commit 9405df9b authored by yoogx's avatar yoogx
Browse files

* Renamed Namet to Ocarina.Namet, Output to Ocarina.Output to

          avoid collision with external packages
parent f4b3e4ea
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2013 ESA & ISAE. -- -- Copyright (C) 2013-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
with Errors; use Errors; with Errors; use Errors;
with Namet; use Namet; with Ocarina.Namet; use Ocarina.Namet;
with Output; use Output; with Ocarina.Output; use Ocarina.Output;
with Types; use Types; with Types; use Types;
with Ada.Unchecked_Deallocation; with Ada.Unchecked_Deallocation;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2004-2009 Telecom ParisTech, 2010-2013 ESA & ISAE. -- -- Copyright (C) 2004-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
with Errors; use Errors; with Errors; use Errors;
with Locations; use Locations; with Locations; use Locations;
with Namet; use Namet; with Ocarina.Namet; use Ocarina.Namet;
with Output; use Output; with Ocarina.Output; use Ocarina.Output;
with Types; use Types; with Types; use Types;
with Utils; use Utils; with Utils; use Utils;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2013 ESA & ISAE. -- -- Copyright (C) 2013-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -37,8 +37,8 @@ with GNAT.OS_Lib; use GNAT.OS_Lib; ...@@ -37,8 +37,8 @@ with GNAT.OS_Lib; use GNAT.OS_Lib;
with Errors; use Errors; with Errors; use Errors;
with Locations; use Locations; with Locations; use Locations;
with Namet; use Namet; with Ocarina.Namet; use Ocarina.Namet;
with Output; use Output; with Ocarina.Output; use Ocarina.Output;
with Types; use Types; with Types; use Types;
with Utils; use Utils; with Utils; use Utils;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -35,7 +35,7 @@ with Ocarina.ME_AADL; ...@@ -35,7 +35,7 @@ with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Tree.Nodes; with Ocarina.ME_AADL.AADL_Tree.Nodes;
with Ocarina.ME_AADL.AADL_Tree.Nutils; with Ocarina.ME_AADL.AADL_Tree.Nutils;
with Errors; with Errors;
with Namet; with Ocarina.Namet;
with GNAT.Dynamic_Tables; with GNAT.Dynamic_Tables;
with Ada.Text_IO; with Ada.Text_IO;
with Ocarina.Transfo.Fusions; with Ocarina.Transfo.Fusions;
...@@ -45,7 +45,7 @@ package body Ocarina.Transfo.Fusions.Scheduler is ...@@ -45,7 +45,7 @@ package body Ocarina.Transfo.Fusions.Scheduler is
use Ocarina.ME_AADL.AADL_Tree.Nodes; use Ocarina.ME_AADL.AADL_Tree.Nodes;
use Ocarina.ME_AADL.AADL_Tree.Nutils; use Ocarina.ME_AADL.AADL_Tree.Nutils;
use Errors; use Errors;
use Namet; use Ocarina.Namet;
package ATN renames Ocarina.ME_AADL.AADL_Tree.Nodes; package ATN renames Ocarina.ME_AADL.AADL_Tree.Nodes;
package OTF renames Ocarina.Transfo.Fusions; package OTF renames Ocarina.Transfo.Fusions;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -42,7 +42,7 @@ with Ocarina.ME_AADl.AADL_Instances.Nodes; ...@@ -42,7 +42,7 @@ with Ocarina.ME_AADl.AADL_Instances.Nodes;
with Ocarina.ME_AADl.AADL_Instances.Nutils; with Ocarina.ME_AADl.AADL_Instances.Nutils;
with Ocarina.Transfo.Fusions.Scheduler; with Ocarina.Transfo.Fusions.Scheduler;
with Errors; with Errors;
with Namet; with Ocarina.Namet;
with GNAT.OS_Lib; use GNAT.OS_Lib; with GNAT.OS_Lib; use GNAT.OS_Lib;
with GNAT.Dynamic_Tables; with GNAT.Dynamic_Tables;
with Ocarina.Builder.AADL.Components; with Ocarina.Builder.AADL.Components;
...@@ -75,7 +75,7 @@ package body Ocarina.Transfo.Fusions is ...@@ -75,7 +75,7 @@ package body Ocarina.Transfo.Fusions is
use Ocarina.Backends.Messages; use Ocarina.Backends.Messages;
use Errors; use Errors;
use Namet; use Ocarina.Namet;
use Locations; use Locations;
package AIN renames Ocarina.ME_AADL.AADL_Instances.Nodes; package AIN renames Ocarina.ME_AADL.AADL_Instances.Nodes;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -43,7 +43,7 @@ with Ocarina.Builder.AADL.Components.Subcomponents; ...@@ -43,7 +43,7 @@ with Ocarina.Builder.AADL.Components.Subcomponents;
with Ocarina.Builder.AADL.Components.Connections; with Ocarina.Builder.AADL.Components.Connections;
with Ocarina.Builder.AADL.Components.Features; with Ocarina.Builder.AADL.Components.Features;
with Ocarina.Transfo; with Ocarina.Transfo;
with Namet; with Ocarina.Namet;
with Locations; with Locations;
package body Ocarina.Transfo.Move is package body Ocarina.Transfo.Move is
...@@ -52,7 +52,7 @@ package body Ocarina.Transfo.Move is ...@@ -52,7 +52,7 @@ package body Ocarina.Transfo.Move is
use Ocarina.ME_AADL.AADL_Tree.Nodes; use Ocarina.ME_AADL.AADL_Tree.Nodes;
use Ocarina.ME_AADL.AADL_Tree.Debug; use Ocarina.ME_AADL.AADL_Tree.Debug;
use Ocarina.ME_AADL.AADL_Tree.Nutils; use Ocarina.ME_AADL.AADL_Tree.Nutils;
use Namet; use Ocarina.Namet;
use Locations; use Locations;
package AIN renames Ocarina.ME_AADL.AADL_Instances.Nodes; package AIN renames Ocarina.ME_AADL.AADL_Instances.Nodes;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -35,13 +35,13 @@ with Ocarina.ME_REAL.REAL_Tree.Nutils; ...@@ -35,13 +35,13 @@ with Ocarina.ME_REAL.REAL_Tree.Nutils;
with Ocarina.REAL_Values; with Ocarina.REAL_Values;
with Ocarina.Backends.REAL; with Ocarina.Backends.REAL;
with Ocarina.Analyzer.REAL; with Ocarina.Analyzer.REAL;
with Output; with Ocarina.Output;
with Namet; with Ocarina.Namet;
package body Ocarina.Transfo.Optim.Eval is package body Ocarina.Transfo.Optim.Eval is
use Ocarina.REAL_Values; use Ocarina.REAL_Values;
use Namet; use Ocarina.Namet;
use Output; use Ocarina.Output;
package BR renames Ocarina.Backends.REAL; package BR renames Ocarina.Backends.REAL;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -50,7 +50,7 @@ with Ocarina.Backends; ...@@ -50,7 +50,7 @@ with Ocarina.Backends;
with Ocarina.ME_AADL.AADL_Instances.Debug; with Ocarina.ME_AADL.AADL_Instances.Debug;
use Ocarina.ME_AADL.AADL_Instances.Debug; use Ocarina.ME_AADL.AADL_Instances.Debug;
with Namet; use Namet; with Ocarina.Namet; use Ocarina.Namet;
package body Ocarina.Transfo.Optim is package body Ocarina.Transfo.Optim is
use Ocarina.ME_AADL.AADL_Instances.Nodes; use Ocarina.ME_AADL.AADL_Instances.Nodes;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -38,7 +38,7 @@ with Ocarina.ME_AADL.AADL_Tree.Debug; ...@@ -38,7 +38,7 @@ with Ocarina.ME_AADL.AADL_Tree.Debug;
with Ocarina.ME_AADl.AADL_Instances.Nodes; with Ocarina.ME_AADl.AADL_Instances.Nodes;
with Ocarina.ME_AADL.AADL_Instances.Entities; with Ocarina.ME_AADL.AADL_Instances.Entities;
with Utils; with Utils;
with Namet; with Ocarina.Namet;
package body Ocarina.Transfo is package body Ocarina.Transfo is
use Ocarina.ME_AADL; use Ocarina.ME_AADL;
...@@ -46,7 +46,7 @@ package body Ocarina.Transfo is ...@@ -46,7 +46,7 @@ package body Ocarina.Transfo is
use Ocarina.ME_AADL.AADL_Tree.Nutils; use Ocarina.ME_AADL.AADL_Tree.Nutils;
use Ocarina.ME_AADL.AADL_Tree.Debug; use Ocarina.ME_AADL.AADL_Tree.Debug;
use Utils; use Utils;
use Namet; use Ocarina.Namet;
package AIN renames Ocarina.ME_AADL.AADL_Instances.Nodes; package AIN renames Ocarina.ME_AADL.AADL_Instances.Nodes;
package ATN renames Ocarina.ME_AADL.AADL_Tree.Nodes; package ATN renames Ocarina.ME_AADL.AADL_Tree.Nodes;
......
...@@ -14,9 +14,14 @@ def main (): ...@@ -14,9 +14,14 @@ def main ():
instantiate("rma.erc32"); # instantiate instantiate("rma.erc32"); # instantiate
generate (Backends.polyorb_hi_ada); generate (Backends.polyorb_hi_ada);
reset();
load("rma.aadl"); # load a file
load("deployment.aadl"); # load a file
analyze(); # analyze models
instantiate("rma.erc32"); # instantiate
generate (Backends.polyorb_hi_ada);
if __name__ == "__main__": if __name__ == "__main__":
main () main ()
sys.exit (0); # exit sys.exit (0); # exit
################################################################################
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2005-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2005-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
with Charset; with Charset;
with Errors; with Errors;
with Namet; with Ocarina.Namet;
with Output; with Ocarina.Output; use Ocarina.Output;
with Types; with Types;
use type Types.Text_Buffer_Ptr, Types.Text_Ptr; use type Types.Text_Buffer_Ptr, Types.Text_Ptr;
use type Types.Int, Types.Byte; use type Types.Int, Types.Byte;
...@@ -56,7 +56,7 @@ package body Lexer is ...@@ -56,7 +56,7 @@ package body Lexer is
function Image (T : Token_Type) return String is function Image (T : Token_Type) return String is
begin begin
return Namet.Get_Name_String (Token_Image (T)); return Ocarina.Namet.Get_Name_String (Token_Image (T));
end Image; end Image;
--------------- ---------------
...@@ -117,16 +117,16 @@ package body Lexer is ...@@ -117,16 +117,16 @@ package body Lexer is
(Token : Token_Type; (Token : Token_Type;
Image : String) is Image : String) is
begin begin
Namet.Set_Str_To_Name_Buffer (Image); Ocarina.Namet.Set_Str_To_Name_Buffer (Image);
Token_Image (Token) := Namet.Name_Find; Token_Image (Token) := Ocarina.Namet.Name_Find;
if Token in Keyword_Type then if Token in Keyword_Type then
for I in Natural range 1 .. Namet.Name_Len loop for I in Natural range 1 .. Ocarina.Namet.Name_Len loop
Namet.Name_Buffer (I) Ocarina.Namet.Name_Buffer (I)
:= Charset.To_Lower (Namet.Name_Buffer (I)); := Charset.To_Lower (Ocarina.Namet.Name_Buffer (I));
end loop; end loop;
Namet.Set_Name_Table_Byte Ocarina.Namet.Set_Name_Table_Byte
(Namet.Name_Find, Types.Byte (Token_Type'Pos (Token))); (Ocarina.Namet.Name_Find, Types.Byte (Token_Type'Pos (Token)));
end if; end if;
end New_Token; end New_Token;
...@@ -210,13 +210,13 @@ package body Lexer is ...@@ -210,13 +210,13 @@ package body Lexer is
function Quoted_Image (T : Token_Type) return String is function Quoted_Image (T : Token_Type) return String is
begin begin
if T in T_Interface .. T_Octet then if T in T_Interface .. T_Octet then
Namet.Set_Char_To_Name_Buffer ('"'); Ocarina.Namet.Set_Char_To_Name_Buffer ('"');
Namet.Add_Str_To_Name_Buffer Ocarina.Namet.Add_Str_To_Name_Buffer
(Namet.Get_Name_String (Token_Image (T))); (Ocarina.Namet.Get_Name_String (Token_Image (T)));
Namet.Add_Char_To_Name_Buffer ('"'); Ocarina.Namet.Add_Char_To_Name_Buffer ('"');
return Namet.Get_Name_String (Namet.Name_Find); return Ocarina.Namet.Get_Name_String (Ocarina.Namet.Name_Find);
end if; end if;
return Namet.Get_Name_String (Token_Image (T)); return Ocarina.Namet.Get_Name_String (Token_Image (T));
end Quoted_Image; end Quoted_Image;
------------------- -------------------
...@@ -254,23 +254,23 @@ package body Lexer is ...@@ -254,23 +254,23 @@ package body Lexer is
-- Read identifier -- Read identifier
Namet.Name_Len := 0; Ocarina.Namet.Name_Len := 0;
while Charset.Is_Identifier_Character (Buffer (Token_Location.Scan)) loop while Charset.Is_Identifier_Character (Buffer (Token_Location.Scan)) loop
Namet.Name_Len := Namet.Name_Len + 1; Ocarina.Namet.Name_Len := Ocarina.Namet.Name_Len + 1;
Namet.Name_Buffer (Namet.Name_Len) := Buffer (Token_Location.Scan); Ocarina.Namet.Name_Buffer (Ocarina.Namet.Name_Len) := Buffer (Token_Location.Scan);
Token_Location.Scan := Token_Location.Scan + 1; Token_Location.Scan := Token_Location.Scan + 1;
end loop; end loop;
if Namet.Name_Len = 0 then if Ocarina.Namet.Name_Len = 0 then
if Fatal then if Fatal then
Errors.Error_Loc (1) := Token_Location; Errors.Error_Loc (1) := Token_Location;
Errors.DE ("identifier must start with alphabetic character"); Errors.DE ("identifier must start with alphabetic character");
end if; end if;
Namet.Name_Buffer (1) := ' '; Ocarina.Namet.Name_Buffer (1) := ' ';
Namet.Name_Len := 1; Ocarina.Namet.Name_Len := 1;
else else
Token_Name := Namet.Name_Find; Token_Name := Ocarina.Namet.Name_Find;
Token := T_Identifier; Token := T_Identifier;
-- Check whether it is a keyword or a pragma -- Check whether it is a keyword or a pragma
...@@ -285,7 +285,7 @@ package body Lexer is ...@@ -285,7 +285,7 @@ package body Lexer is
-- Check that identifier is well-formed -- Check that identifier is well-formed
if Token = T_Identifier then if Token = T_Identifier then
if not Charset.Is_Alphabetic_Character (Namet.Name_Buffer (1)) then if not Charset.Is_Alphabetic_Character (Ocarina.Namet.Name_Buffer (1)) then
if Escaped then if Escaped then
if Fatal then if Fatal then
Errors.Error_Loc (1) := Token_Location; Errors.Error_Loc (1) := Token_Location;
...@@ -349,19 +349,19 @@ package body Lexer is ...@@ -349,19 +349,19 @@ package body Lexer is
end loop; end loop;
if not Found then if not Found then
Namet.Set_Str_To_Name_Buffer ("expected token"); Ocarina.Namet.Set_Str_To_Name_Buffer ("expected token");
if L'Length > 1 then if L'Length > 1 then
Namet.Add_Char_To_Name_Buffer ('s'); Ocarina.Namet.Add_Char_To_Name_Buffer ('s');
end if; end if;
Namet.Add_Char_To_Name_Buffer (' '); Ocarina.Namet.Add_Char_To_Name_Buffer (' ');
Namet.Add_Str_To_Name_Buffer (Quoted_Image (L (L'First))); Ocarina.Namet.Add_Str_To_Name_Buffer (Quoted_Image (L (L'First)));
for Index in Natural range L'First + 1 .. L'Last loop for Index in Natural range L'First + 1 .. L'Last loop
Namet.Add_Str_To_Name_Buffer (" or "); Ocarina.Namet.Add_Str_To_Name_Buffer (" or ");
Namet.Add_Str_To_Name_Buffer (Quoted_Image (L (Index))); Ocarina.Namet.Add_Str_To_Name_Buffer (Quoted_Image (L (Index)));
end loop; end loop;
Errors.Error_Loc (1) := Token_Location; Errors.Error_Loc (1) := Token_Location;
Errors.DE (Namet.Get_Name_String (Namet.Name_Find)); Errors.DE (Ocarina.Namet.Get_Name_String (Ocarina.Namet.Name_Find));
Token := T_Error; Token := T_Error;
end if; end if;
...@@ -578,11 +578,12 @@ package body Lexer is ...@@ -578,11 +578,12 @@ package body Lexer is
function To_Token (Name : Types.Name_Id) return Token_Type is function To_Token (Name : Types.Name_Id) return Token_Type is
B : Types.Byte; B : Types.Byte;
begin begin
Namet.Get_Name_String (Name); Ocarina.Namet.Get_Name_String (Name);
for I in Natural range 1 .. Namet.Name_Len loop for I in Natural range 1 .. Ocarina.Namet.Name_Len loop
Namet.Name_Buffer (I) := Charset.To_Lower (Namet.Name_Buffer (I)); Ocarina.Namet.Name_Buffer (I)
:= Charset.To_Lower (Ocarina.Namet.Name_Buffer (I));
end loop; end loop;
B := Namet.Get_Name_Table_Byte (Namet.Name_Find); B := Ocarina.Namet.Get_Name_Table_Byte (Ocarina.Namet.Name_Find);
if B <= Last_Token_Pos then if B <= Last_Token_Pos then
return Token_Type'Val (B); return Token_Type'Val (B);
end if; end if;
...@@ -595,7 +596,7 @@ package body Lexer is ...@@ -595,7 +596,7 @@ package body Lexer is
procedure Write (T : Token_Type) is procedure Write (T : Token_Type) is
begin begin
Output.Write_Str (Image (T)); Write_Str (Image (T));
end Write; end Write;
end Lexer; end Lexer;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- P r o j e c t -- -- P r o j e c t --
-- -- -- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -32,9 +32,10 @@ ...@@ -32,9 +32,10 @@
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
with "ocarina"; with "ocarina";
with "ocarina-main";
project Mknodes is project Mknodes is
for Source_Dirs use (".", "../../src/core/common_files");
for Object_Dir use Ocarina.Top_Build_Dir & "/../tools/mknodes/objects"; for Object_Dir use Ocarina.Top_Build_Dir & "/../tools/mknodes/objects";
for Exec_Dir use Ocarina.Top_Build_Dir & "/../tools/mknodes"; for Exec_Dir use Ocarina.Top_Build_Dir & "/../tools/mknodes";
for Main use ("mknodes"); for Main use ("mknodes");
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2005-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2005-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --