From e09c200a1b8d49b58dab1dbeb11e6be854b4a567 Mon Sep 17 00:00:00 2001
From: Maxime Perrotin <Maxime.Perrotin@esa.int>
Date: Mon, 22 May 2017 13:15:52 +0200
Subject: [PATCH] Call user script before checking for POHIC

---
 c/build_script.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/c/build_script.c b/c/build_script.c
index e595d6c..3c820d0 100644
--- a/c/build_script.c
+++ b/c/build_script.c
@@ -184,6 +184,11 @@ void Create_script()
                      "then\n"
                      "    ORCHESTRATOR_OPTIONS+=\" -w ConcurrencyView.pro \"\n"
                      "fi\n\n"
+                     "if [ -f user_init_post.sh ]\n"
+                     "then\n"
+                     "    echo -e \"${INFO} Executing user-defined post-init script\"\n"
+                     "    source user_init_post.sh\n"
+                     "fi\n\n"
                      "if [ ! -z \"$USE_POHIC\" ]\n"
                      "then\n"
                      "    OUTPUTDIR=binary.c\n"
@@ -194,13 +199,6 @@ void Create_script()
                      "else\n"
                      "    OUTPUTDIR=binary\n"
                      "fi\n\n"
-                     );
-
-    fprintf (script, "if [ -f user_init_post.sh ]\n"
-                     "then\n"
-                     "    echo -e \"${INFO} Executing user-defined init script\"\n"
-                     "    source user_init_post.sh\n"
-                     "fi\n\n"
                      "cd \"$CWD\" && assert-builder-ocarina.py \\\n"
                      "\t--fast \\\n"
                      "\t--debug \\\n");
-- 
GitLab