Commit 5238b2f2 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Use newer version of ASN1SCC based on .NET Core 5

parent 65ffacf4
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
@@-- to the same file generated at different places The python code checks @@-- to the same file generated at different places The python code checks
@@-- that when this happens only one _datamodel.asn file is kept to avoid @@-- that when this happens only one _datamodel.asn file is kept to avoid
@@-- an error that would otherwise be raised by asn2dataModel @@-- an error that would otherwise be raised by asn2dataModel
@@INLINE( args=$$\(python3 -c "import os, sys; print\(' '.join\({os.path.basename\(f\):f for f in sys.argv[1:]}.values\(\)\)\)" )( )(\); \\\n mkdir -p ..\/dataview\/Ada; mono $(shell which asn1.exe) -Ada -equal --target allboards -typePrefix asn1Scc -o ..\/dataview\/Ada $$args )@@ @@INLINE( args=$$\(python3 -c "import os, sys; print\(' '.join\({os.path.basename\(f\):f for f in sys.argv[1:]}.values\(\)\)\)" )( )(\); \\\n mkdir -p ..\/dataview\/Ada; asn1scc -Ada -equal --target allboards -typePrefix asn1Scc -o ..\/dataview\/Ada $$args )@@
@@TABLE@@ @@TABLE@@
@@IF@@ @_Block_Languages_@ = SDL @@IF@@ @_Block_Languages_@ = SDL
@@-- Use wildcard because in the case of the SDL to C backend the _datamodel files are not generated (yet) @@-- Use wildcard because in the case of the SDL to C backend the _datamodel files are not generated (yet)
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
@@-- For simulation target, add simulation.asn and uPER encoders @@-- For simulation target, add simulation.asn and uPER encoders
@_LOWER:Name_@_simu: @_REPLACE_ALL(,/ ):LOWER:Block_Names_@ @_LOWER:Name_@_simu: @_REPLACE_ALL(,/ ):LOWER:Block_Names_@
@@INLINE( args=")( )("; \\\n mkdir -p ..\/dataview\/Ada; mono $(shell which asn1.exe) -Ada -uPER -equal --target allboards -typePrefix asn1Scc -o ..\/dataview\/Ada $$args; \\)@@ @@INLINE( args=")( )("; \\\n mkdir -p ..\/dataview\/Ada; asn1scc -Ada -uPER -equal --target allboards -typePrefix asn1Scc -o ..\/dataview\/Ada $$args; \\)@@
@@TABLE@@ @@TABLE@@
@@IF@@ @_Block_Languages_@ = SDL @@IF@@ @_Block_Languages_@ = SDL
@@-- Use wildcard because in the case of the SDL to C backend the _datamodel files are not generated (yet) @@-- Use wildcard because in the case of the SDL to C backend the _datamodel files are not generated (yet)
......
...@@ -23,9 +23,9 @@ simu: ...@@ -23,9 +23,9 @@ simu:
DriversConfig/drivers_config.h: drivers_config.asn DriversConfig/drivers_config.h: drivers_config.asn
mkdir -p DriversConfig mkdir -p DriversConfig
@@IF@@ @_Use_POHIC_@ @@IF@@ @_Use_POHIC_@
mono $(shell which asn1.exe) -o DriversConfig -c drivers_config.asn @_REPLACE_ALL(,/ ):UNIQ(,):Device_ASN1_File_@ asn1scc -o DriversConfig -c drivers_config.asn @_REPLACE_ALL(,/ ):UNIQ(,):Device_ASN1_File_@
@@ELSE@@ @@ELSE@@
mono $(shell which asn1.exe) -o DriversConfig -t allboards -Ada drivers_config.asn @_REPLACE_ALL(,/ ):UNIQ(,):Device_ASN1_File_@ asn1scc -o DriversConfig -t allboards -Ada drivers_config.asn @_REPLACE_ALL(,/ ):UNIQ(,):Device_ASN1_File_@
@@END_IF@@ @@END_IF@@
@@ELSE@@ @@ELSE@@
DriversConfig/drivers_config.h: # Not a distributed system => nothing to do DriversConfig/drivers_config.h: # Not a distributed system => nothing to do
......
...@@ -167,9 +167,9 @@ ${DATAVIEW_AADLV2}: ${DATAVIEW_UNIQ} ...@@ -167,9 +167,9 @@ ${DATAVIEW_AADLV2}: ${DATAVIEW_UNIQ}
# Compile the ASN.1 models in C # Compile the ASN.1 models in C
dataview/C/built: ${DATAVIEW_UNIQ} ${DATAVIEW_ACN} ${CP_FILES} dataview/C/built: ${DATAVIEW_UNIQ} ${DATAVIEW_ACN} ${CP_FILES}
mkdir -p $(dir $@) mkdir -p $(dir $@)
# asn2dataModel does not take the ACN files, and only calls asn1.exe # asn2dataModel does not take the ACN files, and only calls asn1scc
# asn2dataModel -o $(dir $@) -toC ${DATAVIEW_UNIQ} ${DATAVIEW_ACN} # asn2dataModel -o $(dir $@) -toC ${DATAVIEW_UNIQ} ${DATAVIEW_ACN}
mono $(shell which asn1.exe) -typePrefix asn1Scc -equal -fp AUTO -o $(dir $@) -c -uPER -ACN $^ asn1scc -typePrefix asn1Scc -equal -fp AUTO -o $(dir $@) -c -uPER -ACN $^
cp ${TOOL_INST}/share/AutoGUI/debug_messages.? dataview/C cp ${TOOL_INST}/share/AutoGUI/debug_messages.? dataview/C
cp ${TOOL_INST}/share/AutoGUI/timeInMS.? dataview/C cp ${TOOL_INST}/share/AutoGUI/timeInMS.? dataview/C
cd dataview/C && msgPrinter ../dataview-uniq.asn cd dataview/C && msgPrinter ../dataview-uniq.asn
......
...@@ -77,6 +77,6 @@ PROPERTIES ...@@ -77,6 +77,6 @@ PROPERTIES
Taste::coordinates => "0 0 2970 2100"; Taste::coordinates => "0 0 2970 2100";
Taste::version => "2.3"; Taste::version => "2.3";
Taste::interfaceView => "InterfaceView.aadl"; Taste::interfaceView => "InterfaceView.aadl";
Taste::HWLibraries => ("../../../../tool-inst/share/ocarina/AADLv2/ocarina_components.aadl"); Taste::HWLibraries => ("/home/taste/tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
END deploymentview::DV; END deploymentview::DV;
...@@ -202,10 +202,10 @@ SUBCOMPONENTS ...@@ -202,10 +202,10 @@ SUBCOMPONENTS
Taste::coordinates => "556 1030 1318 1683"; Taste::coordinates => "556 1030 1318 1683";
}; };
CONNECTIONS CONNECTIONS
BlackBox_PI_RunDriver_Caller_in_Ada_RI_RunDriver : SUBPROGRAM ACCESS BlackBox.PI_RunDriver -> Caller_in_Ada.RI_RunDriver { Caller_in_Ada_RI_RunDriver_BlackBox_PI_RunDriver : SUBPROGRAM ACCESS BlackBox.PI_RunDriver -> Caller_in_Ada.RI_RunDriver {
Taste::coordinates => "1265 374 1579 374 1579 494 1872 494"; Taste::coordinates => "1265 374 1579 374 1579 494 1872 494";
}; };
BlackBox_PI_RunDriver_Caller_in_C_RI_RunDriver : SUBPROGRAM ACCESS BlackBox.PI_RunDriver -> Caller_in_C.RI_RunDriver { Caller_in_C_RI_RunDriver_BlackBox_PI_RunDriver : SUBPROGRAM ACCESS BlackBox.PI_RunDriver -> Caller_in_C.RI_RunDriver {
Taste::coordinates => "1318 1182 1597 1182 1597 494 1872 494"; Taste::coordinates => "1318 1182 1597 1182 1597 494 1872 494";
}; };
END interfaceview.others; END interfaceview.others;
...@@ -214,6 +214,6 @@ PROPERTIES ...@@ -214,6 +214,6 @@ PROPERTIES
Taste::dataView => ("DataView"); Taste::dataView => ("DataView");
Taste::dataViewPath => ("DataView.aadl"); Taste::dataViewPath => ("DataView.aadl");
Taste::coordinates => "0 0 2970 2100"; Taste::coordinates => "0 0 2970 2100";
Taste::version => "2.3"; Taste::version => "2.4";
END interfaceview::IV; END interfaceview::IV;
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