[ruby-oci8-commit] [231] trunk/ruby-oci8/ext/oci8: * ext/oci8/oraconf.rb: fix for official x86_64 rpms.

[nobody at rubyforge.org]

Revision: 231
Author:   kubo
Date:     2007-12-23 10:29:22 -0500 (Sun, 23 Dec 2007)

Log Message:
-----------
* ext/oci8/oraconf.rb: fix for official x86_64 rpms.
    (contributed by Pat.)

Modified Paths:
--------------
    branches/ruby-oci8-1.0/ChangeLog
    branches/ruby-oci8-1.0/ext/oci8/oraconf.rb
    trunk/ruby-oci8/ChangeLog
    trunk/ruby-oci8/ext/oci8/oraconf.rb

Modified: branches/ruby-oci8-1.0/ChangeLog
===================================================================
--- branches/ruby-oci8-1.0/ChangeLog	2007-12-04 13:40:03 UTC (rev 230)
+++ branches/ruby-oci8-1.0/ChangeLog	2007-12-23 15:29:22 UTC (rev 231)
@@ -1,3 +1,7 @@
+2007-12-23  KUBO Takehiro  <kubo at jiubao.org>
+	* ext/oci8/oraconf.rb: fix for official x86_64 rpms.
+	    (contributed by Pat.)
+
 2007-11-25  KUBO Takehiro  <kubo at jiubao.org>
 	release as 1.0.0 again.
 	* ext/oci8/stmt.c, test/test_dbi.rb: fix a problem when binding

Modified: branches/ruby-oci8-1.0/ext/oci8/oraconf.rb
===================================================================
--- branches/ruby-oci8-1.0/ext/oci8/oraconf.rb	2007-12-04 13:40:03 UTC (rev 230)
+++ branches/ruby-oci8-1.0/ext/oci8/oraconf.rb	2007-12-23 15:29:22 UTC (rev 231)
@@ -833,10 +833,23 @@
   def initialize(ic_dir)
     init
 
-    if ic_dir =~ /^\/usr\/lib(?:64)?\/oracle\/(\d+\.\d+\.\d+\.\d+)\/client\/lib(?:64)?/
+    if ic_dir =~ /^\/usr\/lib(?:64)?\/oracle\/(\d+\.\d+\.\d+\.\d+)\/client(64)?\/lib(?:64)?/
       # rpm package
+      #   official x86 rpms:
+      #    library: /usr/lib/oracle/X.X.X.X.X/client/lib/
+      #    include: /usr/include/oracle/X.X.X.X.X/client/
+      #
+      #   official x86_64 rpms:
+      #    library: /usr/lib/oracle/X.X.X.X.X/client64/lib/
+      #    include: /usr/include/oracle/X.X.X.X.X/client64/
+      #
+      #   third-party x86_64 rpms:
+      #    library: /usr/lib64/oracle/X.X.X.X.X/client/lib/
+      #          or /usr/lib64/oracle/X.X.X.X.X/client/lib64/
+      #    include: /usr/include/oracle/X.X.X.X.X/client/
+      #
       lib_dir = ic_dir
-      inc_dir = "/usr/include/oracle/#{$1}/client"
+      inc_dir = "/usr/include/oracle/#{$1}/client#{$2}"
     else
       # zip package
       lib_dir = ic_dir

Modified: trunk/ruby-oci8/ChangeLog
===================================================================
--- trunk/ruby-oci8/ChangeLog	2007-12-04 13:40:03 UTC (rev 230)
+++ trunk/ruby-oci8/ChangeLog	2007-12-23 15:29:22 UTC (rev 231)
@@ -1,3 +1,7 @@
+2007-12-23  KUBO Takehiro  <kubo at jiubao.org>
+	* ext/oci8/oraconf.rb: fix for official x86_64 rpms.
+	    (contributed by Pat.)
+
 2007-12-04  KUBO Takehiro  <kubo at jiubao.org>
 	* ext/oci8/stmt.c, lib/oci8/oci8.rb: delete a private method
 	    OCI8::Curosr#__connection and use @con instead.

Modified: trunk/ruby-oci8/ext/oci8/oraconf.rb
===================================================================
--- trunk/ruby-oci8/ext/oci8/oraconf.rb	2007-12-04 13:40:03 UTC (rev 230)
+++ trunk/ruby-oci8/ext/oci8/oraconf.rb	2007-12-23 15:29:22 UTC (rev 231)
@@ -834,10 +834,23 @@
   def initialize(ic_dir)
     init
 
-    if ic_dir =~ /^\/usr\/lib(?:64)?\/oracle\/(\d+\.\d+\.\d+\.\d+)\/client\/lib(?:64)?/
+    if ic_dir =~ /^\/usr\/lib(?:64)?\/oracle\/(\d+\.\d+\.\d+\.\d+)\/client(64)?\/lib(?:64)?/
       # rpm package
+      #   official x86 rpms:
+      #    library: /usr/lib/oracle/X.X.X.X.X/client/lib/
+      #    include: /usr/include/oracle/X.X.X.X.X/client/
+      #
+      #   official x86_64 rpms:
+      #    library: /usr/lib/oracle/X.X.X.X.X/client64/lib/
+      #    include: /usr/include/oracle/X.X.X.X.X/client64/
+      #
+      #   third-party x86_64 rpms:
+      #    library: /usr/lib64/oracle/X.X.X.X.X/client/lib/
+      #          or /usr/lib64/oracle/X.X.X.X.X/client/lib64/
+      #    include: /usr/include/oracle/X.X.X.X.X/client/
+      #
       lib_dir = ic_dir
-      inc_dir = "/usr/include/oracle/#{$1}/client"
+      inc_dir = "/usr/include/oracle/#{$1}/client#{$2}"
     else
       # zip package
       lib_dir = ic_dir