[omniORB] omniidl.in patch

[Tim Theisen]

Duncan,

Please consider the attached update to omniidl. It applies the same
last chance logic to the case when the omniidl script is in our source
tree as when omniORB is installed in its final destination. The patch
allows me to place and unmodified build of omniORB in my source tree and
build my applications that use omniORB on a system that does not have
omniORB installed. I can use the result of that build to install and
run my application on a system where omniORB is present.

...Tim
--
Tim Theisen Lead Research Software Engineer
Phone: [phone] TomoTherapy Incorporated
Fax: [phone] 1240 Deming Way
Web: http://www.tomotherapy.com Madison, WI 53717-1954
-------------- next part --------------
A non-text attachment was scrubbed...
Name: omniidl.in.patch
Type: application/octet-stream
Size: 1158 bytes
Desc: omniidl.in.patch
Url : http://www.omniorb-support.com/pipermail/omniorb-list/attachments/20080718/c5c17b06/omniidl.in.obj

[Duncan Grisby]

Post by Tim Theisen
Please consider the attached update to omniidl. It applies the same
last chance logic to the case when the omniidl script is in our source
tree as when omniORB is installed in its final destination. The patch
allows me to place and unmodified build of omniORB in my source tree and
build my applications that use omniORB on a system that does not have
omniORB installed. I can use the result of that build to install and
run my application on a system where omniORB is present.

Sorry for the delay. Thanks for your patch. I've checked it in.

Cheers,

Duncan.

[Tim Theisen]

Duncan,

Thanks for incorporating my patch. After I submitted it to you, I
discovered that it did not account for 64-bit Linux systems. (It worked
fine for 32-bit systems.) I have an update that covers the 64-bit
systems as well. I hope that you will accept this patch as well.

--- src/tool/omniidl/python/scripts/omniidl.in.orig 2008-09-16
06:13:46.000000000 -0500
+++ src/tool/omniidl/python/scripts/omniidl.in 2008-10-15
11:16:39.000000000 -0500
@@ -58,11 +58,15 @@
if bin == "bin":
pylibdir = os.path.join(treedir, "lib", "python")
vpylibdir = pylibdir + sys.version[:3] + "/site-packages"
+ vpylib64dir = os.path.join(treedir, "lib64", "python") +
sys.version[:3] + "/site-packages"
archlibdir = os.path.join(treedir, "lib", archname)

if os.path.isdir(pylibdir):
sys.path.insert(0, pylibdir)

+ if os.path.isdir(vpylib64dir):
+ sys.path.insert(0, vpylib64dir)
+
if os.path.isdir(vpylibdir):
sys.path.insert(0, vpylibdir)

@@ -72,11 +76,15 @@
elif archname == "bin":
pylibdir = os.path.join(bindir, "lib", "python")
vpylibdir = pylibdir + sys.version[:3] + "/site-packages"
+ vpylib64dir = os.path.join(bindir, "lib64", "python") +
sys.version[:3] + "/site-packages"
archlibdir = os.path.join(bindir, "lib")

if os.path.isdir(pylibdir):
sys.path.insert(0, pylibdir)

+ if os.path.isdir(vpylib64dir):
+ sys.path.insert(0, vpylib64dir)
+
if os.path.isdir(vpylibdir):
sys.path.insert(0, vpylibdir)


Thanks, ...Tim
--
Tim Theisen Lead Research Software Engineer
Phone: [phone] TomoTherapy Incorporated
Fax: [phone] 1240 Deming Way
Web: http://www.tomotherapy.com Madison, WI 53717-1954
-----Original Message-----
From: Duncan Grisby [mailto:***@grisby.org]
Sent: Tuesday, September 16, 2008 06:15
To: Tim Theisen
Cc: omniorb-***@omniorb-support.com
Subject: Re: [omniORB] omniidl.in patch

Post by Tim Theisen
Please consider the attached update to omniidl. It applies the same
last chance logic to the case when the omniidl script is in our source
tree as when omniORB is installed in its final destination. The patch
allows me to place and unmodified build of omniORB in my source tree and
build my applications that use omniORB on a system that does not have
omniORB installed. I can use the result of that build to install and
run my application on a system where omniORB is present.

Sorry for the delay. Thanks for your patch. I've checked it in.

Cheers,

Duncan.
--
-- Duncan Grisby --
-- ***@grisby.org --
-- http://www.grisby.org --
-------------- next part --------------
A non-text attachment was scrubbed...
Name: omniORB-4.1.3.patch
Type: application/octet-stream
Size: 1339 bytes
Desc: omniORB-4.1.3.patch
Url : http://www.omniorb-support.com/pipermail/omniorb-list/attachments/20081015/57b22a7a/omniORB-4.1.3.obj