From 8df9ad959dbb44aa07a5a62ce77725bb37385c6b Mon Sep 17 00:00:00 2001 From: SRE Date: Fri, 7 Apr 2017 16:22:16 +0200 Subject: [PATCH] add an option to clean build after compilation. See http://is149532.intra.cea.fr/plugins/tracker/?aid=2193 --- commands/compile.py | 17 +++++++++++++++-- complete_sat.sh | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/commands/compile.py b/commands/compile.py index c7d0f2d..e4a6449 100644 --- a/commands/compile.py +++ b/commands/compile.py @@ -54,6 +54,9 @@ parser.add_option('', 'stop_first_fail', 'boolean', 'stop_first_fail', _( parser.add_option('', 'check', 'boolean', 'check', _( "Optional: execute the unit tests after compilation"), False) +parser.add_option('', 'clean_build_after', 'boolean', 'clean_build_after', + _('Optional: remove the build directory after successful compilation'), False) + def get_products_list(options, cfg, logger): '''method that gives the product list with their informations from configuration regarding the passed options. @@ -377,7 +380,17 @@ def compile_all_products(sat, config, options, products_infos, logger): batch=True, verbose=0, logger_add_link = logger) - + else: + # Clean the build directory if the compilation and tests succeed + if options.clean_build_after: + log_step(logger, header, "CLEAN BUILD") + sat.clean(config.VARS.application + + " --products " + p_name + + " --build", + batch=True, + verbose=0, + logger_add_link = logger) + # Log the result if res_prod > 0: logger.write("\r%s%s" % (header, " " * len_end_line), 3) @@ -687,4 +700,4 @@ def run(args, runner, logger): code = res if code != 0: code = 1 - return code \ No newline at end of file + return code diff --git a/complete_sat.sh b/complete_sat.sh index 29ae207..c21748b 100755 --- a/complete_sat.sh +++ b/complete_sat.sh @@ -204,7 +204,7 @@ _salomeTools_complete() return 0 ;; compile) - opts="--products --with_fathers --with_children --clean_all --make_flags --show --stop_first_fail --check" + opts="--products --with_fathers --with_children --clean_all --make_flags --show --stop_first_fail --check --clean_build_after" COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; -- 2.39.2