Commit 98b9ad44 authored by Maxime Perrotin's avatar Maxime Perrotin

Fix side effects of ocarina workaround + other ordering issues in

makefiles
parent a814a79b
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
#include "queue_manager.h" #include "queue_manager.h"
#include "@_LOWER:Name_@.h" #include "@_LOWER:Name_@.h"
#include "@_Name_@_enums_def.h" #include "@_LOWER:Name_@_enums_def.h"
typedef struct _PI_Messages { typedef struct _PI_Messages {
T_@_Name_@_PI_list msg_id; T_@_LOWER:Name_@_PI_list msg_id;
union { union {
@@TABLE@@ @@TABLE@@
@@IF@@ @_ASync_PI_Param_Type_@ /= "" @@IF@@ @_ASync_PI_Param_Type_@ /= ""
...@@ -50,7 +50,7 @@ typedef struct _PI_Messages { ...@@ -50,7 +50,7 @@ typedef struct _PI_Messages {
} PI_Messages; } PI_Messages;
typedef struct _RI_Messages { typedef struct _RI_Messages {
T_@_Name_@_RI_list msg_id; T_@_LOWER:Name_@_RI_list msg_id;
union { union {
@@TABLE@@ @@TABLE@@
@@IF@@ @_ASync_RI_Param_Type_@ /= "" @@IF@@ @_ASync_RI_Param_Type_@ /= ""
...@@ -132,7 +132,7 @@ void @_LOWER:Name_@_PI_Poll(void) ...@@ -132,7 +132,7 @@ void @_LOWER:Name_@_PI_Poll(void)
struct mq_attr msgq_attr; struct mq_attr msgq_attr;
char* msgcontent = NULL; char* msgcontent = NULL;
T_@_Name_@_RI_list message_received_type; T_@_LOWER:Name_@_RI_list message_received_type;
if ((msgcontent = (char*)malloc(sizeof(RI_Messages))) == NULL) { if ((msgcontent = (char*)malloc(sizeof(RI_Messages))) == NULL) {
perror("Error when allocating memory in GUI polling function"); perror("Error when allocating memory in GUI polling function");
......
...@@ -3,5 +3,4 @@ ...@@ -3,5 +3,4 @@
@@-- @_Name_@ : The name of the function @@-- @_Name_@ : The name of the function
@@-- @_Is_Type_@ : True if function type @@-- @_Is_Type_@ : True if function type
@@-- @_Instance_Of_@ : Name of instance or empty string @@-- @_Instance_Of_@ : Name of instance or empty string
@@-- Don't use LOWER because the enums_def.h is also included by DMT's gui_api.c @_LOWER:Name_@_enums_def.h
@_Name_@_enums_def.h
...@@ -41,7 +41,7 @@ typedef enum { ...@@ -41,7 +41,7 @@ typedef enum {
@@END_IF@@ @@END_IF@@
@@END_TABLE@@ @@END_TABLE@@
@@END_INLINE@@ @@END_INLINE@@
} T_@_Name_@_PI_list; } T_@_LOWER:Name_@_PI_list;
@@END_IF@@ @@END_IF@@
@@IF@@ @_List_Of_ASync_RIs'Length_@ > 0 @@IF@@ @_List_Of_ASync_RIs'Length_@ > 0
...@@ -51,5 +51,5 @@ typedef enum { ...@@ -51,5 +51,5 @@ typedef enum {
i_@_List_Of_ASync_RIs_@ i_@_List_Of_ASync_RIs_@
@@END_TABLE@@ @@END_TABLE@@
@@END_INLINE@@ @@END_INLINE@@
} T_@_Name_@_RI_list; } T_@_LOWER:Name_@_RI_list;
@@END_IF@@ @@END_IF@@
...@@ -121,14 +121,22 @@ dataview/C/built: ${DATAVIEW_UNIQ} ${DATAVIEW_ACN} ...@@ -121,14 +121,22 @@ dataview/C/built: ${DATAVIEW_UNIQ} ${DATAVIEW_ACN}
@@-- do nothing, C is always done, only once @@-- do nothing, C is always done, only once
@@ELSIF@@ @_Unique_Languages_@ = "GUI" @@ELSIF@@ @_Unique_Languages_@ = "GUI"
@@-- for DMT, GUI means Python @@-- for DMT, GUI means Python
dataview/Python/built: dataview/C/built @@INLINE(dataview/Python/built: dataview/C/built )( )()@@
@@-- aadl2glueC has to be called before the python mapper is built
@@-- because it depends on gui_api.c/etc.
@@TABLE@@
@@IF@@ @_Language_@ = GUI
@_LOWER:Function_Names_@/GUI/wrappers/aadl2glueC_built
@@END_IF@@
@@END_TABLE@@
@@END_INLINE@@
mkdir -p $(dir $@) mkdir -p $(dir $@)
asn2dataModel -o $(dir $@) -toPython ${DATAVIEW_UNIQ} @@-- Ignore context parameters for python interface asn2dataModel -o $(dir $@) -toPython ${DATAVIEW_UNIQ} @@-- Ignore context parameters for python interface
$(MAKE) -C dataview/Python -f Makefile.python $(MAKE) -C dataview/Python -f Makefile.python
@@TABLE@@ @@TABLE@@
@@IF@@ @_Language_@ = GUI @@IF@@ @_Language_@ = GUI
cp dataview/Python/* @_LOWER:Function_Names_@/GUI/wrappers/python cp dataview/Python/* @_LOWER:Function_Names_@/GUI/wrappers/python
cp dataview/C/timeInMS.[ch] dataview/C/debug_messages.c @_LOWER:Function_Names_@/GUI/wrappers/python cp dataview/C/timeInMS.[ch] dataview/C/debug_messages.c @_LOWER:Function_Names_@/GUI/wrappers/python
cd @_LOWER:Function_Names_@/GUI/wrappers/python && \ cd @_LOWER:Function_Names_@/GUI/wrappers/python && \
gcc -g -fPIC -c `python-config --cflags` gui_api.c ../../src/queue_manager.c timeInMS.c debug_messages.c -I. -I../../src && \ gcc -g -fPIC -c `python-config --cflags` gui_api.c ../../src/queue_manager.c timeInMS.c debug_messages.c -I. -I../../src && \
gcc -g -shared -o PythonAccess.so gui_api.o queue_manager.o timeInMS.o debug_messages.o `python-config --ldflags` -lrt gcc -g -shared -o PythonAccess.so gui_api.o queue_manager.o timeInMS.o debug_messages.o `python-config --ldflags` -lrt
......
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