From 1136b600d92b4193c208c061fc8db0182d58e526 Mon Sep 17 00:00:00 2001 From: crouzet Date: Fri, 8 Nov 2019 10:21:17 +0100 Subject: [PATCH] =?utf8?q?ajout=20d'un=20fichier=20internal=20config=20sp?= =?utf8?q?=C3=A9cifique=20=C3=A0=20windows?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- commands/config.py | 8 +++++-- src/internal_config/salomeTools_win.pyconf | 26 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 src/internal_config/salomeTools_win.pyconf diff --git a/commands/config.py b/commands/config.py index 0e1c1a3..c089074 100644 --- a/commands/config.py +++ b/commands/config.py @@ -261,8 +261,12 @@ class ConfigManager: src.pyconf.streamOpener = ConfigOpener([ osJoin(cfg.VARS.srcDir, 'internal_config')]) try: - internal_cfg = src.pyconf.Config(open( osJoin(cfg.VARS.srcDir, - 'internal_config', 'salomeTools.pyconf'))) + if src.architecture.is_windows(): # special internal config for windows + internal_cfg = src.pyconf.Config(open( osJoin(cfg.VARS.srcDir, + 'internal_config', 'salomeTools_win.pyconf'))) + else: + internal_cfg = src.pyconf.Config(open( osJoin(cfg.VARS.srcDir, + 'internal_config', 'salomeTools.pyconf'))) except src.pyconf.ConfigError as e: raise src.SatException(_("Error in configuration file:" " salomeTools.pyconf\n %(error)s") % \ diff --git a/src/internal_config/salomeTools_win.pyconf b/src/internal_config/salomeTools_win.pyconf new file mode 100644 index 0000000..340a569 --- /dev/null +++ b/src/internal_config/salomeTools_win.pyconf @@ -0,0 +1,26 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +INTERNAL : +{ + sat_version : "5.3.0" + config : + { + copy_prefix : "LOCAL_" + install_dir : "W64" + binary_dir : "BIN-" + single_install_dir : "EXT" + } + log : + { + not_shown_commands : ["log"] + } + command : + { + pip_download : "python -m pip download --disable-pip-version-check" + pip_install : "python -m pip install --disable-pip-version-check --no-index" + } +} +PRODUCTS : +{ +} -- 2.30.2