From db7ffa492de49ed669d9faa301ccbf7456c58cbf Mon Sep 17 00:00:00 2001 From: Renaud Barate Date: Fri, 11 Jun 2010 13:46:08 +0000 Subject: [PATCH] Fixed copyrights and removed unused files --- INSTALL | 1 - Makefile.am | 14 +--- README | 18 ----- adm_local/Makefile.am | 5 +- adm_local/unix/Makefile.am | 5 +- adm_local/unix/config_files/Makefile.am | 5 +- .../unix/config_files/check_GENERICSOLVER.m4 | 5 +- adm_local/unix/make_common_starter.am | 5 +- bin/Makefile.am | 35 ---------- bin/VERSION.in | 1 - bin/myrunSalome.py | 54 --------------- bin/runAppli.in | 67 ------------------- build_configure | 11 +-- clean_configure | 5 +- configure.ac | 17 +---- doc/Makefile.am | 5 +- idl/GENERICSOLVER_Gen.idl | 5 +- idl/Makefile.am | 5 +- resources/GENERICSOLVERCatalog.xml.in | 5 +- resources/Makefile.am | 11 +-- resources/SalomeApp.xml | 5 +- src/GENERICSOLVER/GENERICSOLVER.py | 5 +- src/GENERICSOLVER/Makefile.am | 11 +-- src/GENERICSOLVERGUI/GENERICSOLVERGUI.py | 11 +-- src/GENERICSOLVERGUI/GENERICSOLVER_icons.ts | 5 +- src/GENERICSOLVERGUI/GENERICSOLVER_msg_en.ts | 5 +- src/GENERICSOLVERGUI/Makefile.am | 11 +-- src/Makefile.am | 10 +-- 28 files changed, 31 insertions(+), 311 deletions(-) delete mode 100644 bin/Makefile.am delete mode 100644 bin/VERSION.in delete mode 100755 bin/myrunSalome.py delete mode 100644 bin/runAppli.in diff --git a/INSTALL b/INSTALL index d742aa1..e69de29 100644 --- a/INSTALL +++ b/INSTALL @@ -1 +0,0 @@ -SALOME2 : GENERICSOLVER module (sample) diff --git a/Makefile.am b/Makefile.am index 151d0ec..f46e4fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2010 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 +# Copyright (C) 2009-2010 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 @@ -19,19 +16,14 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# -* Makefile *- -# Author : Patrick GOLDBRONN (CEA) -# Date : 28/06/2001 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# $Header: -# + include $(top_srcdir)/adm_local/unix/make_common_starter.am ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ -I ${GUI_ROOT_DIR}/adm_local/unix/config_files -SUBDIRS = idl adm_local resources src bin doc +SUBDIRS = idl adm_local resources src doc DISTCLEANFILES = a.out aclocal.m4 configure diff --git a/README b/README index 14cc271..e69de29 100644 --- a/README +++ b/README @@ -1,18 +0,0 @@ -This module is a Salome example of a module that is interfaced with MED library. - -Installation and compilation is like every Salome modules : - src_dir/build_configure - mkdir build_dir - mkdir instal_dir - cd build_dir - src_dir/configure --prefix=instal_dir - make - make install - -To check Calculator component, you can use CALCULATOR_TEST.py script, -or SUPERVISION graph src_dir/CALCULATOR/graphe1.py - - -Documentation can be found in /doc directory. It was written in sxw format (openoffice) and was converted in pdf. - -Implementation is in /src/CALCULATOR directory. It was tested on redhat8 - using gcc 3.2 diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 484932a..d039091 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2010 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 +# Copyright (C) 2009-2010 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 diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index c860cec..8bcbdc9 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2010 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 +# Copyright (C) 2009-2010 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 diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index 0a30aee..78a6ac1 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2010 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 +# Copyright (C) 2009-2010 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 diff --git a/adm_local/unix/config_files/check_GENERICSOLVER.m4 b/adm_local/unix/config_files/check_GENERICSOLVER.m4 index 3e89d84..8cf1f56 100644 --- a/adm_local/unix/config_files/check_GENERICSOLVER.m4 +++ b/adm_local/unix/config_files/check_GENERICSOLVER.m4 @@ -1,7 +1,4 @@ -dnl Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2009-2010 EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 5c410d1..2acb650 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2010 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 +# Copyright (C) 2009-2010 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 diff --git a/bin/Makefile.am b/bin/Makefile.am deleted file mode 100644 index 0921423..0000000 --- a/bin/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2007-2010 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 -# -# -* Makefile *- -# Author : Guillaume Boulant (CSSI) -# Module : COMPONENT -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -dist_salomescript_SCRIPTS = \ - myrunSalome.py - -nodist_salomescript_SCRIPTS = \ - runAppli - -nodist_salomescript_DATA = \ - VERSION diff --git a/bin/VERSION.in b/bin/VERSION.in deleted file mode 100644 index 5edbdfa..0000000 --- a/bin/VERSION.in +++ /dev/null @@ -1 +0,0 @@ -THIS IS SALOME - GENERICSOLVER VERSION: @VERSION@ diff --git a/bin/myrunSalome.py b/bin/myrunSalome.py deleted file mode 100755 index a8307ff..0000000 --- a/bin/myrunSalome.py +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (C) 2007-2010 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 -# -#!/usr/bin/env python -# -def test(clt): - """ - Test function that creates an instance of GENERICSOLVER component - usage : genericsolver=test(clt) - """ - # create an LifeCycleCORBA instance - import LifeCycleCORBA - lcc = LifeCycleCORBA.LifeCycleCORBA(clt.orb) - import GENERICSOLVER_ORB - genericsolver = lcc.FindOrLoadComponent("FactoryServerPy", "GENERICSOLVER") - return genericsolver - -# - -if __name__ == "__main__": - import user - from runSalome import * - clt,args = main() - - # - # Impression arborescence Naming Service - # - - if clt != None: - print - print " --- registered objects tree in Naming Service ---" - clt.showNS() - session=clt.waitNS("/Kernel/Session") - catalog=clt.waitNS("/Kernel/ModulCatalog") - import socket - container = clt.waitNS("/Containers/" + socket.gethostname().split('.')[0] + "/FactoryServerPy") diff --git a/bin/runAppli.in b/bin/runAppli.in deleted file mode 100644 index 9694387..0000000 --- a/bin/runAppli.in +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# Copyright (C) 2007-2010 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 -# - -if [ -z "${KERNEL_ROOT_DIR}" ] ; then -export KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ -fi -if [ -z "${GENERICSOLVER_ROOT_DIR}" ] ; then -export GENERICSOLVER_ROOT_DIR=@prefix@ -fi - -searchFreePort() { - echo -n "Searching for a free port for naming service: " - export NSPORT=2810 - local limit=$NSPORT - let limit=limit+100 - while [ 1 ] - do - aRes=`netstat -ltn | grep -E :${NSPORT}` - if [ -z "$aRes" ]; then - echo ${NSPORT} - Ok - local myhost=`hostname` - export OMNIORB_CONFIG=${HOME}/.omniORB_${myhost}_${NSPORT}.cfg - local initref="NameService=corbaname::"`hostname`":$NSPORT" - if [[ `python -c "import CORBA; print CORBA.ORB_ID"` = "omniORB4" ]]; then - echo "InitRef = $initref" > $OMNIORB_CONFIG - else - echo "ORBInitRef $initref" > $OMNIORB_CONFIG - fi - break - fi - echo -n "${NSPORT} " - if [[ $NSPORT -eq $limit ]] ; then - echo - echo "Can't find a free port to launch omniNames" - echo "Try to kill the running servers and then launch SALOME again." - exit - fi - let NSPORT=NSPORT+1 - done -} - -searchFreePort - - -${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $GENERICSOLVER_ROOT_DIR/bin/salome/myrunSalome.py --modules=GENERICSOLVER --killall - - diff --git a/build_configure b/build_configure index b99ad33..1b5fd31 100755 --- a/build_configure +++ b/build_configure @@ -1,8 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2010 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 +# Copyright (C) 2009-2010 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 @@ -20,12 +17,6 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Tool for updating list of .in file for the SALOME project -# and regenerating configure script -# Author : -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Date : 10/10/2002 -# ORIG_DIR=`pwd` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` diff --git a/clean_configure b/clean_configure index f72624e..eb6852b 100755 --- a/clean_configure +++ b/clean_configure @@ -1,8 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2010 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 +# Copyright (C) 2009-2010 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 diff --git a/configure.ac b/configure.ac index a3b2bf9..4c8b8d2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2010 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 +# Copyright (C) 2009-2010 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 @@ -19,13 +16,8 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author : Marc Tajchman (CEA) -# Date : 28/06/2001 -# Modified by : Patrick GOLDBRONN (CEA) -# Modified by : Marc Tajchman (CEA) -# Modified by : Renaud Barate (EDF) -# -AC_INIT([Salome2 Project GENERICSOLVER module], [5.1.4], [webmaster.salome@opencascade.com], [SalomeGENERICSOLVER]) + +AC_INIT([Salome Project GENERICSOLVER module], [5.1.4], [webmaster.salome@opencascade.com], [SalomeGENERICSOLVER]) AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -216,9 +208,6 @@ AC_OUTPUT([ \ adm_local/Makefile \ adm_local/unix/Makefile \ adm_local/unix/config_files/Makefile \ - bin/VERSION \ - bin/runAppli \ - bin/Makefile \ doc/Makefile \ src/Makefile \ src/GENERICSOLVER/Makefile \ diff --git a/doc/Makefile.am b/doc/Makefile.am index 91d2ca5..0dabbdb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2010 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 +# Copyright (C) 2009-2010 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 diff --git a/idl/GENERICSOLVER_Gen.idl b/idl/GENERICSOLVER_Gen.idl index bc040e2..13c324f 100644 --- a/idl/GENERICSOLVER_Gen.idl +++ b/idl/GENERICSOLVER_Gen.idl @@ -1,7 +1,4 @@ -// Copyright (C) 2007-2010 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 +// Copyright (C) 2009-2010 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 diff --git a/idl/Makefile.am b/idl/Makefile.am index 22e6fef..7f910db 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2010 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 +# Copyright (C) 2009-2010 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 diff --git a/resources/GENERICSOLVERCatalog.xml.in b/resources/GENERICSOLVERCatalog.xml.in index e6c1cb4..c0b8b5a 100644 --- a/resources/GENERICSOLVERCatalog.xml.in +++ b/resources/GENERICSOLVERCatalog.xml.in @@ -1,9 +1,6 @@