X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2FrunSalome;h=6c363e1e11323db547dcd5747859124507f749e7;hb=9ed27bb6b3a18d7554fa762bcbfc74d6018843a4;hp=9a133bb9fecfc65a881338d3f53e73cefb952507;hpb=b26ec591dddb0ec8d5987efc86eba5dd0e48f568;p=modules%2Fkernel.git

diff --git a/bin/runSalome b/bin/runSalome
index 9a133bb9f..6c363e1e1 100755
--- a/bin/runSalome
+++ b/bin/runSalome
@@ -1,21 +1,74 @@
-#!/bin/sh
+#!/bin/bash
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+# 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
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+
+###############################################
+############### IMPORTANT NOTE ################
+###############################################
+# The runConsole script is obsolete.          #
+# Please consider the new salome.py launcher. #
+###############################################
+
+
+# **********************************************************
+# This file is used by m4 files in many modules to detect SALOME KERNEL.
+# Its initial purpose (starting salome) can be replaced by new salome.py command.
+# When definitively switching from autotools to Cmake, this file may be removed.
+# **********************************************************
+
 
-export KERNEL_ROOT_DIR=/Salome2/KERNEL_install
 
-export GEOM_ROOT_DIR=/Salome2/GEOM_install
-export MED_ROOT_DIR=/Salome2/MED_install
-export SMESH_ROOT_DIR=/Salome2/SMESH_install
-export SUPERV_ROOT_DIR=/Salome2/SUPERV_install
-export VISU_ROOT_DIR=/Salome2/VISU_install
+${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python ${KERNEL_ROOT_DIR}/bin/salome/runSalome.py $*
 
-python killSalome.py
-python -i runSalome.py GEOM SMESH VISU SUPERV MED
 
+
+
+# -----------------------------------------------------------------------------
+# examples:
+# ---------
+#  $: ${KERNEL_ROOT_DIR}/bin/salome/runSalome
+#
+#     - parameters for launching are taken from SalomeApp.xml;
+#     - if the config file does not exist, it is created with default values.
+#
+#
+#  $: ${KERNEL_ROOT_DIR}/bin/salome/runSalome --modules=GEOM,SMESH,VISU,MED --embedded=registry,study,moduleCatalog,cppContainer --standalone=pyContainer --xterm --killall
+#
+#     parameters from command line supersede those from SalomeApp.xml
+#
+# Some CORBA servers can be launched in the SALOME_Session_Server's process
+# (embedded = same process) or in a separate process (standalone):
+# --> registry,study,moduleCatalog,cppContainer
+# Other CORBA servers could only be launched in separate process (standalone):
+# --> pyContainer
+#
+# $: ${KERNEL_ROOT_DIR}/bin/salome/runSalome -h
+#    help
 # -----------------------------------------------------------------------------
 #
 # l'option -i permet de garder l'interpreteur python ouvert :
 # par defaut, les differents serveurs ouvrent des fenêtres xterm
 # (cf. runSalome.py)
 # le serveur Logger n'est pas obligatoire (commenté dans runSalome.py)
-# 
+#
 # -----------------------------------------------------------------------------