Commit 9d13a2d2 authored by jdelange's avatar jdelange

* backends/ocarina-backends-po_hi_c.adb

   backends/ocarina-backends-build_utils.adb
   backends/ocarina-backends-build_utils.ads
   backends/ocarina-backends-po_qos_ada.adb
   backends/ocarina-backends-po_hi_ada.adb
   - Include referenced ASN1 files in Makefile
     for PolyORB-HI-C
   - Adapt sources infrastructure to fit
     with this new build requirement.



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@2967 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent 4ac54391
...@@ -73,6 +73,7 @@ package Ocarina.Backends.Build_Utils is ...@@ -73,6 +73,7 @@ package Ocarina.Backends.Build_Utils is
Execution_Platform : Supported_Execution_Platform := Platform_None; Execution_Platform : Supported_Execution_Platform := Platform_None;
Transport_API : Supported_Transport_APIs; Transport_API : Supported_Transport_APIs;
Ada_Sources : Name_Tables.Instance; Ada_Sources : Name_Tables.Instance;
Asn_Sources : Name_Tables.Instance;
C_Sources : Name_Tables.Instance; C_Sources : Name_Tables.Instance;
C_Libraries : Name_Tables.Instance; C_Libraries : Name_Tables.Instance;
User_Source_Dirs : Name_Tables.Instance; User_Source_Dirs : Name_Tables.Instance;
......
...@@ -91,6 +91,7 @@ package body Ocarina.Backends.PO_HI_Ada is ...@@ -91,6 +91,7 @@ package body Ocarina.Backends.PO_HI_Ada is
Execution_Platform : Supported_Execution_Platform := Platform_None; Execution_Platform : Supported_Execution_Platform := Platform_None;
Transport_API : Supported_Transport_APIs; Transport_API : Supported_Transport_APIs;
Ada_Sources : Name_Tables.Instance; Ada_Sources : Name_Tables.Instance;
Asn_Sources : Name_Tables.Instance;
C_Sources : Name_Tables.Instance; C_Sources : Name_Tables.Instance;
C_Libraries : Name_Tables.Instance; C_Libraries : Name_Tables.Instance;
User_Source_Dirs : Name_Tables.Instance; User_Source_Dirs : Name_Tables.Instance;
...@@ -126,6 +127,7 @@ package body Ocarina.Backends.PO_HI_Ada is ...@@ -126,6 +127,7 @@ package body Ocarina.Backends.PO_HI_Ada is
Execution_Platform : Supported_Execution_Platform := Platform_None; Execution_Platform : Supported_Execution_Platform := Platform_None;
Transport_API : Supported_Transport_APIs; Transport_API : Supported_Transport_APIs;
Ada_Sources : Name_Tables.Instance; Ada_Sources : Name_Tables.Instance;
Asn_Sources : Name_Tables.Instance;
C_Sources : Name_Tables.Instance; C_Sources : Name_Tables.Instance;
C_Libraries : Name_Tables.Instance; C_Libraries : Name_Tables.Instance;
User_Source_Dirs : Name_Tables.Instance; User_Source_Dirs : Name_Tables.Instance;
...@@ -139,6 +141,7 @@ package body Ocarina.Backends.PO_HI_Ada is ...@@ -139,6 +141,7 @@ package body Ocarina.Backends.PO_HI_Ada is
pragma Unreferenced (Appli_Name, pragma Unreferenced (Appli_Name,
Transport_API, Transport_API,
Ada_Sources, Ada_Sources,
Asn_Sources,
C_Libraries, C_Libraries,
User_Source_Dirs, User_Source_Dirs,
Use_Transport, Use_Transport,
......
...@@ -115,6 +115,7 @@ package body Ocarina.Backends.PO_HI_C is ...@@ -115,6 +115,7 @@ package body Ocarina.Backends.PO_HI_C is
Execution_Platform : Supported_Execution_Platform := Platform_None; Execution_Platform : Supported_Execution_Platform := Platform_None;
Transport_API : Supported_Transport_APIs; Transport_API : Supported_Transport_APIs;
Ada_Sources : Name_Tables.Instance; Ada_Sources : Name_Tables.Instance;
Asn_Sources : Name_Tables.Instance;
C_Sources : Name_Tables.Instance; C_Sources : Name_Tables.Instance;
C_Libraries : Name_Tables.Instance; C_Libraries : Name_Tables.Instance;
User_Source_Dirs : Name_Tables.Instance; User_Source_Dirs : Name_Tables.Instance;
...@@ -135,6 +136,7 @@ package body Ocarina.Backends.PO_HI_C is ...@@ -135,6 +136,7 @@ package body Ocarina.Backends.PO_HI_C is
Execution_Platform : Supported_Execution_Platform := Platform_None; Execution_Platform : Supported_Execution_Platform := Platform_None;
Transport_API : Supported_Transport_APIs; Transport_API : Supported_Transport_APIs;
Ada_Sources : Name_Tables.Instance; Ada_Sources : Name_Tables.Instance;
Asn_Sources : Name_Tables.Instance;
C_Sources : Name_Tables.Instance; C_Sources : Name_Tables.Instance;
C_Libraries : Name_Tables.Instance; C_Libraries : Name_Tables.Instance;
User_Source_Dirs : Name_Tables.Instance; User_Source_Dirs : Name_Tables.Instance;
...@@ -266,6 +268,28 @@ package body Ocarina.Backends.PO_HI_C is ...@@ -266,6 +268,28 @@ package body Ocarina.Backends.PO_HI_C is
Write_Eol; Write_Eol;
end if; end if;
Write_Str ("ASN_SOURCES=");
if Generate_ASN1_Deployment then
Write_Str ("../asn1_deployment.asn ");
end if;
if Length (Asn_Sources) > 0 then
for J in
Name_Tables.First .. Name_Tables.Last (Asn_Sources) loop
Write_Str ("");
Write_Name (Asn_Sources.Table (J));
exit when J = Name_Tables.Last (Asn_Sources);
Write_Space;
end loop;
Write_Eol;
else
Write_Eol;
end if;
Write_Line ("include $(RUNTIME_PATH)/make/Makefile.common"); Write_Line ("include $(RUNTIME_PATH)/make/Makefile.common");
end PolyORB_HI_C_Makefile; end PolyORB_HI_C_Makefile;
......
...@@ -89,6 +89,7 @@ package body Ocarina.Backends.PO_QoS_Ada is ...@@ -89,6 +89,7 @@ package body Ocarina.Backends.PO_QoS_Ada is
Execution_Platform : Supported_Execution_Platform := Platform_None; Execution_Platform : Supported_Execution_Platform := Platform_None;
Transport_API : Supported_Transport_APIs; Transport_API : Supported_Transport_APIs;
Ada_Sources : Name_Tables.Instance; Ada_Sources : Name_Tables.Instance;
Asn_Sources : Name_Tables.Instance;
C_Sources : Name_Tables.Instance; C_Sources : Name_Tables.Instance;
C_Libraries : Name_Tables.Instance; C_Libraries : Name_Tables.Instance;
User_Source_Dirs : Name_Tables.Instance; User_Source_Dirs : Name_Tables.Instance;
...@@ -126,6 +127,7 @@ package body Ocarina.Backends.PO_QoS_Ada is ...@@ -126,6 +127,7 @@ package body Ocarina.Backends.PO_QoS_Ada is
Execution_Platform : Supported_Execution_Platform := Platform_None; Execution_Platform : Supported_Execution_Platform := Platform_None;
Transport_API : Supported_Transport_APIs; Transport_API : Supported_Transport_APIs;
Ada_Sources : Name_Tables.Instance; Ada_Sources : Name_Tables.Instance;
Asn_Sources : Name_Tables.Instance;
C_Sources : Name_Tables.Instance; C_Sources : Name_Tables.Instance;
C_Libraries : Name_Tables.Instance; C_Libraries : Name_Tables.Instance;
User_Source_Dirs : Name_Tables.Instance; User_Source_Dirs : Name_Tables.Instance;
...@@ -139,6 +141,7 @@ package body Ocarina.Backends.PO_QoS_Ada is ...@@ -139,6 +141,7 @@ package body Ocarina.Backends.PO_QoS_Ada is
pragma Unreferenced (Appli_Name, pragma Unreferenced (Appli_Name,
Transport_API, Transport_API,
Ada_Sources, Ada_Sources,
Asn_Sources,
C_Libraries, C_Libraries,
User_Source_Dirs, User_Source_Dirs,
Use_Transport, Use_Transport,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment