| timbo@cvs.perl.org 2005-11-21, 9:24 am |
| Author: timbo
Date: Mon Nov 21 06:24:05 2005
New Revision: 2248
Modified:
dbd-oracle/branches/pythian/Makefile.PL
Log:
Enable Oracle XE support to work with -m /path/to/foo.mk option.
XE support tested with
TWO_TASK=//localhost/XE ORACLE_USERID=hr/hr make test
(after enabling the example HR user and adding the password 'hr' to it).
t/20select.t reports two tests failing - but it looks like the test
count is wrong (or some tests are getting skipped and not accounted for).
Need to look at the history.
Modified: dbd-oracle/branches/pythian/Makefile.PL
====================
====================
====================
==================
--- dbd-oracle/branches/pythian/Makefile.PL (original)
+++ dbd-oracle/branches/pythian/Makefile.PL Mon Nov 21 06:24:05 2005
@@ -96,7 +96,7 @@ my %mk_target_rules;
#$::opt_ic10 = 1; # Build for Oracle 10g instantclient
$::opt_b = 1; # try to use Oracle's own 'build' rule
$::opt_r = ''; # With -b above, use this names build rule (eg -r=build64)
-$::opt_m = 0; # path to proc.mk or oracle.mk file to read
+$::opt_m = ''; # path to proc.mk or oracle.mk file to read
$::opt_p = ''; # alter preference for oracle.mk over proc
$::opt_n = ''; # Oracle .mk macro name to use for library list to link with
$::opt_c = 0; # don't encourage use of shared library
@@ -203,6 +203,9 @@ symbol_search() if $::opt_s or $::opt_S;
# --- How shall we link with Oracle? Let me count the ways...
+# default to using XE .mk file if one exists
+$::opt_m ||= "$OH/rdbms/demo/demo_xe.mk" if -s "$OH/rdbms/demo/demo_xe.mk";
+
my @mkfiles;
my $linkwith = "";
my $linkwith_msg = "";
@@ -328,11 +331,12 @@ elsif ($::opt_l and # use -l to enable t
$opts{INC} = "$inc -I$dbi_arch_dir";
}
-elsif (-e "$OH/rdbms/demo/demo_xe.mk") { # Oracle XE
+elsif ($::opt_m =~ /\bdemo_xe.mk$/) { # Oracle XE
- print "Looks like Oracle XE\n";
+ my $mk = $::opt_m;
+ print "Looks like Oracle XE ($mk)\n";
- fetch_oci_macros("$OH/rdbms/demo/demo_xe.mk");
+ fetch_oci_macros($mk
);
$MK{CCINCLUDES} = '-I$(ICINCHOME)'; # undo odd refinition in demo_xe.mk
# From linux Oracle XE (10.2.0):
|