From fa7f7437590217a4cc842303c177e16445a1d11f Mon Sep 17 00:00:00 2001 From: crouzet Date: Thu, 21 Nov 2019 11:47:49 +0100 Subject: [PATCH] suppression du flag global no_base. desormais seul le flag base sera utilise --- commands/package.py | 2 +- doc/src/commands/compile.rst | 2 +- doc/src/configuration.rst | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/commands/package.py b/commands/package.py index f4b226d..97768f4 100644 --- a/commands/package.py +++ b/commands/package.py @@ -1122,7 +1122,7 @@ def find_application_pyconf(config, application_tmp_dir): 'VARS.salometoolsway + $VARS.sep + ".."') # Prevent from compilation in base - application_pyconf_cfg.APPLICATION.no_base = "yes" + application_pyconf_cfg.APPLICATION.base = "no" #remove products that are not in config (which were filtered by --without_properties) for product_name in application_pyconf_cfg.APPLICATION.products.keys(): diff --git a/doc/src/commands/compile.rst b/doc/src/commands/compile.rst index 1b50caa..c0fc589 100644 --- a/doc/src/commands/compile.rst +++ b/doc/src/commands/compile.rst @@ -78,4 +78,4 @@ The main options are: * **cmake_options** : additional options for cmake. * **nb_proc** : number of jobs to use with make for this product. * **check_install** : allow to specify a list of path (relative to install directory), that sat will check after installation. This flag allow to check an installation is complete. - * **install_dir** : allow to change the default install dir. If the value is set to *'base'*, the product will by default be installed in salomeTool base. Unless no_base was set to 'yes' or base was set to 'no' in application pyconf. + * **install_dir** : allow to change the default install dir. If the value is set to *'base'*, the product will by default be installed in salomeTool base. Unless base was set to 'no' in application pyconf. diff --git a/doc/src/configuration.rst b/doc/src/configuration.rst index 643275b..4f1ec16 100644 --- a/doc/src/configuration.rst +++ b/doc/src/configuration.rst @@ -58,7 +58,6 @@ Globals * verbose : activate verbosity in the compilation * debug : activate debug mode in the compilation, i.e -g option * python3 : 'yes/no' tell sat that the application uses python3 - * no_base : 'yes/no' * base : 'yes/no/name' -- 2.39.2