From 516bd7e6d0b7f8bf384c8026f3dcdba02a0bda36 Mon Sep 17 00:00:00 2001 From: barate Date: Thu, 24 Nov 2011 10:26:36 +0000 Subject: [PATCH] Remove unused files from appliskel and update README --- bin/appliskel/CatalogResources.xml | 4 - bin/appliskel/Makefile.am | 9 -- bin/appliskel/README | 52 +++++------ bin/appliskel/SalomeApp.xml | 95 ------------------- bin/appliskel/env.d/atFirst.sh | 83 ----------------- bin/appliskel/env.d/envProducts.sh | 141 ----------------------------- bin/appliskel/env.d/envSalome.sh | 45 --------- bin/appliskel/killCurrentPort | 57 ------------ bin/appliskel/runParam | 27 ------ 9 files changed, 21 insertions(+), 492 deletions(-) delete mode 100644 bin/appliskel/CatalogResources.xml delete mode 100644 bin/appliskel/SalomeApp.xml delete mode 100644 bin/appliskel/env.d/atFirst.sh delete mode 100644 bin/appliskel/env.d/envProducts.sh delete mode 100644 bin/appliskel/env.d/envSalome.sh delete mode 100755 bin/appliskel/killCurrentPort delete mode 100755 bin/appliskel/runParam diff --git a/bin/appliskel/CatalogResources.xml b/bin/appliskel/CatalogResources.xml deleted file mode 100644 index 9e09ed5fc..000000000 --- a/bin/appliskel/CatalogResources.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/bin/appliskel/Makefile.am b/bin/appliskel/Makefile.am index 31d4e416c..babc2c523 100644 --- a/bin/appliskel/Makefile.am +++ b/bin/appliskel/Makefile.am @@ -56,12 +56,3 @@ install-data-hook: @for f in $(dist_appliskel_PYTHON) ; do \ chmod -f a+x $(DESTDIR)$(appliskeldir)/$$f ; \ done - -OBSOLETE_FILES = \ - env.d \ - CatalogResources.xml \ - SalomeApp.xml \ - killCurrentPort \ - runParam - -EXTRA_DIST = $(OBSOLETE_FILES) diff --git a/bin/appliskel/README b/bin/appliskel/README index fbcc09b55..dec94eab2 100644 --- a/bin/appliskel/README +++ b/bin/appliskel/README @@ -22,24 +22,22 @@ See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com ======================================= Set of scripts for a SALOME application ======================================= -*html version of this document is produced with docutils*:: - rest2html < doc.txt > doc.html - -This document corresponds to SALOME2 3.1. (alpha version) - -+-------------------------------------------+ -| **WORK in PROGRESS, INCOMPLETE DOCUMENT** | -+-------------------------------------------+ +This document corresponds to SALOME 6.4.0 SALOME Application concept -------------------------- -See SALOME_Application_ to define your own configuration of SALOME and run it -on one or several computers. This is the recommended way of configuration. - -.. _SALOME_Application: ../../doc/SALOME_Application.html +See the documentation of KERNEL module for more information on SALOME +Application concept and to learn how to define your own configuration of +SALOME and run it on one or several computers. The recommended way to create +a new application is with the script appli_gen.py that can be found in KERNEL +installation. An application has probably already been generated for you if +you downloaded a binary version of SALOME. +To find all the files described below, please refer to a generated +application as some of them are generated automatically and thus are not +present in this appliskel directory. User run scripts ---------------- @@ -67,11 +65,6 @@ runTests with a running SALOME session. runSession tries to use an already existing naming service definition from a running session (hostname & port number). -killCurrentPort - Kills the last SALOME session corresponding to this application, and - intially launched from this computer. - Cleans associated config files. - SALOME internal run scripts --------------------------- @@ -92,7 +85,7 @@ runRemote.sh arguments define the command to execute. -The following files must be adapted to your environment and SALOME Application +The following files can be adapted to your environment and SALOME Application ------------------------------------------------------------------------------ - CatalogResources.xml @@ -101,10 +94,9 @@ The following files must be adapted to your environment and SALOME Application - env.d/envProducts.sh - env.d/envSalome.sh -CatalogRessources.xml - This files describes all the computer the application can use. The given - example is minimal and suppose ${APPLI} is the same relative path - to ${HOME}, on all the computers. A different directory can be set on a +CatalogResources.xml + This files describes all the computers the application can use. The default + file is minimal. A specific application directory can be set on a particular computer with a line:: appliPath="my/specific/path/on/this/computer" @@ -116,23 +108,21 @@ SalomeApp.xml Proposal for env.d scripts ~~~~~~~~~~~~~~~~~~~~~~~~~~ -Each user **must define** his own configuration for these scripts, following -the above rules. **The following is only an example not working as it is**. - -atFirst.sh - Sets the computer configuration not directly related to SALOME, - like useful tools, default PATH. +Each user can define his own configuration for these scripts, following +the above rules. The generated files are good examples to start with. envProducts.sh Sets the SALOME prerequisites. -envSALOME.sh +configSalome.sh Sets all the MODULE_ROOT_DIR that can be used in the SALOME application. - SalomeAppConfig is also defined by:: +configGUI.sh + Sets variables necessary for SALOME GUI. + SalomeAppConfig is defined by:: export SalomeAppConfig=${HOME}/${APPLI} where SalomeAppConfig designates the directory containing SalomeApp.xml. Note that ${APPLI} is already defined by the calling scripts when - env.d/envSalome.sh is sourced. + env.d/configGUI.sh is sourced. diff --git a/bin/appliskel/SalomeApp.xml b/bin/appliskel/SalomeApp.xml deleted file mode 100644 index fcadb01a1..000000000 --- a/bin/appliskel/SalomeApp.xml +++ /dev/null @@ -1,95 +0,0 @@ - -
- - - - - -
-
- - - - - - - - - - - - - -
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - -
-
- - -
- - -
- - -
-
- -
-
- - -
- -
- - -
- diff --git a/bin/appliskel/env.d/atFirst.sh b/bin/appliskel/env.d/atFirst.sh deleted file mode 100644 index a55705987..000000000 --- a/bin/appliskel/env.d/atFirst.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh -# Copyright (C) 2007-2011 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 -# - -#------------------------------------------------ -# to be sourced first, used in following scripts -#------------------------------------------------ -# -export LD_LIBRARY_PATH="." -export PATH="/usr/kerberos/bin:/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/home/prascle/bin:." -export PYTHONPATH="" - -export RAC=${HOME} -export PAKSAL=/opt -export PUB=${RAC}/public -export TARP=${RAC}/tarpublic -export PYPACKAGES=${PUB}/site_packages - -# ------------------------------------------------ -# ---- gdb 5.3 - -export PATH=${PAKSAL}/gdb53/bin:${PATH} -export LD_LIBRARY_PATH=${PAKSAL}/gdb53/lib:${LD_LIBRARY_PATH} - -# ------------------------------------------------ -# ---- ddd 3.3.7 - -export PATH=${PAKSAL}/ddd337/bin:${PATH} -export LD_LIBRARY_PATH=${PAKSAL}/ddd337/lib:${LD_LIBRARY_PATH} - -# ------------------------------------------------ -# --- Java 1.4 - -export JDKHOME=${PUB}/j2sdk_nb/j2sdk1.4.2 -export JAVAHOME=${PUB}/j2sdk_nb/j2sdk1.4.2 -export PATH=${JAVAHOME}/bin:${PATH} -export LD_LIBRARY_PATH=${JAVAHOME}/lib:${LD_LIBRARY_PATH} -export LD_LIBRARY_PATH=${JAVAHOME}/jre/lib/i386:${LD_LIBRARY_PATH} -export LD_LIBRARY_PATH=${JAVAHOME}/jre/lib/i386/client:${LD_LIBRARY_PATH} - -# ------------------------------------------------ -# --- gsl -1.4 - -export GSLHOME=${PAKSAL}/gsl-1.4 -export PATH=${GSLHOME}/bin:${PATH} -export LD_LIBRARY_PATH=${GSLHOME}/lib:${LD_LIBRARY_PATH} - -# ------------------------------------------------ -# --- fltk 1.1.4 - -export FLTKHOME=${PAKSAL}/fltk114 -export PATH=${FLTKHOME}/bin:${PATH} -export LD_LIBRARY_PATH=${FLTKHOME}/lib:${LD_LIBRARY_PATH} - -# ------------------------------------------------ -# --- gmsh 1.48 - -export GMSHHOME=${PAKSAL}/gmsh148 -export PATH=${GMSHHOME}/bin:${PATH} - -# ------------------------------------------------ -# ---- tkcvs, tkdiffb, cvs - -export PATH=${PAKSAL}/tkcvs7.2/bin:${PAKSAL}/cvs1.11.14/bin:${PATH} diff --git a/bin/appliskel/env.d/envProducts.sh b/bin/appliskel/env.d/envProducts.sh deleted file mode 100644 index b08694689..000000000 --- a/bin/appliskel/env.d/envProducts.sh +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/sh -# Copyright (C) 2007-2011 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 -# - -# ------------------------------------------------ -# ---- openpbs -# -export OPENPBS=/optroot/openpbs2316 -export PATH=${OPENPBS}/bin:${PATH} -export LD_LIBRARY_PATH=${OPENPBS}/lib:${LD_LIBRARY_PATH} - -#------------------------------------------------------------------------------ - -export INSTALL_ROOT=/home/prascle/PAL_SALOME141 -#------ gcc ------ -export GCC_ROOT=/usr -export CXX=${GCC_ROOT}/bin/g++ -export CC=${GCC_ROOT}/bin/gcc -## -#------ boost ------ -export BOOSTDIR=${INSTALL_ROOT}/boost-1.30.2 -## - -#------ tcltk ------ -export TCLHOME=/usr - -#------ Python ------ -export PYTHONHOME=/usr -export PYTHONPATH=${PYPACKAGES}:${PYTHONPATH} -## -#------ Qt ------ -#export QTDIR=/usr/lib/qt-3.0.5 -export QTDIR=/usr/lib/qt3-gcc3.2 -export PATH=${PATH}:${QTDIR}/bin -export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${QTDIR}/lib -## -#------ Sip ------ -export SIPDIR=/usr -export PYQTDIR=/usr -## -#------ PyQt ------ -export PYQT_SIPS=/usr/share/sip/qt -export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/python2.2/site-packages -## -#------ Swig ------ -export SWIG_ROOT=${INSTALL_ROOT}/SWIG-1.3.17 -export PATH=${SWIG_ROOT}/bin:${PATH} -export LD_LIBRARY_PATH=${SWIG_ROOT}/lib:${LD_LIBRARY_PATH} -## -#------ OpenCascade ------ -export CASROOT=/opt/CAS52patch -export LD_LIBRARY_PATH=${CASROOT}/Linux/lib:${LD_LIBRARY_PATH} -export PATH=${CASROOT}/Linux/bin:${PATH} -# Variable for Foundation Classes : -export CSF_UnitsLexicon=${CASROOT}/src/UnitsAPI/Lexi_Expr.dat -export CSF_UnitsDefinition=${CASROOT}/src/UnitsAPI/Units.dat -# Variable for DataExchange : -export CSF_SHMessage=${CASROOT}/src/SHMessage -export CSF_XSMessage=${CASROOT}/src/XSMessage -# Variable for Font : -export CSF_MDTVFontDirectory=${CASROOT}/src/FontMFT -export CSF_MDTVTexturesDirectory=${CASROOT}/src/Textures -## -export CSF_LANGUAGE=us -export MMGT_CLEAR=1 -export CSF_EXCEPTION_PROMPT=1 -export CSF_StandardDefaults=${CASROOT}/src/StdResource -export CSF_PluginDefaults=${CASROOT}/src/StdResource -export CSF_XCAFDefaults=${CASROOT}/src/StdResource -export CSF_GraphicShr=${CASROOT}/Linux/lib/libTKOpenGl.so -export CSF_IGESDefaults=${CASROOT}/src/XSTEPResource -export CSF_STEPDefaults=${CASROOT}/src/XSTEPResource -## -#export TCLLIBPATH=$TCLHOME/lib -## -#------ Qwt ------ -export QWTHOME=${INSTALL_ROOT}/qwt-0.4.1 -export LD_LIBRARY_PATH=${QWTHOME}/lib:${LD_LIBRARY_PATH} -## -#------ Hdf ------ -export HDF5HOME=${INSTALL_ROOT}/hdf5-1.4.4 -export PATH=${HDF5HOME}/bin:$PATH -export LD_LIBRARY_PATH=${HDF5HOME}/lib:${LD_LIBRARY_PATH} -## -#------ Med ------ -export MED2HOME=/opt/med2.2.2 -export PATH=${MED2HOME}/bin:${PATH} -export LD_LIBRARY_PATH=${MED2HOME}/lib:${LD_LIBRARY_PATH} -## -#------ Vtk ------ -export VTKHOME=${INSTALL_ROOT}/VTK-4.2.2 -export PATH=${VTKHOME}/bin:${PATH} -export LD_LIBRARY_PATH=${VTKHOME}/lib/vtk:${LD_LIBRARY_PATH} -export PYTHONPATH=${VTKHOME}/lib/vtk:${VTKHOME}/lib/python2.2/site-packages/vtk_python:${PYTHONPATH} -## -#------ netgen ------ -export NETGENROOT=${INSTALL_ROOT}/netgen4.3 -export NETGEN_HOME=${INSTALL_ROOT}/netgen4.3 -## -#------ OmniORB ------ -export OMNIORBDIR=${INSTALL_ROOT}/omniORB-3.0.5 -export OMNIORB_CONFIG=${OMNIORBDIR}/.omniORB.cfg -export PYTHONPATH=${OMNIORBDIR}/lib/python:${OMNIORBDIR}/lib/i586_linux_2.0_glibc2.1:${PYTHONPATH} -export PATH=$OMNIORBDIR/bin/i586_linux_2.0_glibc2.1:$PATH -export LD_LIBRARY_PATH=$OMNIORBDIR/lib/i586_linux_2.0_glibc2.1:$LD_LIBRARY_PATH -## -#------ Numeric ------ -export PYTHONPATH=${INSTALL_ROOT}/Numeric-22.0/lib/python2.2/site-packages/Numeric:${PYTHONPATH} -## -#------ HappyDoc ------ -export PATH=${INSTALL_ROOT}/HappyDoc-r2_1/bin:${PATH} -export PYTHONPATH=${INSTALL_ROOT}/HappyDoc-r2_1/lib/python2.2/site-packages:${PYTHONPATH} -## -#------ Doxygen ------ -export PATH=${INSTALL_ROOT}/doxygen-1.3-rc2/bin:${PATH} -## -#------ Graphviz ------ -export PATH=${INSTALL_ROOT}/graphviz-1.9/bin:${PATH} -export LD_LIBRARY_PATH=${INSTALL_ROOT}/graphviz-1.9/lib/graphviz:${LD_LIBRARY_PATH} -## - -#------------------------------------------------------------------------------ diff --git a/bin/appliskel/env.d/envSalome.sh b/bin/appliskel/env.d/envSalome.sh deleted file mode 100644 index a7d810ee8..000000000 --- a/bin/appliskel/env.d/envSalome.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# Copyright (C) 2007-2011 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 -# - -# --- example to adapt to your own configuration --- -# --- envSalome.sh gives a set of MODULE_ROOT_DIR, to source -# --- you must at least define and export KERNEL_ROOT_DIR -# -REPINST=/home/prascle/SALOME2/Install - -export KERNEL_ROOT_DIR=${REPINST}/KERNEL_V301 - -export GUI_ROOT_DIR=${REPINST}/GUI_V301 -#export SalomeAppConfig=${GUI_ROOT_DIR}/share/salome/resources/gui -export SalomeAppConfig=${HOME}/${APPLI} - -export GEOM_ROOT_DIR=${REPINST}/GEOM_V301 -export MED_ROOT_DIR=${REPINST}/MED_V301 -export SMESH_ROOT_DIR=${REPINST}/SMESH_V301 -export VISU_ROOT_DIR=${REPINST}/VISU_V301 -export NETGENPLUGIN_ROOT_DIR=${REPINST}/NETGENPLUGIN_V301 -export COMPONENT_ROOT_DIR=${REPINST}/COMPONENT_V301 -export PYCALCULATOR_ROOT_DIR=${REPINST}/PYCALCULATOR_V301 -export PYHELLO_ROOT_DIR=${REPINST}/PYHELLO_V301 -export PYTIX_ROOT_DIR=${REPINST}/PYTIX_V301 - diff --git a/bin/appliskel/killCurrentPort b/bin/appliskel/killCurrentPort deleted file mode 100755 index 462a40f69..000000000 --- a/bin/appliskel/killCurrentPort +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# Copyright (C) 2007-2011 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 -# - -# --- retrieve APPLI path, relative to $HOME, set ${APPLI} - -APPLI_HOME=`dirname $0` -export APPLI=`${APPLI_HOME}/getAppliPath.py` - -# --- set the SALOME environment (prerequisites, MODULES_ROOT_DIR...) - -. ${HOME}/${APPLI}/envd ${HOME}/${APPLI} - -# --- find omniORB configuration relative to current session if any - -fileOmniConfig=${HOME}/${APPLI}/USERS/.omniORB_${USER}_last.cfg - -if [ -f $fileOmniConfig ]; then - OMNIORB_CONFIG=${HOME}/${APPLI}/USERS/.omniORB_${USER}_last.cfg - export OMNIORB_CONFIG -fi - -currentPort=`${KERNEL_ROOT_DIR}/bin/salome/NSparam.py port` -echo $currentPort - -# --- kill current salome session -${KERNEL_ROOT_DIR}/bin/salome/shutdownSalome.py -${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py $currentPort - -# --- delete config files - -if [ -s $fileOmniConfig ]; then - refConfig=`ls -l $fileOmniConfig | awk '{print \$NF}'` - if [ -f $refConfig ]; then - rm $refConfig - fi - rm $fileOmniConfig -fi diff --git a/bin/appliskel/runParam b/bin/appliskel/runParam deleted file mode 100755 index a84f6b3eb..000000000 --- a/bin/appliskel/runParam +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# Copyright (C) 2007-2011 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 -# - -./KillCurrentPort - -./runAppli --logger - -- 2.39.2