From b97756a69da7fce673de9f17b5914d34f8de6289 Mon Sep 17 00:00:00 2001 From: aguerre Date: Mon, 3 Jun 2013 12:48:37 +0000 Subject: [PATCH] Add obsolescence message --- bin/appliskel/runAppli | 12 ++++++- bin/appliskel/runConsole | 10 ++++++ bin/appliskel/runSession | 11 ++++++ bin/envSalome.py | 10 ++++++ bin/orbmodule.py | 1 - bin/runSalome | 78 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 120 insertions(+), 2 deletions(-) create mode 100755 bin/runSalome diff --git a/bin/appliskel/runAppli b/bin/appliskel/runAppli index f0995a967..497a19549 100755 --- 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 301c45dcc..80c154de0 100755 --- 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 e1616f18b..a948d9f48 100755 --- 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 592493b35..0feebb118 100755 --- 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 507c68c39..5d06f054a 100755 --- 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 index 000000000..d4af1ca6e --- /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) +# +# ----------------------------------------------------------------------------- -- 2.39.2