release notes 5.5 5.0 part 1

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

diff --git a/commands/generate.py b/commands/generate.py
index d46a0c81927af3e0068869224adf036e6fc7cac7..b34b0b6b684cdca138aedda1f6c45e41382ccce9 100644 (file)
--- a/commands/generate.py
+++ b/commands/generate.py
@@ -153,7 +153,6 @@ def generate_component(config, compo, product_info, context, header, logger):
         mg = module_generator.Module(compo, components=[salome_compo],
                                      prefix=generate_dir, gui=gui_files)
         g = sat_generator(mg, context)
-        print "CNC generate component!"
         g.generate()
 
         if use_autotools:
@@ -272,7 +271,7 @@ def check_yacsgen(config, directory, logger):
         yacsgen_info = src.product.get_product_config(config, 'YACSGEN')
         yacsgen_dir = yacsgen_info.install_dir
         yacs_src = _("Using YACSGEN from application")
-    elif os.environ.has_key("YACSGEN_ROOT_DIR"):
+    elif "YACSGEN_ROOT_DIR" in os.environ:
         yacsgen_dir = os.getenv("YACSGEN_ROOT_DIR")
         yacs_src = _("Using YACSGEN from environment")
 
@@ -370,6 +369,15 @@ def run(args, runner, logger):
             logger.write(_("not a generated product\n"), 3, False)
             continue
 
+        logger.write(_("\nCleaning generated directories\n"), 3, False)
+        # clean source, build and install directories of the generated product
+        # no verbosity to avoid warning at the first generation, for which dirs don't exist
+        runner.clean(runner.cfg.VARS.application + 
+                  " --products " + pi.name + 
+                  " --generated",
+                  batch=True,
+                  verbose=0,
+                  logger_add_link = logger)
         nbgen += 1
         try:
             result = generate_component_list(runner.cfg,