Pour résoudre un conflit entre les branches master et Windows.

[tools/sat.git] / commands / make.py

diff --git a/commands/make.py b/commands/make.py
index 4b15ee14546e98c998dd407b09c2606a2ecf3b23..4d62a96b9db715b768a36245842d1fe6ee8df64d 100644 (file)
--- a/commands/make.py
+++ b/commands/make.py
@@ -142,11 +142,23 @@ def make_product(p_name_info, make_option, config, logger):
     # Execute cmake if the product is cmake
     len_end_line = 20
     res = 0
-    nb_proc, make_opt_without_j = get_nb_proc(p_info, config, make_option)
-    log_step(logger, header, "MAKE -j" + str(nb_proc))
-    res_m = builder.make(nb_proc, make_opt_without_j)
-    log_res_step(logger, res_m)
-    res += res_m
+
+    if not src.product.product_has_script(p_info):
+        nb_proc, make_opt_without_j = get_nb_proc(p_info, config, make_option)
+        log_step(logger, header, "MAKE -j" + str(nb_proc))
+        if src.architecture.is_windows():
+            res_m = builder.wmake(nb_proc, make_opt_without_j)
+        else:
+            res_m = builder.make(nb_proc, make_opt_without_j)
+        log_res_step(logger, res_m)
+        res += res_m
+    else:
+        scrit_path_display = src.printcolors.printcLabel(p_info.compil_script)
+        log_step(logger, header, "SCRIPT " + scrit_path_display)
+        len_end_line += len(scrit_path_display)
+        res_s = builder.do_script_build(p_info.compil_script)
+        log_res_step(logger, res_s)
+        res += res_s
     
     # Log the result
     if res > 0: