diff --git a/conf/pycharm_default_configuration.csv b/conf/pycharm_default_configuration.csv index 6fc7cb5..ca2ed80 100644 --- a/conf/pycharm_default_configuration.csv +++ b/conf/pycharm_default_configuration.csv @@ -1,6 +1,7 @@ name,script_path,parameters,folder,default run,./odoo/odoo-bin,--limit-time-real 999999 -c config.conf,run,True run_parallel_test,./script/test/run_parallel_test.py,,test, +robotlibre_devops_update,./odoo/odoo-bin,--limit-time-real 999999 --no-http -c config.conf --stop-after-init --dev cg -d robotlibre -u erplibre_devops,devops, cg_cg,./odoo/odoo-bin,--limit-time-real 999999 --no-http -c config.conf --stop-after-init --dev cg -d code_generator -i code_generator_code_generator,code_generator, cg_cg_template,./odoo/odoo-bin,--limit-time-real 999999 --no-http -c config.conf --stop-after-init --dev cg -d template -i code_generator_template_code_generator,code_generator_template, code_generator_auto_backup,./odoo/odoo-bin,--limit-time-real 999999 --no-http -c config.conf --stop-after-init --dev cg -d code_generator -i code_generator_auto_backup,code_generator, diff --git a/script/ide/pycharm_configuration.py b/script/ide/pycharm_configuration.py index 6b52c5b..cbd7822 100755 --- a/script/ide/pycharm_configuration.py +++ b/script/ide/pycharm_configuration.py @@ -26,6 +26,7 @@ _logger = logging.getLogger(__name__) PROJECT_NAME = os.path.basename(os.getcwd()) IDEA_PATH = "./.idea" +DEFAULT_ODOO_BIN = "./odoo/odoo-bin" # Will be replaced dynamic IDEA_MISC = os.path.join(IDEA_PATH, "misc.xml") IDEA_WORKSPACE = os.path.join(IDEA_PATH, "workspace.xml") VCS_WORKSPACE = os.path.join(IDEA_PATH, "vcs.xml") @@ -35,6 +36,12 @@ PATH_DEFAULT_CONFIGURATION = "./conf/pycharm_default_configuration.csv" PATH_DEFAULT_CONFIGURATION_PRIVATE = ( "./private/pycharm_default_configuration.private.csv" ) +if os.path.isfile(".odoo-version"): + with open(".odoo-version") as txt: + odoo_version = txt.read() + DEFAULT_ODOO_BIN_UPDATE = f"./odoo{odoo_version}/odoo/odoo-bin" +else: + DEFAULT_ODOO_BIN_UPDATE = None def get_config(): @@ -342,6 +349,10 @@ def add_configuration(dct_xml, file_name, config): conf_default = bool(default_conf.get("default")) if conf_default: last_default = f"Python.{conf_name}" + if DEFAULT_ODOO_BIN_UPDATE: + conf_script_path = conf_script_path.replace( + DEFAULT_ODOO_BIN, DEFAULT_ODOO_BIN_UPDATE + ) conf_script_path_replace = ( conf_script_path if not conf_script_path.startswith("./")