Speed up launching of space creator

by providing pre-cooked DataView.aadl

misc/helper-scripts/space-creator

@@ -176,9 +176,13 @@ then
     touch ConcurrencyView_Properties.aadl
 fi
 
-# Create a default data view
+# Create a default data view (use pre-made DataView.aadl to speed up)
 echo -e "${INFO} Creating a default ASN.1 data model."
-NONINTERACTIVE=1 taste-create-data-view
+cp -f $(taste-config --prefix)/bin/space-creator-dataview.aadl DataView.aadl
+sed -i "s/MD5ACN/$MD5ACN/" DataView.aadl
+sed -i "s/MD5ASN/$MD5ASN/" DataView.aadl
+sed -i "s/PROJECTNAME/$PROJECT_NAME/" DataView.aadl
+NONINTERACTIVE=1 ONLY_ASN=1 taste-create-data-view
 
 
 if [ "$1" == "init" ]

misc/helper-scripts/space-creator-dataview.aadl

+--------------------------------------------------------
+--! File generated by asn2aadl v2.2-r74b182d: DO NOT EDIT !
+--------------------------------------------------------
+--! MadeInFastMode:True:
+--! InputASN1FileChecksum:MD5ACN:DataView.acn:
+--! InputASN1FileChecksum:MD5ASN:DataView.asn:
+--! InputASN1FileChecksum:ff35cd78b1e82f09b63b209ab7cf7c34:/home/taste/tool-inst/share/taste-types/taste-types.asn:
+--------------------------------------------------------
+
+package DataView
+
+public
+
+  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 MyInteger
+PROPERTIES
+    -- name of the ASN.1 source file:
+    Source_Text => ("DataView.asn");
+    TASTE::EncodingDefinitionFile => classifier(DataView::ACN_PROJECTNAME_DATAVIEW);
+    TASTE::Ada_Package_Name => "PROJECTNAME_DATAVIEW";
+    Deployment::ASN1_Module_Name => "PROJECTNAME-DATAVIEW";
+    Source_Language => (ASN1);
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "MyInteger";
+    TASTE::Position_In_File => [ line => 4 ; column => 1 ; ];
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aINTEGER;
+END MyInteger;
+
+DATA IMPLEMENTATION MyInteger.impl
+END MyInteger.impl;
+
+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::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END MyInteger_Buffer_Max.impl;
+
+DATA MyInteger_Buffer
+END MyInteger_Buffer;
+
+DATA IMPLEMENTATION MyInteger_Buffer.impl
+    -- Buffer to hold a marshalled data of type MyInteger
+SUBCOMPONENTS
+    Buffer : data MyInteger_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END MyInteger_Buffer.impl;
+
+DATA T_Boolean
+PROPERTIES
+    -- name of the ASN.1 source file:
+    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);
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-Boolean";
+    TASTE::Position_In_File => [ line => 14 ; column => 1 ; ];
+    -- what kind of type is this?
+    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;
+
+DATA IMPLEMENTATION T_Boolean_Buffer_Max.impl
+    -- Buffer to hold a marshalled data of type T_Boolean
+PROPERTIES
+    Data_Model::Data_Representation => array;
+    Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_Boolean_Buffer_Max.impl;
+
+DATA T_Boolean_Buffer
+END T_Boolean_Buffer;
+
+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::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_Boolean_Buffer.impl;
+
+DATA T_Int32
+PROPERTIES
+    -- name of the ASN.1 source file:
+    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);
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-Int32";
+    TASTE::Position_In_File => [ line => 6 ; column => 1 ; ];
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aINTEGER;
+END T_Int32;
+
+DATA IMPLEMENTATION T_Int32.impl
+END T_Int32.impl;
+
+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::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_Int32_Buffer_Max.impl;
+
+DATA T_Int32_Buffer
+END T_Int32_Buffer;
+
+DATA IMPLEMENTATION T_Int32_Buffer.impl
+    -- Buffer to hold a marshalled data of type T_Int32
+SUBCOMPONENTS
+    Buffer : data T_Int32_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_Int32_Buffer.impl;
+
+DATA T_Int8
+PROPERTIES
+    -- name of the ASN.1 source file:
+    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);
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-Int8";
+    TASTE::Position_In_File => [ line => 10 ; column => 1 ; ];
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aINTEGER;
+END T_Int8;
+
+DATA IMPLEMENTATION T_Int8.impl
+END T_Int8.impl;
+
+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::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_Int8_Buffer_Max.impl;
+
+DATA T_Int8_Buffer
+END T_Int8_Buffer;
+
+DATA IMPLEMENTATION T_Int8_Buffer.impl
+    -- Buffer to hold a marshalled data of type T_Int8
+SUBCOMPONENTS
+    Buffer : data T_Int8_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_Int8_Buffer.impl;
+
+DATA T_Null_Record
+PROPERTIES
+    -- name of the ASN.1 source file:
+    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);
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-Null-Record";
+    TASTE::Position_In_File => [ line => 16 ; column => 1 ; ];
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aSEQUENCE;
+END T_Null_Record;
+
+DATA IMPLEMENTATION T_Null_Record.impl
+END T_Null_Record.impl;
+
+DATA T_Null_Record_Buffer_Max
+END T_Null_Record_Buffer_Max;
+
+DATA IMPLEMENTATION T_Null_Record_Buffer_Max.impl
+    -- Buffer to hold a marshalled data of type T_Null_Record
+PROPERTIES
+    Data_Model::Data_Representation => array;
+    Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_Null_Record_Buffer_Max.impl;
+
+DATA T_Null_Record_Buffer
+END T_Null_Record_Buffer;
+
+DATA IMPLEMENTATION T_Null_Record_Buffer.impl
+    -- Buffer to hold a marshalled data of type T_Null_Record
+SUBCOMPONENTS
+    Buffer : data T_Null_Record_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_Null_Record_Buffer.impl;
+
+DATA T_UInt32
+PROPERTIES
+    -- name of the ASN.1 source file:
+    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);
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-UInt32";
+    TASTE::Position_In_File => [ line => 8 ; column => 1 ; ];
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aINTEGER;
+END T_UInt32;
+
+DATA IMPLEMENTATION T_UInt32.impl
+END T_UInt32.impl;
+
+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::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_UInt32_Buffer_Max.impl;
+
+DATA T_UInt32_Buffer
+END T_UInt32_Buffer;
+
+DATA IMPLEMENTATION T_UInt32_Buffer.impl
+    -- Buffer to hold a marshalled data of type T_UInt32
+SUBCOMPONENTS
+    Buffer : data T_UInt32_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_UInt32_Buffer.impl;
+
+DATA T_UInt8
+PROPERTIES
+    -- name of the ASN.1 source file:
+    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);
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-UInt8";
+    TASTE::Position_In_File => [ line => 12 ; column => 1 ; ];
+    -- what kind of type is this?
+    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;
+
+DATA IMPLEMENTATION T_UInt8_Buffer_Max.impl
+    -- Buffer to hold a marshalled data of type T_UInt8
+PROPERTIES
+    Data_Model::Data_Representation => array;
+    Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_UInt8_Buffer_Max.impl;
+
+DATA T_UInt8_Buffer
+END T_UInt8_Buffer;
+
+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::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_UInt8_Buffer.impl;
+
+SYSTEM Taste_DataView
+END    Taste_DataView;
+
+SYSTEM IMPLEMENTATION Taste_DataView.others
+SUBCOMPONENTS
+   MyInteger : DATA MyInteger.impl;
+   T_Boolean : DATA T_Boolean.impl;
+   T_Int32 : DATA T_Int32.impl;
+   T_Int8 : DATA T_Int8.impl;
+   T_Null_Record : DATA T_Null_Record.impl;
+   T_UInt32 : DATA T_UInt32.impl;
+   T_UInt8 : DATA T_UInt8.impl;
+END Taste_DataView.others;
+DATA ACN_PROJECTNAME_DATAVIEW
+PROPERTIES
+    Source_Text => ("DataView.acn");
+    Source_Language => (ACN);
+END ACN_PROJECTNAME_DATAVIEW;
+
+end DataView;

misc/helper-scripts/taste-create-data-view

@@ -105,7 +105,11 @@ fi
 
 # cp $(taste-config --prefix)/share/taste-types/taste-types.asn .
 
-taste-update-data-view
+if [ -z $ONLY_ASN ]
+then
+    # Optionally convert to AADL
+    taste-update-data-view
+fi
 
 if [ -z $NONINTERACTIVE ]
 then