Call user script before checking for POHIC

e09c200a · Maxime Perrotin · ed065a34 · e09c200a
Commit e09c200a authored May 22, 2017 by Maxime Perrotin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 7 deletions

c/build_script.c c/build_script.c +5 -7

No files found.
--- 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");