From 2a029ffacc06a5d1df65eb860bb97a60adfe937e Mon Sep 17 00:00:00 2001
From: mpv <mpv@opencascade.com>
Date: Wed, 8 Jun 2005 04:19:41 +0000
Subject: [PATCH] Porting to Mandrake 10.1 and new products: omniORB3 and
 omniORB4 configure scripts support

---
 bin/launchConfigureParser.py | 2 +-
 bin/runNS.sh                 | 2 +-
 bin/runSalome                | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bin/launchConfigureParser.py b/bin/launchConfigureParser.py
index 403e0299b..d66bdedf9 100755
--- a/bin/launchConfigureParser.py
+++ b/bin/launchConfigureParser.py
@@ -140,7 +140,7 @@ try:
   s = file.read()
   while len(s):
     l = string.split(s, ":")
-    if string.split(l[0], " ")[0] == "ORBInitRef":
+    if string.split(l[0], " ")[0] == "ORBInitRef" or string.split(l[0], " ")[0] == "InitRef" :
       my_port = int(l[len(l)-1])
       pass
     s = file.read()
diff --git a/bin/runNS.sh b/bin/runNS.sh
index 76b7452bf..b5c155a6c 100755
--- a/bin/runNS.sh
+++ b/bin/runNS.sh
@@ -17,7 +17,7 @@ touch ${BaseDir}/logs/${Username}/dummy
 \rm -f ${BaseDir}/logs/${Username}/omninames* ${BaseDir}/logs/${Username}/dummy ${BaseDir}/logs/${Username}/*.log
 
 echo "Name Service... "
-aSedCommand="s/ORBInitRef NameService=corbaname::`hostname`:\([[:digit:]]*\)/\1/"
+aSedCommand="s/.*NameService=corbaname::`hostname`:\([[:digit:]]*\)/\1/"
 aPort=`sed -e"$aSedCommand" $OMNIORB_CONFIG`
 omniNames -start $aPort -logdir ${BaseDir}/logs/${Username} &
 
diff --git a/bin/runSalome b/bin/runSalome
index 7505e8b89..a075b9034 100755
--- a/bin/runSalome
+++ b/bin/runSalome
@@ -12,8 +12,12 @@ searchFreePort() {
             echo ${NSPORT} - Ok
 	    local myhost=`hostname`
             export OMNIORB_CONFIG=${HOME}/.omniORB_${myhost}_${NSPORT}.cfg
-            local initref="NameService=corbaname::"`hostname`":$NSPORT"
-            echo "ORBInitRef $initref" > $OMNIORB_CONFIG
+	    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} "
-- 
2.39.2