From: vsr Date: Wed, 3 Dec 2014 12:08:49 +0000 (+0300) Subject: Issue 0022816: duplicated files X-Git-Tag: V7_5_1b1~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c8ea84fe48b6479d17056205b2e1a0095194dff3;p=modules%2Fhexablock.git Issue 0022816: duplicated files Rename scripts, to avoid duplicated file names --- diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index 4e27cf0..9950b51 100755 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -18,14 +18,14 @@ # SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) -SALOME_CONFIGURE_FILE(runAppli.in runAppli INSTALL ${SALOME_INSTALL_BINS}) +SALOME_CONFIGURE_FILE(runHEXABLOCK.in runHEXABLOCK INSTALL ${SALOME_INSTALL_BINS}) # =============================================================== # Files to be installed # =============================================================== SET(_bin_scripts - myrunSalome.py + runHEXABLOCK.py ) -SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS}) \ No newline at end of file +SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS}) diff --git a/bin/myrunSalome.py b/bin/myrunSalome.py deleted file mode 100755 index dc05e73..0000000 --- a/bin/myrunSalome.py +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env python -# Copyright (C) 2009-2014 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, or (at your option) any later version. -# -# 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 -# - -def test(clt): - """ - Test function that creates an instance of HEXABLOCK component - usage : hexablock = test(clt) - """ - # create an LifeCycleCORBA instance - import LifeCycleCORBA - lcc = LifeCycleCORBA.LifeCycleCORBA(clt.orb) - import HEXABLOCK_ORB - hexablock = lcc.FindOrLoadComponent("FactoryServer", "HEXABLOCK") - return hexablock - -# - -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] + "/FactoryServer") diff --git a/bin/runAppli.in b/bin/runAppli.in deleted file mode 100755 index 080a320..0000000 --- a/bin/runAppli.in +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# Copyright (C) 2009-2014 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, or (at your option) any later version. -# -# 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 "${HEXABLOCK_ROOT_DIR}" ] ; then -export HEXABLOCK_ROOT_DIR=@CMAKE_INSTALL_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 $HEXA_ROOT_DIR/bin/salome/myrunSalome.py --modules=HEXA --killall diff --git a/bin/runHEXABLOCK.in b/bin/runHEXABLOCK.in new file mode 100755 index 0000000..68ed4c4 --- /dev/null +++ b/bin/runHEXABLOCK.in @@ -0,0 +1,65 @@ +#!/bin/sh +# Copyright (C) 2009-2014 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, or (at your option) any later version. +# +# 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 "${GEOM_ROOT_DIR}" ] ; then +export GEOM_ROOT_DIR=@GEOM_ROOT_DIR@ +fi +if [ -z "${HEXABLOCK_ROOT_DIR}" ] ; then +export HEXABLOCK_ROOT_DIR=@CMAKE_INSTALL_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 $HEXABLOCK_ROOT_DIR/bin/salome/runHEXABLOCK.py --modules=GEOM,HEXABLOCK --killall diff --git a/bin/runHEXABLOCK.py b/bin/runHEXABLOCK.py new file mode 100755 index 0000000..dc05e73 --- /dev/null +++ b/bin/runHEXABLOCK.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python +# Copyright (C) 2009-2014 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, or (at your option) any later version. +# +# 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 +# + +def test(clt): + """ + Test function that creates an instance of HEXABLOCK component + usage : hexablock = test(clt) + """ + # create an LifeCycleCORBA instance + import LifeCycleCORBA + lcc = LifeCycleCORBA.LifeCycleCORBA(clt.orb) + import HEXABLOCK_ORB + hexablock = lcc.FindOrLoadComponent("FactoryServer", "HEXABLOCK") + return hexablock + +# + +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] + "/FactoryServer")