Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CMake: Sphinx: simplifying Win32 command
[modules/kernel.git]
/
bin
/
searchFreePort.py
diff --git
a/bin/searchFreePort.py
b/bin/searchFreePort.py
index 392b8adcfa7b1e1d34fc5c29d0d53ceb764a891f..07540095d5289eda6b396edc0a7e87ae36ff661c 100644
(file)
--- a/
bin/searchFreePort.py
+++ b/
bin/searchFreePort.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-201
3
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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-58,19
+58,17
@@
def searchFreePort(args={}, save_config=1, use_port=None):
from salome_utils import generateFileName, getHostName
hostname = getHostName()
#
from salome_utils import generateFileName, getHostName
hostname = getHostName()
#
- home = os.getenv("HOME")
- appli = os.getenv("APPLI")
+ omniorbUserPath = os.getenv("OMNIORB_USER_PATH")
kwargs={}
kwargs={}
- if appli is not None:
- home = os.path.join(os.path.realpath(home), appli, "USERS")
+ if omniorbUserPath is not None:
kwargs["with_username"]=True
#
from ORBConfigFile import writeORBConfigFile
kwargs["with_username"]=True
#
from ORBConfigFile import writeORBConfigFile
- omniorb_config, giopsize = writeORBConfigFile(
home
, hostname, nsport, kwargs)
+ omniorb_config, giopsize = writeORBConfigFile(
omniorbUserPath
, hostname, nsport, kwargs)
args['port'] = os.environ['NSPORT']
#
if save_config:
args['port'] = os.environ['NSPORT']
#
if save_config:
- last_running_config = generateFileName(
home
, prefix="omniORB",
+ last_running_config = generateFileName(
omniorbUserPath
, prefix="omniORB",
suffix="last",
extension="cfg",
hidden=True,
suffix="last",
extension="cfg",
hidden=True,
@@
-103,7
+101,7
@@
def searchFreePort(args={}, save_config=1, use_port=None):
print "- KO: port is busy"
pass
#
print "- KO: port is busy"
pass
#
-
+
print "Searching for a free port for naming service:",
#
print "Searching for a free port for naming service:",
#
@@
-125,5
+123,5
@@
def searchFreePort(args={}, save_config=1, use_port=None):
NSPORT=NSPORT+1
pass
#
NSPORT=NSPORT+1
pass
#
-
+
return
return