From ef51acbaaaf92c43772d350ab0686c69bb9fa8e1 Mon Sep 17 00:00:00 2001 From: Thanassis Tsiodras Date: Fri, 15 Jun 2018 09:53:29 +0200 Subject: [PATCH] Fix the build, use relative paths. --- Demo_DLL/{D_view.aadl => DataView.aadl} | 271 +++++++++++++++--------- 1 file changed, 172 insertions(+), 99 deletions(-) rename Demo_DLL/{D_view.aadl => DataView.aadl} (56%) diff --git a/Demo_DLL/D_view.aadl b/Demo_DLL/DataView.aadl similarity index 56% rename from Demo_DLL/D_view.aadl rename to Demo_DLL/DataView.aadl index e3c4e6f..a40787f 100644 --- a/Demo_DLL/D_view.aadl +++ b/Demo_DLL/DataView.aadl @@ -1,64 +1,109 @@ -------------------------------------------------------- ---! File generated by asn2aadl v2.1.2: DO NOT EDIT ! +--! File generated by asn2aadl v2.1.15: DO NOT EDIT ! +-------------------------------------------------------- +--! InputASN1FileChecksum:20ac8ef9090b561c0f86207e317d38f5:/home/taste/tool-src/testSuites/Demo_DLL/DataView.asn: +--! InputASN1FileChecksum:ee8a7e01f29874c0d50f437d5abb9599:/home/taste/tool-inst/share/taste-types/taste-types.asn: -------------------------------------------------------- package DataView public -DATA T_Int8 + with Data_Model; + with Taste; + with Base_Types; + with Deployment; + +DATA Simulink_Tunable_Parameter +PROPERTIES + TASTE::Ada_Package_Name => "TASTE_Directives"; + Type_Source_Name => "Simulink-Tunable-Parameter"; + Deployment::ASN1_Module_Name => "TASTE-Directives"; + TASTE::Forbid_in_PI => true; +END Simulink_Tunable_Parameter; + +DATA Timer +PROPERTIES + TASTE::Ada_Package_Name => "TASTE_Directives"; + Type_Source_Name => "Timer"; + Deployment::ASN1_Module_Name => "TASTE-Directives"; + TASTE::Forbid_in_PI => true; +END Timer; + +DATA Taste_directive +PROPERTIES + TASTE::Ada_Package_Name => "TASTE_Directives"; + Type_Source_Name => "Taste-directive"; + Deployment::ASN1_Module_Name => "TASTE-Directives"; + TASTE::Forbid_in_PI => true; +END Taste_directive; + +data Stream_Element_Buffer + -- Root type for buffer elements +properties + Data_Model::Data_Representation => Character; +end Stream_Element_Buffer; +DATA T_UInt32 PROPERTIES -- name of the ASN.1 source file: - Source_Text => ("/tmp/uniqhomeasserttool-srctestSuitesRegression_AADLv2Demo_CInterfaceView.aadl/dataview-uniq.asn"); - Ada_Package_Name => "TASTE_BasicTypes"; - Source_Language => ASN1; + Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn"); + TASTE::Ada_Package_Name => "TASTE_BasicTypes"; + Deployment::ASN1_Module_Name => "TASTE-BasicTypes"; + Source_Language => (ASN1); -- Size of a buffer to cover all forms of message representation: -- Real message size is 8; suggested aligned message buffer is... - Source_Data_Size => 8 B; + Source_Data_Size => 8 Bytes; -- name of the corresponding data type in the source file: - Type_Source_Name => "T-Int8"; + Type_Source_Name => "T-UInt32"; -- what kind of type is this? - assert_properties::ASN1_Basic_Type =>aINTEGER; -END T_Int8; + TASTE::ASN1_Basic_Type =>aINTEGER; +END T_UInt32; -DATA T_Int8_Buffer_Max -END T_Int8_Buffer_Max; +DATA IMPLEMENTATION T_UInt32.impl +END T_UInt32.impl; -DATA IMPLEMENTATION T_Int8_Buffer_Max.impl - -- Buffer to hold a marshalled data of type T_Int8 +DATA T_UInt32_Buffer_Max +END T_UInt32_Buffer_Max; + +DATA IMPLEMENTATION T_UInt32_Buffer_Max.impl + -- Buffer to hold a marshalled data of type T_UInt32 PROPERTIES Data_Model::Data_Representation => array; Data_Model::Dimension => (8); -- Size of the buffer - Data_Model::Base_Type => (data ASSERT_Types::Stream_Element); -END T_Int8_Buffer_Max.impl; + Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer)); +END T_UInt32_Buffer_Max.impl; -DATA T_Int8_Buffer -END T_Int8_Buffer; +DATA T_UInt32_Buffer +END T_UInt32_Buffer; -DATA IMPLEMENTATION T_Int8_Buffer.impl - -- Buffer to hold a marshalled data of type T_Int8 +DATA IMPLEMENTATION T_UInt32_Buffer.impl + -- Buffer to hold a marshalled data of type T_UInt32 SUBCOMPONENTS - Buffer : data T_Int8_Buffer_Max.impl; - Length : data Base_Types::uint32; + Buffer : data T_UInt32_Buffer_Max.impl; + Length : data Base_Types::Unsigned_32; PROPERTIES Data_Model::Data_Representation => Struct; -END T_Int8_Buffer.impl; +END T_UInt32_Buffer.impl; DATA T_Boolean PROPERTIES -- name of the ASN.1 source file: - Source_Text => ("/tmp/uniqhomeasserttool-srctestSuitesRegression_AADLv2Demo_CInterfaceView.aadl/dataview-uniq.asn"); - Ada_Package_Name => "TASTE_BasicTypes"; - Source_Language => ASN1; + Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn"); + TASTE::Ada_Package_Name => "TASTE_BasicTypes"; + Deployment::ASN1_Module_Name => "TASTE-BasicTypes"; + Source_Language => (ASN1); -- Size of a buffer to cover all forms of message representation: -- Real message size is 1; suggested aligned message buffer is... - Source_Data_Size => 8 B; + Source_Data_Size => 8 Bytes; -- name of the corresponding data type in the source file: Type_Source_Name => "T-Boolean"; -- what kind of type is this? - assert_properties::ASN1_Basic_Type =>aBOOLEAN; + TASTE::ASN1_Basic_Type =>aBOOLEAN; END T_Boolean; +DATA IMPLEMENTATION T_Boolean.impl +END T_Boolean.impl; + DATA T_Boolean_Buffer_Max END T_Boolean_Buffer_Max; @@ -67,7 +112,7 @@ DATA IMPLEMENTATION T_Boolean_Buffer_Max.impl PROPERTIES Data_Model::Data_Representation => array; Data_Model::Dimension => (8); -- Size of the buffer - Data_Model::Base_Type => (data ASSERT_Types::Stream_Element); + Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer)); END T_Boolean_Buffer_Max.impl; DATA T_Boolean_Buffer @@ -77,102 +122,114 @@ DATA IMPLEMENTATION T_Boolean_Buffer.impl -- Buffer to hold a marshalled data of type T_Boolean SUBCOMPONENTS Buffer : data T_Boolean_Buffer_Max.impl; - Length : data Base_Types::uint32; + Length : data Base_Types::Unsigned_32; PROPERTIES Data_Model::Data_Representation => Struct; END T_Boolean_Buffer.impl; -DATA T_Int32 +DATA T_Int8 PROPERTIES -- name of the ASN.1 source file: - Source_Text => ("/tmp/uniqhomeasserttool-srctestSuitesRegression_AADLv2Demo_CInterfaceView.aadl/dataview-uniq.asn"); - Ada_Package_Name => "TASTE_BasicTypes"; - Source_Language => ASN1; + Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn"); + TASTE::Ada_Package_Name => "TASTE_BasicTypes"; + Deployment::ASN1_Module_Name => "TASTE-BasicTypes"; + Source_Language => (ASN1); -- Size of a buffer to cover all forms of message representation: -- Real message size is 8; suggested aligned message buffer is... - Source_Data_Size => 8 B; + Source_Data_Size => 8 Bytes; -- name of the corresponding data type in the source file: - Type_Source_Name => "T-Int32"; + Type_Source_Name => "T-Int8"; -- what kind of type is this? - assert_properties::ASN1_Basic_Type =>aINTEGER; -END T_Int32; + TASTE::ASN1_Basic_Type =>aINTEGER; +END T_Int8; -DATA T_Int32_Buffer_Max -END T_Int32_Buffer_Max; +DATA IMPLEMENTATION T_Int8.impl +END T_Int8.impl; -DATA IMPLEMENTATION T_Int32_Buffer_Max.impl - -- Buffer to hold a marshalled data of type T_Int32 +DATA T_Int8_Buffer_Max +END T_Int8_Buffer_Max; + +DATA IMPLEMENTATION T_Int8_Buffer_Max.impl + -- Buffer to hold a marshalled data of type T_Int8 PROPERTIES Data_Model::Data_Representation => array; Data_Model::Dimension => (8); -- Size of the buffer - Data_Model::Base_Type => (data ASSERT_Types::Stream_Element); -END T_Int32_Buffer_Max.impl; + Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer)); +END T_Int8_Buffer_Max.impl; -DATA T_Int32_Buffer -END T_Int32_Buffer; +DATA T_Int8_Buffer +END T_Int8_Buffer; -DATA IMPLEMENTATION T_Int32_Buffer.impl - -- Buffer to hold a marshalled data of type T_Int32 +DATA IMPLEMENTATION T_Int8_Buffer.impl + -- Buffer to hold a marshalled data of type T_Int8 SUBCOMPONENTS - Buffer : data T_Int32_Buffer_Max.impl; - Length : data Base_Types::uint32; + Buffer : data T_Int8_Buffer_Max.impl; + Length : data Base_Types::Unsigned_32; PROPERTIES Data_Model::Data_Representation => Struct; -END T_Int32_Buffer.impl; +END T_Int8_Buffer.impl; -DATA MyInteger +DATA T_Int32 PROPERTIES -- name of the ASN.1 source file: - Source_Text => ("/tmp/uniqhomeasserttool-srctestSuitesRegression_AADLv2Demo_CInterfaceView.aadl/dataview-uniq.asn"); - Ada_Package_Name => "DataView"; - Source_Language => ASN1; + Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn"); + TASTE::Ada_Package_Name => "TASTE_BasicTypes"; + Deployment::ASN1_Module_Name => "TASTE-BasicTypes"; + Source_Language => (ASN1); -- Size of a buffer to cover all forms of message representation: -- Real message size is 8; suggested aligned message buffer is... - Source_Data_Size => 8 B; + Source_Data_Size => 8 Bytes; -- name of the corresponding data type in the source file: - Type_Source_Name => "MyInteger"; + Type_Source_Name => "T-Int32"; -- what kind of type is this? - assert_properties::ASN1_Basic_Type =>aINTEGER; -END MyInteger; + TASTE::ASN1_Basic_Type =>aINTEGER; +END T_Int32; -DATA MyInteger_Buffer_Max -END MyInteger_Buffer_Max; +DATA IMPLEMENTATION T_Int32.impl +END T_Int32.impl; -DATA IMPLEMENTATION MyInteger_Buffer_Max.impl - -- Buffer to hold a marshalled data of type MyInteger +DATA T_Int32_Buffer_Max +END T_Int32_Buffer_Max; + +DATA IMPLEMENTATION T_Int32_Buffer_Max.impl + -- Buffer to hold a marshalled data of type T_Int32 PROPERTIES Data_Model::Data_Representation => array; Data_Model::Dimension => (8); -- Size of the buffer - Data_Model::Base_Type => (data ASSERT_Types::Stream_Element); -END MyInteger_Buffer_Max.impl; + Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer)); +END T_Int32_Buffer_Max.impl; -DATA MyInteger_Buffer -END MyInteger_Buffer; +DATA T_Int32_Buffer +END T_Int32_Buffer; -DATA IMPLEMENTATION MyInteger_Buffer.impl - -- Buffer to hold a marshalled data of type MyInteger +DATA IMPLEMENTATION T_Int32_Buffer.impl + -- Buffer to hold a marshalled data of type T_Int32 SUBCOMPONENTS - Buffer : data MyInteger_Buffer_Max.impl; - Length : data Base_Types::uint32; + Buffer : data T_Int32_Buffer_Max.impl; + Length : data Base_Types::Unsigned_32; PROPERTIES Data_Model::Data_Representation => Struct; -END MyInteger_Buffer.impl; +END T_Int32_Buffer.impl; DATA T_UInt8 PROPERTIES -- name of the ASN.1 source file: - Source_Text => ("/tmp/uniqhomeasserttool-srctestSuitesRegression_AADLv2Demo_CInterfaceView.aadl/dataview-uniq.asn"); - Ada_Package_Name => "TASTE_BasicTypes"; - Source_Language => ASN1; + Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn"); + TASTE::Ada_Package_Name => "TASTE_BasicTypes"; + Deployment::ASN1_Module_Name => "TASTE-BasicTypes"; + Source_Language => (ASN1); -- Size of a buffer to cover all forms of message representation: -- Real message size is 8; suggested aligned message buffer is... - Source_Data_Size => 8 B; + Source_Data_Size => 8 Bytes; -- name of the corresponding data type in the source file: Type_Source_Name => "T-UInt8"; -- what kind of type is this? - assert_properties::ASN1_Basic_Type =>aINTEGER; + TASTE::ASN1_Basic_Type =>aINTEGER; END T_UInt8; +DATA IMPLEMENTATION T_UInt8.impl +END T_UInt8.impl; + DATA T_UInt8_Buffer_Max END T_UInt8_Buffer_Max; @@ -181,7 +238,7 @@ DATA IMPLEMENTATION T_UInt8_Buffer_Max.impl PROPERTIES Data_Model::Data_Representation => array; Data_Model::Dimension => (8); -- Size of the buffer - Data_Model::Base_Type => (data ASSERT_Types::Stream_Element); + Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer)); END T_UInt8_Buffer_Max.impl; DATA T_UInt8_Buffer @@ -191,47 +248,63 @@ DATA IMPLEMENTATION T_UInt8_Buffer.impl -- Buffer to hold a marshalled data of type T_UInt8 SUBCOMPONENTS Buffer : data T_UInt8_Buffer_Max.impl; - Length : data Base_Types::uint32; + Length : data Base_Types::Unsigned_32; PROPERTIES Data_Model::Data_Representation => Struct; END T_UInt8_Buffer.impl; -DATA T_UInt32 +DATA MyInteger PROPERTIES -- name of the ASN.1 source file: - Source_Text => ("/tmp/uniqhomeasserttool-srctestSuitesRegression_AADLv2Demo_CInterfaceView.aadl/dataview-uniq.asn"); - Ada_Package_Name => "TASTE_BasicTypes"; - Source_Language => ASN1; + Source_Text => ("/home/taste/tool-src/testSuites/Demo_DLL/DataView.asn"); + TASTE::Ada_Package_Name => "DataView"; + Deployment::ASN1_Module_Name => "DataView"; + Source_Language => (ASN1); -- Size of a buffer to cover all forms of message representation: -- Real message size is 8; suggested aligned message buffer is... - Source_Data_Size => 8 B; + Source_Data_Size => 8 Bytes; -- name of the corresponding data type in the source file: - Type_Source_Name => "T-UInt32"; + Type_Source_Name => "MyInteger"; -- what kind of type is this? - assert_properties::ASN1_Basic_Type =>aINTEGER; -END T_UInt32; + TASTE::ASN1_Basic_Type =>aINTEGER; +END MyInteger; -DATA T_UInt32_Buffer_Max -END T_UInt32_Buffer_Max; +DATA IMPLEMENTATION MyInteger.impl +END MyInteger.impl; -DATA IMPLEMENTATION T_UInt32_Buffer_Max.impl - -- Buffer to hold a marshalled data of type T_UInt32 +DATA MyInteger_Buffer_Max +END MyInteger_Buffer_Max; + +DATA IMPLEMENTATION MyInteger_Buffer_Max.impl + -- Buffer to hold a marshalled data of type MyInteger PROPERTIES Data_Model::Data_Representation => array; Data_Model::Dimension => (8); -- Size of the buffer - Data_Model::Base_Type => (data ASSERT_Types::Stream_Element); -END T_UInt32_Buffer_Max.impl; + Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer)); +END MyInteger_Buffer_Max.impl; -DATA T_UInt32_Buffer -END T_UInt32_Buffer; +DATA MyInteger_Buffer +END MyInteger_Buffer; -DATA IMPLEMENTATION T_UInt32_Buffer.impl - -- Buffer to hold a marshalled data of type T_UInt32 +DATA IMPLEMENTATION MyInteger_Buffer.impl + -- Buffer to hold a marshalled data of type MyInteger SUBCOMPONENTS - Buffer : data T_UInt32_Buffer_Max.impl; - Length : data Base_Types::uint32; + Buffer : data MyInteger_Buffer_Max.impl; + Length : data Base_Types::Unsigned_32; PROPERTIES Data_Model::Data_Representation => Struct; -END T_UInt32_Buffer.impl; +END MyInteger_Buffer.impl; + +SYSTEM Taste_DataView +END Taste_DataView; +SYSTEM IMPLEMENTATION Taste_DataView.others +SUBCOMPONENTS + T_UInt32 : DATA T_UInt32.impl; + T_Boolean : DATA T_Boolean.impl; + T_Int8 : DATA T_Int8.impl; + T_Int32 : DATA T_Int32.impl; + T_UInt8 : DATA T_UInt8.impl; + MyInteger : DATA MyInteger.impl; +END Taste_DataView.others; end DataView; -- GitLab