[ruby-oci8-commit] [311] trunk/ruby-oci8/ext/oci8: * ext/oci8/oraconf.rb: fix for Oracle 11.1. 0.7.0 instant

nobody at rubyforge.org nobody at rubyforge.org
Sat Jan 31 09:17:56 EST 2009


Revision: 311
Author:   kubo
Date:     2009-01-31 09:17:56 -0500 (Sat, 31 Jan 2009)

Log Message:
-----------
* ext/oci8/oraconf.rb: fix for Oracle 11.1.0.7.0 instant
    client rpm package. The directory tree is a bit different
    with that of 11.1.0.6.0 or earlier.
    (reported by Luis Parravicini.)

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	2009-01-31 12:00:45 UTC (rev 310)
+++ branches/ruby-oci8-1.0/ChangeLog	2009-01-31 14:17:56 UTC (rev 311)
@@ -1,4 +1,10 @@
 2009-01-31  KUBO Takehiro  <kubo at jiubao.org>
+	* ext/oci8/oraconf.rb: fix for Oracle 11.1.0.7.0 instant
+	    client rpm package. The directory tree is a bit different
+	    with that of 11.1.0.6.0 or earlier.
+	    (reported by Luis Parravicini.)
+
+2009-01-31  KUBO Takehiro  <kubo at jiubao.org>
 	* lib/DBD/OCI8/OCI8.rb: renamed to lib/dbd/OCI8.rb.
 	* lib/dbd/OCI8.rb: 1. renamed from lib/DBD/OCI8/OCI8.rb
 	    2. fix USED_DBD_VERSION from 0.2 to 0.4.

Modified: branches/ruby-oci8-1.0/ext/oci8/oraconf.rb
===================================================================
--- branches/ruby-oci8-1.0/ext/oci8/oraconf.rb	2009-01-31 12:00:45 UTC (rev 310)
+++ branches/ruby-oci8-1.0/ext/oci8/oraconf.rb	2009-01-31 14:17:56 UTC (rev 311)
@@ -965,13 +965,21 @@
   def initialize(ic_dir)
     init
 
-    if ic_dir =~ /^\/usr\/lib(?:64)?\/oracle\/(\d+\.\d+\.\d+\.\d+)\/client(64)?\/lib(?:64)?/
+    if ic_dir =~ /^\/usr\/lib(?:64)?\/oracle\/(\d+(?:\.\d+)*)\/client(64)?\/lib(?:64)?/
       # rpm package
-      #   official x86 rpms:
+      #   x86 rpms after 11.1.0.7.0:
+      #    library: /usr/lib/oracle/X.X/client/lib/
+      #    include: /usr/include/oracle/X.X/client/
+      #
+      #   x86_64 rpms after 11.1.0.7.0:
+      #    library: /usr/lib/oracle/X.X/client64/lib/
+      #    include: /usr/include/oracle/X.X/client64/
+      #
+      #   x86 rpms before 11.1.0.6.0:
       #    library: /usr/lib/oracle/X.X.X.X/client/lib/
       #    include: /usr/include/oracle/X.X.X.X/client/
       #
-      #   official x86_64 rpms:
+      #   x86_64 rpms before 11.1.0.6.0:
       #    library: /usr/lib/oracle/X.X.X.X/client64/lib/
       #    include: /usr/include/oracle/X.X.X.X/client64/
       #

Modified: trunk/ruby-oci8/ChangeLog
===================================================================
--- trunk/ruby-oci8/ChangeLog	2009-01-31 12:00:45 UTC (rev 310)
+++ trunk/ruby-oci8/ChangeLog	2009-01-31 14:17:56 UTC (rev 311)
@@ -1,4 +1,10 @@
 2009-01-31  KUBO Takehiro  <kubo at jiubao.org>
+	* ext/oci8/oraconf.rb: fix for Oracle 11.1.0.7.0 instant
+	    client rpm package. The directory tree is a bit different
+	    with that of 11.1.0.6.0 or earlier.
+	    (reported by Luis Parravicini.)
+
+2009-01-31  KUBO Takehiro  <kubo at jiubao.org>
 	* lib/DBD/OCI8/OCI8.rb: renamed to lib/dbd/OCI8.rb.
 	* lib/dbd/OCI8.rb: 1. renamed from lib/DBD/OCI8/OCI8.rb
 	    2. fix USED_DBD_VERSION from 0.2 to 0.4.

Modified: trunk/ruby-oci8/ext/oci8/oraconf.rb
===================================================================
--- trunk/ruby-oci8/ext/oci8/oraconf.rb	2009-01-31 12:00:45 UTC (rev 310)
+++ trunk/ruby-oci8/ext/oci8/oraconf.rb	2009-01-31 14:17:56 UTC (rev 311)
@@ -965,13 +965,21 @@
   def initialize(ic_dir)
     init
 
-    if ic_dir =~ /^\/usr\/lib(?:64)?\/oracle\/(\d+\.\d+\.\d+\.\d+)\/client(64)?\/lib(?:64)?/
+    if ic_dir =~ /^\/usr\/lib(?:64)?\/oracle\/(\d+(?:\.\d+)*)\/client(64)?\/lib(?:64)?/
       # rpm package
-      #   official x86 rpms:
+      #   x86 rpms after 11.1.0.7.0:
+      #    library: /usr/lib/oracle/X.X/client/lib/
+      #    include: /usr/include/oracle/X.X/client/
+      #
+      #   x86_64 rpms after 11.1.0.7.0:
+      #    library: /usr/lib/oracle/X.X/client64/lib/
+      #    include: /usr/include/oracle/X.X/client64/
+      #
+      #   x86 rpms before 11.1.0.6.0:
       #    library: /usr/lib/oracle/X.X.X.X/client/lib/
       #    include: /usr/include/oracle/X.X.X.X/client/
       #
-      #   official x86_64 rpms:
+      #   x86_64 rpms before 11.1.0.6.0:
       #    library: /usr/lib/oracle/X.X.X.X/client64/lib/
       #    include: /usr/include/oracle/X.X.X.X/client64/
       #




More information about the ruby-oci8-commit mailing list