Add obsolescence message

diff --git a/bin/appliskel/runAppli b/bin/appliskel/runAppli
index f0995a967e46ec5057f5f6d01b78e8de9b946efb..497a19549187ff6fee709b2507584d5df3b1431c 100755 (executable)
--- a/bin/appliskel/runAppli
+++ b/bin/appliskel/runAppli
@@ -21,6 +21,16 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+
+echo "##############################################"
+echo "############### IMPORTANT NOTE ###############"
+echo "##############################################"
+echo "# The runAppli script is obsolete.           #"
+echo "# Please consider the new salome.py command. #"
+echo "# More info: cedric.aguerre@edf.fr           #"
+echo "##############################################"
+
+
 APPLI_HOME=`dirname $0`
 
 # --- retrieve APPLI path, relative to $HOME, set ${APPLI}
@@ -46,5 +56,5 @@ if [ $# -ne 0 ] ; then
     ${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python ${KERNEL_ROOT_DIR}/bin/salome/runSalome.py $*
 
 else
-    ${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python ${KERNEL_ROOT_DIR}/bin/salome/runSalome.py 
+    ${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python ${KERNEL_ROOT_DIR}/bin/salome/runSalome.py
 fi

diff --git a/bin/appliskel/runConsole b/bin/appliskel/runConsole
index 301c45dcca3e8022a5eb2c87770460415f51278e..80c154de0628325cb4916be16c88c0ec536ff1cb 100755 (executable)
--- a/bin/appliskel/runConsole
+++ b/bin/appliskel/runConsole
@@ -21,6 +21,16 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+
+echo "##############################################"
+echo "############### IMPORTANT NOTE ###############"
+echo "##############################################"
+echo "# The runConsole script is obsolete.         #"
+echo "# Please consider the new salome.py command. #"
+echo "# More info: cedric.aguerre@edf.fr           #"
+echo "##############################################"
+
+
 APPLI_HOME=`dirname $0`
 
 # --- retrieve APPLI path, relative to $HOME, set ${APPLI}

diff --git a/bin/appliskel/runSession b/bin/appliskel/runSession
index e1616f18b5f1194400308ba7834f8648981395da..a948d9f4860c13a43b3af4391898ea4d840ce2ad 100755 (executable)
--- a/bin/appliskel/runSession
+++ b/bin/appliskel/runSession
@@ -25,6 +25,17 @@
 # Use it with args to run a program : runSession python -i myprog.py
 # Use it without args to run an interactive shell under Salome env
 
+
+echo "##############################################"
+echo "############### IMPORTANT NOTE ###############"
+echo "##############################################"
+echo "# The runSession script is obsolete.         #"
+echo "# Please consider the new salome.py command. #"
+echo "# More info: cedric.aguerre@edf.fr           #"
+echo "##############################################"
+
+
+
 APPLI_HOME=`dirname $0`
 
 NSPORT=last

diff --git a/bin/envSalome.py b/bin/envSalome.py
index 592493b353bc71cc8caa79ea10ea490ede15779c..0feebb118581accd5d7f4675f7ac494dbfaca809 100755 (executable)
--- a/bin/envSalome.py
+++ b/bin/envSalome.py
@@ -22,6 +22,16 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+
+##############################################
+############### IMPORTANT NOTE ###############
+##############################################
+# The envSalome.py script is obsolete.       #
+# Please consider the new salome.py command. #
+# More info: cedric.aguerre@edf.fr           #
+##############################################
+
+
 import os
 import sys
 import setenv

diff --git a/bin/orbmodule.py b/bin/orbmodule.py
index 507c68c3950c41fb90aa762e82ddff7d6283a073..5d06f054ad685dedf747a5a4e7f8eb3597b5b3c5 100755 (executable)
--- a/bin/orbmodule.py
+++ b/bin/orbmodule.py
@@ -33,7 +33,6 @@ from launchConfigureParser import verbose
 
 # Import the stubs for the Naming service
 import CosNaming
-#from runNS import *
 
 # -----------------------------------------------------------------------------
 

diff --git a/bin/runSalome b/bin/runSalome
new file mode 100755 (executable)
index 0000000..d4af1ca
--- /dev/null
+++ b/bin/runSalome
@@ -0,0 +1,78 @@
+#!/bin/bash
+# Copyright (C) 2007-2012  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
+#
+
+
+echo "##############################################"
+echo "############### IMPORTANT NOTE ###############"
+echo "##############################################"
+echo "# The runSalome script is obsolete.          #"
+echo "# Please consider the new salome.py command. #"
+echo "# More info: cedric.aguerre@edf.fr           #"
+echo "##############################################"
+
+# **********************************************************
+# 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.
+# **********************************************************
+
+
+
+#${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python ${KERNEL_ROOT_DIR}/bin/salome/runSalome.py $*
+
+echo "The runSalome script is obsolete."
+echo "Please consider the new salome.py command."
+echo "More info: cedric.aguerre@edf.fr"
+
+
+
+
+# -----------------------------------------------------------------------------
+# 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)
+#
+# -----------------------------------------------------------------------------