From: boulant Date: Wed, 10 Jul 2013 08:25:00 +0000 (+0000) Subject: Removal of the deprecated (and dangerous) appligen utilities X-Git-Tag: B4KillOfAutomake~32 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=af559ed1c6864b4a02d2c4a7101f63f3e71d749b;p=modules%2Fmed.git Removal of the deprecated (and dangerous) appligen utilities --- diff --git a/src/MEDOP/exe/CMakeLists.txt b/src/MEDOP/exe/CMakeLists.txt index f5ab29a26..08ad8c980 100644 --- a/src/MEDOP/exe/CMakeLists.txt +++ b/src/MEDOP/exe/CMakeLists.txt @@ -17,5 +17,4 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -ADD_SUBDIRECTORY(appligen) ADD_SUBDIRECTORY(image2med) diff --git a/src/MEDOP/exe/Makefile.am b/src/MEDOP/exe/Makefile.am index d0e56b7d1..e9d96f926 100644 --- a/src/MEDOP/exe/Makefile.am +++ b/src/MEDOP/exe/Makefile.am @@ -19,4 +19,4 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -SUBDIRS=appligen image2med +SUBDIRS=image2med diff --git a/src/MEDOP/exe/appligen/CMakeLists.txt b/src/MEDOP/exe/appligen/CMakeLists.txt deleted file mode 100644 index e64b93240..000000000 --- a/src/MEDOP/exe/appligen/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2012-2013 CEA/DEN, EDF R&D -# -# 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 -# - -SET(MODULE_NAME med) -SET(prefix ${CMAKE_INSTALL_PREFIX}) - -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config_appli_model.xml.in ${CMAKE_CURRENT_BINARY_DIR}/config_appli_model.xml @ONLY) - -SET(MED_RESOURCES_FILES - ${CMAKE_CURRENT_BINARY_DIR}/config_appli_model.xml - appli-splashscreen.jpg - SalomeApp.xml - ) - -INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_INSTALL_BINS}/med/appligen) - -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/appligen.sh.in ${CMAKE_CURRENT_BINARY_DIR}/appligen.sh @ONLY) - -SET(MED_RESOURCES_FILES2 - ${CMAKE_CURRENT_BINARY_DIR}/appligen.sh - ) - -INSTALL(FILES ${MED_RESOURCES_FILES2} DESTINATION ${SALOME_INSTALL_BINS}/med/appligen PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) diff --git a/src/MEDOP/exe/appligen/Makefile.am b/src/MEDOP/exe/appligen/Makefile.am deleted file mode 100644 index 4962c6809..000000000 --- a/src/MEDOP/exe/appligen/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D -# -# 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 -# - -# author: Guillaume Boulant (EDF/R&D, 2012) - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -appligenbindir = $(bindir)/@MODULE_NAME@/appligen - -dist_appligenbin_DATA= \ - appli-splashscreen.jpg \ - SalomeApp.xml - -nodist_appligenbin_DATA= \ - envappli.sh \ - config_appli.xml - -nodist_appligenbin_SCRIPTS=\ - appligen.sh - -EXTRA_DIST += genenv.sh README.txt - -config_appli.xml: config_appli_model.xml - cat $< | sed \ - -e s~__GEOM_ROOT_DIR__~$(GEOM_ROOT_DIR)~g \ - -e s~__SMESH_ROOT_DIR__~$(SMESH_ROOT_DIR)~g \ - -e s~__BLSURFPLUGIN_ROOT_DIR__~$(BLSURFPLUGIN_ROOT_DIR)~g \ - -e s~__GHS3DPLUGIN_ROOT_DIR__~$(GHS3DPLUGIN_ROOT_DIR)~g \ - -e s~__NETGENPLUGIN_ROOT_DIR__~$(NETGENPLUGIN_ROOT_DIR)~g \ - -e s~__VISU_ROOT_DIR__~$(VISU_ROOT_DIR)~g \ - -e s~__YACS_ROOT_DIR__~$(YACS_ROOT_DIR)~g \ - -e s~__PARAVIS_ROOT_DIR__~$(PARAVIS_ROOT_DIR)~g \ - > tmp; mv tmp $@ - -envappli.sh: - $(srcdir)/genenv.sh envappli.sh - -CLEANFILES = config_appli.xml envappli.sh diff --git a/src/MEDOP/exe/appligen/README.txt b/src/MEDOP/exe/appligen/README.txt deleted file mode 100644 index 133e250e1..000000000 --- a/src/MEDOP/exe/appligen/README.txt +++ /dev/null @@ -1,25 +0,0 @@ -This package contains a set of files that can be used to generate a -SALOME application embedding the XMED module (field manipulation). - -The files are created in the directory: - - /bin/salome//appligen - -Where is the installation directory of the XMED -module. - -To generate a SALOME application, just change directory to go -where you want to install the SALOME application and type the -following command in a standard shell (the SALOME environment -is not required, all paths are "hard" coded in the script): - - $ /bin/salome//appligen/appligen.sh - -This script generates an application in a directory ./appli. -Then type the following command to run a SALOME application -embedding your module: - - $ ./appli/runAppli -k - -You may used this appli to test the functions of XMED through the -usage of the GUI module. diff --git a/src/MEDOP/exe/appligen/SalomeApp.xml b/src/MEDOP/exe/appligen/SalomeApp.xml deleted file mode 100644 index 9ed9fcc7f..000000000 --- a/src/MEDOP/exe/appligen/SalomeApp.xml +++ /dev/null @@ -1,37 +0,0 @@ - -
- - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - -
- diff --git a/src/MEDOP/exe/appligen/appli-splashscreen.jpg b/src/MEDOP/exe/appligen/appli-splashscreen.jpg deleted file mode 100644 index 2e3387bae..000000000 Binary files a/src/MEDOP/exe/appligen/appli-splashscreen.jpg and /dev/null differ diff --git a/src/MEDOP/exe/appligen/appligen.sh.in b/src/MEDOP/exe/appligen/appligen.sh.in deleted file mode 100755 index 10ad757c1..000000000 --- a/src/MEDOP/exe/appligen/appligen.sh.in +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# -# This script installs or updates a SALOME application for testing the -# XMED module. The application is installed in the -# directory ./appli. The configuration file is supposed to be adapted -# to your own environment (see config_appli.xml). -# -# To run this script, you should have first configure your -# shell with the SALOME environment, i.e. source the files -# prerequis.sh and envSalome.sh (or equivalent) that fit -# your configuration. You can alternatively customize the env.sh file -# to fit your SALOME environment and let the script do the job (see -# source below). -# -# (gboulant - 3/2/2011) -# - -here=$(dirname $0) - -# Finalize the configuration xml file - - -# -# Run the appli_gen.py -# -APPLIDIR="./appli" -@KERNEL_ROOT_DIR@/bin/salome/appli_gen.py --prefix=$APPLIDIR --config=$here/config_appli.xml - -# -# Copy customized configuration files in the application -# -cp $here/SalomeApp.xml $APPLIDIR/. - -# This write an executable program that run a medop text interface -# (could be usefull for most of the tests and sometimes for real -# works). -write_medop_exe() { - echo '#!/bin/sh' - echo 'appliroot=$(dirname $0)' - echo 'logfile="/tmp/medop.log"' - echo '$appliroot/runAppli -k -t 2>$logfile' - echo 'xterm -e tail -f $logfile &' - echo '$appliroot/runSession "python -i $appliroot/lib/python2.6/site-packages/salome/xmed/medop.py"' -} - -write_medop_exe > $APPLIDIR/medop.sh -chmod +x $APPLIDIR/medop.sh diff --git a/src/MEDOP/exe/appligen/config_appli_model.xml.in b/src/MEDOP/exe/appligen/config_appli_model.xml.in deleted file mode 100644 index 1d32ba9bb..000000000 --- a/src/MEDOP/exe/appligen/config_appli_model.xml.in +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/MEDOP/exe/appligen/genenv.sh b/src/MEDOP/exe/appligen/genenv.sh deleted file mode 100755 index ae8434334..000000000 --- a/src/MEDOP/exe/appligen/genenv.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D -# -# 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 -# - -# This script creates a source file that defines a SALOME shell -# environment. We assume here that the SALOME environment has been -# previously set, so that the env command get all environment -# variables required for building and executing SALOME. We talk -# about third party software programs and libraries. The environment -# variables defining SALOME module are exluded (i.e. *_ROOT_DIR) -# because they are automatically set when generating a SALOME application.. -# -# The argument is the filepath to be created. -# - -if [ $# == 1 ]; then - ENVAPPLI_SH=$1 -else - ENVAPPLI_SH=envappli.sh -fi - -function header { - echo "#" - echo "# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" - echo "# THIS FILE IS GENERATED from the shell environment used to build the SALOME module." - echo "# IT SHOULD NOT BE EDITED, it is generated for the need of the SALOME application " - echo "# that embeds the module (for test purposes). " - echo "# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" - echo "#" -} -header > $ENVAPPLI_SH -env | grep -v -e PWD -e SalomeAppConfig -e _ROOT_DIR | while read f; do - key=$(echo $f | cut -d"=" -f1) - value=$(echo $f | cut -d"=" -f2-) - - # if the key is a path (LD_LIBRARY_PATH, PATH and PYTHONPATH) then - # we must extends the variable. - if [ $key == "LD_LIBRARY_PATH" -o $key == "PATH" -o $key == "PYTHONPATH" ]; then - echo export $key=\"$value:\$$key\" - else - echo export $key=\"$value\" - fi -done >> $ENVAPPLI_SH