Crossplatfrom execution of salome

diff --git a/bin/Makefile.am b/bin/Makefile.am
index fbb9625284eb3fac77c28708c30b82a6d746c96a..827b9ec381442cf8c3bcbbf7e1d12532f26a3786 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -60,7 +60,9 @@ dist_salomescript_SCRIPTS=\
        NSparam.py \
        setenv.py \
        launchSalome.py \
-       runNS.py
+       nameserver.py \
+        server.py
+
 
 EXTRA_DIST = appliskel
 

diff --git a/bin/nameserver.py b/bin/nameserver.py
index 78bcdc30c9eaf32296ec43dbcf1c5dc617a090d5..cb977be89e77a68695be1ac72731d5141e1fde4b 100755 (executable)
--- a/bin/nameserver.py
+++ b/bin/nameserver.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import sys, os, re
+import sys, os, re, socket
 #import commands
 from server import *
 from Utils_Identity import getShortHostName
@@ -47,7 +47,11 @@ class NamingServer(Server):
 
        print "Name Service... "
        #hname=os.environ["HOST"] #commands.getoutput("hostname")
-        hname=getShortHostName()
+        if sys.platform == "win32":
+           hname=getShortHostName();
+        else:
+           hname = socket.gethostname();
+        
        print "hname=",hname
        
        f=open(os.environ["OMNIORB_CONFIG"])
@@ -69,7 +73,8 @@ class NamingServer(Server):
           self.CMD=['omniNames -start ' , aPort , ' -logdir ' , '\"' + upath + '\"']
          #os.system("start omniNames -start " + aPort + " -logdir " + upath)
        else:
-          self.CMD=['omniNames -start ' , aPort , ' -logdir ' , upath , ' &']
+          #self.CMD=['omniNames -start ' , aPort , ' -logdir ' , upath , ' &']
+          self.CMD=['omniNames','-start' , aPort, '-logdir' , upath ]
          #os.system("omniNames -start " + aPort + " -logdir " + upath + " &")
 
        print "ok"