From a771db44a1af6c2a1015c3376cc788213c1c0c74 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Tue, 12 Apr 2011 20:16:20 +0000
Subject: [PATCH] AVATAR code generator: Update on function execution
---
executablecode/Makefile | 4 ++--
executablecode/Makefile.src | 2 +-
src/avatartranslator/toexecutable/AVATAR2CPOSIX.java | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/executablecode/Makefile b/executablecode/Makefile
index 5b76fc290f..8164fce476 100755
--- a/executablecode/Makefile
+++ b/executablecode/Makefile
@@ -7,10 +7,10 @@ OPT = -O1 -pthread
# Solaris
#LOPT = -O1 -pthread -ldl -lnsl -lsocket
#Linux
-LOPT = -O1 -pthread -ldl -lrt
+LOPT_UNIX = -O1 -pthread -ldl -lrt
LOPT_MAC = -O1 -pthread -ldl
-LOPT = $(LOPT_MAC)
+LOPT = $(LOPT_UNIX)
DEBUG = -g
OTHER = -Wall
diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src
index c3bde51c3e..0fbe662bab 100755
--- a/executablecode/Makefile.src
+++ b/executablecode/Makefile.src
@@ -1 +1 @@
-SRCS = generated_src/main.c generated_src/Block0.c
\ No newline at end of file
+SRCS = generated_src/main.c generated_src/RemotelyControlledMicrowave.c generated_src/RemoteControl.c generated_src/MicroWaveOven.c generated_src/Bell.c generated_src/ControlPanel.c generated_src/Controller.c generated_src/Magnetron.c generated_src/Door.c generated_src/WirelessInterface.c
\ No newline at end of file
diff --git a/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java b/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
index 8c8c401034..e31aa6a3d3 100755
--- a/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
+++ b/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
@@ -243,6 +243,10 @@ public class AVATAR2CPOSIX {
}
}
+ list = am.getListOfReturnAttributes();
+ if (list.size() != 0) {
+ ret += "return 0;" + CR;
+ }
ret += "}" + CR + CR;
}
_taskFile.addToMainCode(ret + CR);
--
GitLab