X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2Fappliskel%2Fsalome;h=e61b6cbab6c3fcfb9d96043a328ebec13427d381;hb=3326f1f9ca282cca567edc2946b02140e39446b2;hp=7914df12466de675f2934d49a2c1478040dd90be;hpb=128e8a9c4f218409f4a0471313677a4c395dcf29;p=modules%2Fkernel.git diff --git a/bin/appliskel/salome b/bin/appliskel/salome index 7914df124..e61b6cbab 100755 --- a/bin/appliskel/salome +++ b/bin/appliskel/salome @@ -1,5 +1,24 @@ #! /usr/bin/env python +# Copyright (C) 2013-2014 CEA/DEN, EDF R&D, OPEN CASCADE +# +# 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 +# + import os import sys @@ -21,7 +40,7 @@ def __initialize(): # define folder to store omniorb config (initially in virtual application folder) try: - from salomeLauncherUtils import setOmniOrbUserPath + from salomeContextUtils import setOmniOrbUserPath setOmniOrbUserPath() except Exception, e: print e @@ -33,32 +52,32 @@ def main(args): __initialize() if args == ['--help']: - from salomeRunner import usage + from salomeContext import usage usage() sys.exit(0) - from salomeLauncherUtils import getConfigFileNames + from salomeContextUtils import getConfigFileNames configFileNames, args, unexisting = getConfigFileNames(args, checkExistence=True) if len(unexisting) > 0: print "ERROR: unexisting configuration file(s): " + ', '.join(unexisting) sys.exit(1) - # Create a SalomeRunner which parses configFileNames to initialize environment + # Create a SalomeContext which parses configFileNames to initialize environment try: - from salomeRunner import SalomeRunner, SalomeRunnerException - runner = SalomeRunner(configFileNames) + from salomeContext import SalomeContext, SalomeContextException + context = SalomeContext(configFileNames) # Here set specific variables, if needed - # runner.addToPath('mypath') - # runner.addToLdLibraryPath('myldlibrarypath') - # runner.addToPythonPath('mypythonpath') - # runner.setEnviron('myvarname', 'value') + # context.addToPath('mypath') + # context.addToLdLibraryPath('myldlibrarypath') + # context.addToPythonPath('mypythonpath') + # context.setEnviron('myvarname', 'value') # Start SALOME, parsing command line arguments - runner.go(args) - print 'Thank you for using SALOME!' + context.go(args) + #print 'Thank you for using SALOME!' - except SalomeRunnerException, e: + except SalomeContextException, e: import logging logging.getLogger("salome").error(e) sys.exit(1)