Add the base command

diff --git a/commands/base.py b/commands/base.py
new file mode 100644 (file)
index 0000000..9f1ac4f
--- /dev/null
+++ b/commands/base.py
@@ -0,0 +1,111 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+#  Copyright (C) 2010-2012  CEA/DEN
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+
+import os
+
+import src
+
+# Define all possible option for the shell command :  sat base <options>
+parser = src.options.Options()
+parser.add_option('s', 'set', 'string', 'base_path',
+    _('The path directory to use as base.'), None)
+
+def set_base(config, path, site_file_path, logger):
+    # Update the site.pyconf file
+    try:
+        site_pyconf_cfg = src.pyconf.Config(site_file_path)
+        site_pyconf_cfg.SITE.base = str(path)
+        ff = open(site_file_path, 'w')
+        site_pyconf_cfg.__save__(ff, 1)
+        ff.close()
+        config.SITE.base = str(path)
+    except Exception as e:
+        err = str(e)
+        msg = _("Unable to update the site.pyconf file: %s\n" % err)
+        logger.write(msg, 1)
+        return 1
+    
+    display_base_path(config, logger)
+    
+    return 0
+
+
+def display_base_path(config, logger):
+    info = [(_("Base path"), config.SITE.base)]
+    src.print_info(logger, info)
+
+def description():
+    '''method that is called when salomeTools is called with --help option.
+    
+    :return: The text to display for the base command description.
+    :rtype: str
+    '''
+    return _("Display or set the base where to put installations of base "
+             "products")
+  
+def run(args, runner, logger):
+    '''method that is called when salomeTools is called with base parameter.
+    '''
+    
+    # Parse the options
+    (options, args) = parser.parse_args(args)
+    
+    # Get the path to the site.pyconf file that contain the base path
+    site_file_path = os.path.join(runner.cfg.VARS.salometoolsway,
+                                  "data",
+                                  "site.pyconf")
+    
+    # If the option set is passed
+    if options.base_path:
+        # Get the path
+        path = src.Path(options.base_path)
+        
+        # If it is a file, do nothing and return error
+        if path.isfile():
+            msg = _("Error: The given path is a file. Please provide a path to "
+                    "a directory")
+            logger.write(src.printcolors.printcError(msg), 1)
+            return 1
+        
+        # If it is an existing directory, set the base to it
+        if path.exists() and path.isdir():
+            # Set the base in the site.pyconf file
+            res = set_base(runner.cfg, path, site_file_path, logger)
+            return res
+        
+        # Try to create the given path
+        try:
+            src.ensure_path_exists(str(path))
+        except Exception as e:
+            err = src.printcolors.printcError(str(e))
+            msg = _("Unable to create the directory %s: %s\n" % (str(path),
+                                                                 err))
+            logger.write(msg, 1)
+            return 1
+        
+        # Set the base in the site.pyconf file
+        res = set_base(runner.cfg, path, site_file_path, logger)
+        return res
+    
+    # Display the base that is in the site.pyconf file
+    display_base_path(runner.cfg, logger)
+    if not options.base_path:
+        logger.write(_("To change the value of the base path, use the --set"
+                       " option.\n"), 2)
+    
+    return
\ No newline at end of file

diff --git a/commands/compile.py b/commands/compile.py
index dc54ce6391c84ae093bdff1143841b70ac4c7451..d2d157711b9d662ef552bbd5af48140043510c02 100644 (file)
--- a/commands/compile.py
+++ b/commands/compile.py
@@ -308,7 +308,10 @@ def compile_all_products(sat, config, options, products_infos, logger):
             log_step(logger, header, "CLEAN BUILD AND INSTALL")
             sat.clean(config.VARS.application + 
                       " --products " + p_name + 
-                      " --build --install", batch=True, verbose=0)
+                      " --build --install",
+                      batch=True,
+                      verbose=0,
+                      logger_add_link = logger)
         
         # Clean the the install directory 
         # if the corresponding option was called
@@ -316,7 +319,10 @@ def compile_all_products(sat, config, options, products_infos, logger):
             log_step(logger, header, "CLEAN INSTALL")
             sat.clean(config.VARS.application + 
                       " --products " + p_name + 
-                      " --install", batch=True, verbose=0)
+                      " --install",
+                      batch=True,
+                      verbose=0,
+                      logger_add_link = logger)
         
         # Check if it was already successfully installed
         if src.product.check_installation(p_info):
@@ -354,7 +360,10 @@ def compile_all_products(sat, config, options, products_infos, logger):
                          5)
             sat.clean(config.VARS.application + 
                       " --products " + p_name + 
-                      " --install", batch=True, verbose=0)
+                      " --install",
+                      batch=True,
+                      verbose=0,
+                      logger_add_link = logger)
             res += 1
             
         # Log the result

diff --git a/src/__init__.py b/src/__init__.py
index 376ff1fd674513b7dde5681cc25ef128997a109c..fb5316936c1d56348647adfde5c5f649821eef05 100644 (file)
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -193,6 +193,9 @@ class Path:
     def isdir(self):
         return os.path.isdir(self.path)
 
+    def isfile(self):
+        return os.path.isfile(self.path)
+
     def list(self):
         return [Path(p) for p in os.listdir(self.path)]