From: Serge Rehbinder <serge.rehbinder@cea.fr>
Date: Thu, 2 Jun 2016 08:55:31 +0000 (+0200)
Subject: Add the run command
X-Git-Tag: 5.0.0a0~35
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a5f19be3a03c0f9a32dcad16285174f51553a77c;hp=d6d558300b7f60085e211f221c5c1cf9f8b037e0;p=tools%2Fsat.git

Add the run command
---

diff --git a/commands/run.py b/commands/run.py
new file mode 100644
index 0000000..d5680bd
--- /dev/null
+++ b/commands/run.py
@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+#  Copyright (C) 2010-2013  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 subprocess
+
+import src
+
+
+def description():
+    '''method that is called when salomeTools is called with --help option.
+    
+    :return: The text to display for the run command description.
+    :rtype: str
+    '''
+    return _("This command runs the application launcher"
+             " with the given arguments.")
+
+def run(args, runner, logger):
+    '''method that is called when salomeTools is called with run parameter.
+    '''
+
+    # check for product
+    src.check_config_has_application(runner.cfg)
+
+    # check for profile
+    src.check_config_has_profile(runner.cfg)
+
+    # Determine launcher path 
+    launcher_name = runner.cfg.APPLICATION.profile.launcher_name
+    launcher_dir = runner.cfg.APPLICATION.workdir
+    
+    # Check the launcher existence
+    if launcher_name not in  os.listdir(launcher_dir):
+        profile_name = runner.cfg.APPLICATION.profile.module
+        profile_install_dir = src.product.get_product_config(runner.cfg,
+                                                    profile_name).install_dir
+        launcher_dir = os.path.join(profile_install_dir, 'bin', 'salome')
+          
+    launcher_path = os.path.join(launcher_dir, launcher_name)
+    launcher_path = os.path.abspath(launcher_path)
+
+    if not os.path.exists(launcher_path):
+        message = _("The launcher at path %s is missing.\nDid you run the"
+                    " command 'sat launcher' ?\n") % launcher_path
+        raise src.SatException(message)
+
+    # Determine the command to launch (add the additional arguments)
+    command = launcher_path + " " + " ".join(args)
+
+    # Print the command
+    src.printcolors.print_value(logger, _("Executed command"), command, 2)
+    logger.write(_("Launching ...\n"))
+    logger.flush()
+    
+    # Run the launcher
+    subprocess.call(command,
+                    shell=True,
+                    stdout=logger.logTxtFile,
+                    stderr=subprocess.STDOUT)
+    
+    # Display information : how to get the logs
+    messageFirstPart = _("\nEnd of execution. To see the traces, "
+                         "please tap the following command :\n")
+    messageSecondPart = src.printcolors.printcLabel(
+                                            runner.cfg.VARS.salometoolsway +
+                                            os.sep +
+                                            "sat log " +
+                                            runner.cfg.VARS.application + "\n")
+    logger.write("  %s\n" %(messageFirstPart + messageSecondPart), 2)
+    
+    return 0
diff --git a/src/compilation.py b/src/compilation.py
index 86775f4..153d748 100644
--- a/src/compilation.py
+++ b/src/compilation.py
@@ -84,7 +84,7 @@ class Builder:
 
         # add products in depend and opt_depend list recursively
         environ_info = src.product.get_product_dependencies(self.config, self.product_info)
-        environ_info.append(self.product_info.name)
+        #environ_info.append(self.product_info.name)
 
         # create build environment
         self.build_environ = src.environment.SalomeEnviron(self.config, src.environment.Environ(dict(os.environ)), True)