add doc for launcher & application, correct bug on CentOS version

diff --git a/doc/src/commands/application.rst b/doc/src/commands/application.rst
new file mode 100644 (file)
index 0000000..5e414c2
--- /dev/null
+++ b/doc/src/commands/application.rst
@@ -0,0 +1,50 @@
+***********
+application
+***********
+
+Description
+===========
+The **application** command creates a virtual SALOME application.
+Virtual SALOME applications are used to start SALOME when distribution is needed.
+
+Usage
+=====
+* Create an application: ::
+
+    sat application <application>
+    
+  Create the virtual application directory in the salomeTool application directory, i.e. ``$APPLICATION.workdir``
+
+* Give a name to the application: ::
+
+    sat application <application> --name MYAPP
+
+  *Remark*: this option overrides the name given in the virtual_app section of the configuration file (``$APPLICATION.virtual_app.name``).
+
+* Change the directory where the application is created: ::
+
+    sat application <application> --target </my/applications/directory>
+
+* Set a specific SALOME resources catalog (it will be used for the distribution of components on distant machines): ::
+
+    sat application <application> --catalog <path to catalog>
+    
+  Note that the catalog specified will be copied to the application directory.
+
+* Generate the catalog for a list of machines: ::
+
+    sat application <application> --gencat machine,machine2,machine3
+
+  This will create a catalog by querying each machine through ssh protocol (memory, number of processor) with ssh.
+
+
+Configuration
+=============
+The virtual application can be configured with the virtual_app section of the configutation file.
+* APPLICATION.virtual_app
+
+  * **name**: name of the launcher (to replace the default runAppli).
+  * **application_name**: (optional) the name of the virtual application directory.
+
+    * if missing the default value is '$name + _appli'.
+    

diff --git a/doc/src/commands/launcher.rst b/doc/src/commands/launcher.rst
new file mode 100644 (file)
index 0000000..a4912a9
--- /dev/null
+++ b/doc/src/commands/launcher.rst
@@ -0,0 +1,42 @@
+********
+launcher
+********
+
+Description
+===========
+The **launcher** command creates a SALOME launcher (a python command to start SALOME).
+
+
+Usage
+=====
+* Create a launcher: ::
+
+    sat launcher <application>
+    
+  Generate a launcher in the application directory, i.e ``$APPLICATION.workdir``.
+
+* Create a launcher with a given name ::
+
+    sat launcher <application>
+
+  The launcher will called ZeLauncher.
+
+* Set a specific resources catalog: ::
+
+    sat launcher <application>
+    
+  Note that the catalog specified will be copied to the profile directory.
+
+* Generate the catalog for a list of machines: ::
+
+    sat launcher <application>
+
+  This will create a catalog by querying each machine (memory, number of processor) with ssh.
+
+Configuration
+=============
+* APPLICATION.profile
+
+  * **product**: the name of the profile product (the product in charge of holding the application stuff, like logos, splashscreen)
+  * **launcher_name**: the name of the launcher.
+

diff --git a/doc/src/index.rst b/doc/src/index.rst
index 9ac0362a8b0b252667ac601f3041a40050ee0e2a..9ce9148b167d04c7eb33d5c30fa5ef7a4ab0aefb 100644 (file)
--- a/doc/src/index.rst
+++ b/doc/src/index.rst
@@ -29,6 +29,8 @@ List of Commands
    config <commands/config>
    prepare <commands/prepare>
    compile <commands/compile>
+   launcher <commands/launcher>
+   application <commands/application>
    log <commands/log>
 
 Code documentation

diff --git a/src/architecture.py b/src/architecture.py
index 8e16c226caaf641fea149f215317bcf798ac38cb..c2cd5ba99c1230cf191804d3b6c6702699844699 100644 (file)
--- a/src/architecture.py
+++ b/src/architecture.py
@@ -114,6 +114,8 @@ def get_distrib_version(distrib, codes):
         if version in codes[distrib]:
             version = codes[distrib][version]
 
+    if distrib == "CO":
+        version=version[0]  #for centos, we only care for major version
     return version
 
 def get_python_version():
@@ -139,4 +141,4 @@ def get_nb_proc():
         nb_proc=multiprocessing.cpu_count()
     except :
         nb_proc=int(os.sysconf('SC_NPROCESSORS_ONLN'))
-    return nb_proc
\ No newline at end of file
+    return nb_proc

diff --git a/src/internal_config/distrib.pyconf b/src/internal_config/distrib.pyconf
index 77cefc2dff344de9b5b55e7ccd40e061a02f206a..1d15c712643b433fd39829d5e0491478a1d1eaff 100644 (file)
--- a/src/internal_config/distrib.pyconf
+++ b/src/internal_config/distrib.pyconf
@@ -67,7 +67,7 @@ VERSIONS :
     }
     "CO":
     {
-        "7.1.1503": "7.1"
+        "7.1.1503": "7"
         "7.2.1511": "7"
         "7.3.1611": "7"
         "6.1" : "6"