Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
kazoo
Commits
98b9ad44
Commit
98b9ad44
authored
Sep 04, 2019
by
Maxime Perrotin
Browse files
Fix side effects of ocarina workaround + other ordering issues in
makefiles
parent
a814a79b
Changes
4
Hide whitespace changes
Inline
Side-by-side
templates/skeletons/gui-body/function.tmplt
View file @
98b9ad44
...
...
@@ -36,10 +36,10 @@
#include "queue_manager.h"
#include "@_LOWER:Name_@.h"
#include "@_Name_@_enums_def.h"
#include "@_
LOWER:
Name_@_enums_def.h"
typedef struct _PI_Messages {
T_@_Name_@_PI_list msg_id;
T_@_
LOWER:
Name_@_PI_list msg_id;
union {
@@TABLE@@
@@IF@@ @_ASync_PI_Param_Type_@ /= ""
...
...
@@ -50,7 +50,7 @@ typedef struct _PI_Messages {
} PI_Messages;
typedef struct _RI_Messages {
T_@_Name_@_RI_list msg_id;
T_@_
LOWER:
Name_@_RI_list msg_id;
union {
@@TABLE@@
@@IF@@ @_ASync_RI_Param_Type_@ /= ""
...
...
@@ -132,7 +132,7 @@ void @_LOWER:Name_@_PI_Poll(void)
struct mq_attr msgq_attr;
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) {
perror("Error when allocating memory in GUI polling function");
...
...
templates/skeletons/gui-enum-defs/function-filename.tmplt
View file @
98b9ad44
...
...
@@ -3,5 +3,4 @@
@@-- @_Name_@ : The name of the function
@@-- @_Is_Type_@ : True if function type
@@-- @_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
@_Name_@_enums_def.h
@_LOWER:Name_@_enums_def.h
templates/skeletons/gui-enum-defs/function.tmplt
View file @
98b9ad44
...
...
@@ -41,7 +41,7 @@ typedef enum {
@@END_IF@@
@@END_TABLE@@
@@END_INLINE@@
} T_@_Name_@_PI_list;
} T_@_
LOWER:
Name_@_PI_list;
@@END_IF@@
@@IF@@ @_List_Of_ASync_RIs'Length_@ > 0
...
...
@@ -51,5 +51,5 @@ typedef enum {
i_@_List_Of_ASync_RIs_@
@@END_TABLE@@
@@END_INLINE@@
} T_@_Name_@_RI_list;
} T_@_
LOWER:
Name_@_RI_list;
@@END_IF@@
templates/skeletons/makefile.tmplt
View file @
98b9ad44
...
...
@@ -121,14 +121,22 @@ dataview/C/built: ${DATAVIEW_UNIQ} ${DATAVIEW_ACN}
@@--
do
nothing,
C
is
always
done,
only
once
@@ELSIF@@
@_Unique_Languages_@
=
"GUI"
@@--
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
$@)
asn2dataModel
-o
$(dir
$@)
-toPython
${DATAVIEW_UNIQ}
@@--
Ignore
context
parameters
for
python
interface
$(MAKE)
-C
dataview/Python
-f
Makefile.python
@@TABLE@@
@@IF@@
@_Language_@
=
GUI
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/Python/* @_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
&&
\
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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment