From: crouzet <nicolas.crouzet@cea.fr>
Date: Fri, 8 Nov 2019 09:21:17 +0000 (+0100)
Subject: ajout d'un fichier internal config spécifique à windows
X-Git-Tag: 5.5.0~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=1136b600d92b4193c208c061fc8db0182d58e526;p=tools%2Fsat.git

ajout d'un fichier internal config spécifique à windows
---

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 :
+{
+}