Commit ac3ae7e0 authored by Maxime Perrotin's avatar Maxime Perrotin

Add support for distributed systems in POHIAda

parent eda5f6a5
......@@ -85,7 +85,7 @@ air:
@@IF@@ @_Bus_Names'Length_@ > 0
DriversConfig/drivers_config.h: drivers_config.asn
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_@
@@ELSE@@
mono $(shell which asn1.exe) -o DriversConfig -Ada drivers_config.asn @_REPLACE_ALL(,/ ):UNIQ(,):Device_ASN1_File_@
......
......@@ -56,7 +56,7 @@ project @_CAPITALIZE:Name_@ is
@@IF@@ @_Need_Ada_@ = TRUE
"../../dataview/Ada",
@@END_IF@@
@@IF@@ @_VP_Name_@ = "" and @_In_Port_Names'Length_@ > 0
@@IF@@ @_VP_Name_@ = "" and (@_In_Port_Names'Length_@ > 0 or @_Out_Port_Names'Length_@ > 0)
@@-- Detect distributed systems (no virtual processor) - add DriversConfig folder
"../DriversConfig",
@@END_IF@@
......
......@@ -35,11 +35,11 @@ is
for @_CAPITALIZE:Param_Names_@_AdaBuffer'Address use Param_Buffer'Address;
@@END_TABLE@@
begin
@@IF@@ @_Need_Mutex_@
@@--@@IF@@ @_Need_Mutex_@ cyclic and sporadics are ALWAYS protected
@_CAPITALIZE:Pro_Block_Name_@.@_CAPITALIZE:Pro_Block_Name_@_Protected.@_CAPITALIZE:Entry_Port_Name_@
@@ELSE@@
@_CAPITALIZE:Pro_Block_Name_@.@_CAPITALIZE:Entry_Port_Name_@
@@END_IF@@
@@--@@ELSE@@
@@--@_CAPITALIZE:Pro_Block_Name_@.@_CAPITALIZE:Entry_Port_Name_@
@@--@@END_IF@@
(@_CAPITALIZE:Param_Names_@_AdaBuffer, @_CAPITALIZE:Param_Names_@_AdaBuffer'Length);
@@ELSE@@
begin @@-- no param
......
......@@ -43,7 +43,7 @@ project @_CAPITALIZE:Name_@ is
-- following to be updated with all relevant source dirs
for Source_Dirs use
("@_LOWER:Name_@",
@@IF@@ @_VP_Name_@ = "" and @_In_Port_Names'Length_@ > 0
@@IF@@ @_VP_Name_@ = "" and (@_In_Port_Names'Length_@ > 0 or @_Out_Port_Names'Length_@ > 0)
@@-- Detect distributed systems (no virtual processor) - add DriversConfig folder
"../DriversConfig",
@@END_IF@@
......
......@@ -2,25 +2,11 @@ KAZOO=../../kazoo
all: c
ada: test-parse-ada
make -C output.ada
cp skels/a/a.c output.pohic/a/C/src
cp skels/b/b.c output.pohic/b/C/src
cd output.ada/build && \
ocarina -x main.aadl && \
make -f Makefile.taste
c: test-parse-c # Polyorb_HI_C output
cp skels/a/a.c output.pohic/a/C/src
cp skels/b/b.c output.pohic/b/C/src
make -C output.pohic
test-parse-ada: clean-ada
$(KAZOO) --gw \
-o output.ada \
--glue \
--debug
test-parse-c: clean-c
$(KAZOO) -p --gw \
-o output.pohic \
......@@ -28,27 +14,18 @@ test-parse-c: clean-c
buildsupport_pohic:
buildsupport -o output.buildsupport.pohic -p --aadlv2 --glue -i InterfaceView.aadl -c DeploymentView.aadl -d DataView.aadl ../common/ocarina_components.aadl ../common/TASTE_IV_Properties.aadl ../common/TASTE_DV_Properties.aadl
buildsupport_pohiada:
buildsupport -o output.buildsupport.ada --aadlv2 --glue -i InterfaceView.aadl -c DeploymentView.aadl -d DataView.aadl ../common/ocarina_components.aadl ../common/TASTE_IV_Properties.aadl ../common/TASTE_DV_Properties.aadl
gdb: clean
gdb --args $(KAZOO) --gw \
-o output.pohic \
--glue \
--debug
clean-ada:
rm -rf output.ada
clean-c:
rm -rf output.pohic
skeletons:
$(KAZOO) -p --gw --glue -o code && make -C code dataview
clean-skeletons:
rm -rf code
clean: clean-ada clean-c clean-skeletons
clean: clean-c clean-skeletons
.PHONY: clean clean-ada clean-c test-parse-ada gdb test-parse-c buildsupport_pohic buildsupport_pohiada c skeletons clean-skeletons
.PHONY: clean clean-c gdb test-parse-c buildsupport_pohic c skeletons clean-skeletons
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