Skip to content

Commit

Permalink
Merge branch 'issue-17'
Browse files Browse the repository at this point in the history
  • Loading branch information
Yanick Champoux committed Jul 31, 2014
2 parents 12ed8f1 + b9296c1 commit b48449c
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 23 deletions.
4 changes: 4 additions & 0 deletions Changes
View file
@@ -1,6 +1,10 @@
Revision history for DBD::Oracle

{{$NEXT}}
- Change mentions of READMEs in Makefile.PL to troubleshooting guides.
(GH#17, reported by Ken Williams)

1.74 2014-04-24
- Promote to stable.

1.73_01 2014-04-23
Expand Down
46 changes: 23 additions & 23 deletions Makefile.PL
View file
@@ -1,4 +1,3 @@
## Makefile.PL for DBD::Oracle - see README file for more information.
# Copyright (c) 1994-2006 Tim Bunce. Ireland.
# Copyright (c) 2006-2008 John Scoles (The Pythian Group). Canada.

Expand Down Expand Up @@ -217,12 +216,17 @@ if ($::opt_W) {

# --- Introduction

print qq{
print <<"END_BLURB" unless $::opt_s;
Configuring DBD::Oracle for perl $] on $^O ($Config{archname})
Remember to actually *READ* the README file! Especially if you have any problems.
If you encounter any problem, a collection of troubleshooting
guides are available under lib/DBD/Oracle/Troubleshooting.
'DBD::Oracle::Troubleshooting' is the general troubleshooting
guide, while platform-specific troubleshooting hints
live in their labelled sub-document (e.g., Win32
hints are gathered in 'lib/DBD/Oracle/Troubleshooting/Win32.pod').
} unless $::opt_s;
END_BLURB


# --- Where is Oracle installed...
Expand All @@ -238,7 +242,7 @@ if (!$OH) {
The $ORACLE_ENV environment variable is not set and I couldn\'t guess it.
It must be set to hold the path to an Oracle installation directory
on this machine (or a machine with a compatible architecture).
See the appropriate README file for your OS for more information.
See the appropriate troubleshooting guide for your OS for more information.
ABORTED!
\n};
$ENV{$ORACLE_ENV} = $OH;
Expand All @@ -252,7 +256,7 @@ die qq{ The $ORACLE_ENV environment variable value ($OH) is not valid.
It must be set to hold the path to an Oracle installation directory
on this machine (or a machine with a compatible architecture).
For an Instant Client install, the directory should include an sdk subdirectory.
See the appropriate README file for your OS for more information.
See the appropriate troubleshooting guide for your OS for more information.
ABORTED!
} unless (-d $OH and $^O eq 'VMS')
or -d "$OH/sdk/." # Instant Client with SDK
Expand Down Expand Up @@ -323,10 +327,12 @@ elsif (($^O eq 'MSWin32') or ($^O =~ /cygwin/i)) {
print "Using OCI directory '$OCIDIR'\n";

if ($Config{cc} =~ /gcc/i) {
system("dlltool --input-def oci.def --output-lib liboci.a")
if ! -f "liboci.a";
die "Could not find or create liboci.a. See README.wingcc.txt\n"
if ! -f "liboci.a";

system "dlltool --input-def oci.def --output-lib liboci.a"
unless -f "liboci.a";

die "Could not find or create liboci.a.\n" unless -f "liboci.a";

my $pwd = cwd();
$opts{LIBS} = [ "-L$pwd -loci" ];
} else {
Expand Down Expand Up @@ -556,7 +562,6 @@ else { # --- trawl the guts of Oracle's make files looking the how it wants to l
else {
print "WARNING: Unable to interpret Oracle build commands from $mkfile.\a\n";
print "(Will continue by using fallback approach.)\n";
print "Please report this to dbi-users\@perl.org. See README for what to include.\n";
sleep 2;
$::opt_b = 0;
}
Expand Down Expand Up @@ -679,13 +684,13 @@ else { # --- trawl the guts of Oracle's make files looking the how it wants to l
if ($Config{cc} =~ /gcc/i) {
print "WARNING: perl was not built with -fpic or -fPIC in compiler flags.\n",
" You may need to rebuild perl from sources.\n",
" See instructions in README.hpux.txt\n"
" See instructions in DBD::Oracle::Troubleshooting::Hpux\n"
unless $ccf =~ m/-fpic\b/i;
}
else {
print "WARNING: perl was not built with +z or +Z in compiler flags.\n",
" You may need to rebuild perl from sources.\n",
" See instructions in README.hpux.txt\n"
" See instructions in DBD::Oracle::Troubleshooting::Hpux\n"
unless $ccf =~ m/\+[zZ]/;
}
}
Expand Down Expand Up @@ -804,7 +809,7 @@ if ($^O eq 'hpux') {
$opts{LINKTYPE} = 'static';
}
else {
print "WARNING: If you have trouble, see README.hpux.txt...\n"
print "WARNING: If you have trouble, see DBD::Oracle::Troubleshooting::Hpux...\n"
." you may have to build your own perl, or go hunting for libraries\n";
}
print "WARNING: If you have trouble, try perl Makefile.PL -l\n" unless $::opt_l;
Expand Down Expand Up @@ -867,7 +872,7 @@ if ($^O eq 'aix' and $osvers >= 4 and $Config{cc} ne 'xlc_r') {
print "WARNING: You will may need to rebuild perl using the xlc_r compiler.\a\n";
print " The important thing is that perl and DBD::Oracle be built with the same compiler.\n";
print " You may also need to: ORACCENV='cc=xlc_r'; export ORACCENV\n";
print " Also see README.aix for gcc instructions and read about the -p option.\n";
print " Also see DBD::Oracle::Troubleshooting::Aix for gcc instructions and read about the -p option.\n";
sleep 5;
}

Expand All @@ -888,7 +893,6 @@ print "WARNING: Your GNU C compiler is very old. Please upgrade.\n"

if ($opts{LINKTYPE} && $opts{LINKTYPE} eq 'static') {
print "** Note: DBD::Oracle will be built *into* a NEW perl binary. You MUST use that new perl.\n";
print " See README and Makefile.PL for more information.$BELL\n";
}


Expand All @@ -902,9 +906,6 @@ WriteMakefile( dbd_edit_mm_attribs(\%opts) );
check_security() unless $^O eq 'VMS' or $^O eq 'MSWin32' or $^O =~ /cygwin/i;

print "\n";
print "*** If you have problems...\n";
print " read all the log printed above, and the README and README.help.txt files.\n";
print " (Of course, you have read README by now anyway, haven't you?)\n\n";

vms_logical_names_sanity_check();

Expand Down Expand Up @@ -1197,7 +1198,7 @@ sub find_mkfile {
somewhere non-standard you can specify where it is using the -m option:
perl Makefile.PL -m /path/to/your.mk
See the appropriate README file for your OS for more information and some alternatives.
See the appropriate troubleshooting guide for your OS for more information and some alternatives.
} unless ($^O eq 'MSWin32') || ($^O eq 'VMS') || ($mkfile && -f $mkfile) || $::opt_F;

Expand Down Expand Up @@ -1582,7 +1583,7 @@ sub find_headers {
print "You probably need to install some more Oracle components.\n";
print "For Instant Client that means the SDK package.\n";
print "I'll keep going, but the compile will probably fail.\n";
print "See the appropriate README file for your OS for more information.$BELL\n";
print "See the appropriate troubleshooting guide for your OS for more information.$BELL\n";
print "*********************************************************\n\n";
sleep 5;
}
Expand Down Expand Up @@ -2011,7 +2012,6 @@ sub check_security {

print "\n";
warn "*** WARNING - YOUR ORACLE INSTALLATION HAS A SECURITY PROBLEM.$BELL\n";
warn " Read the README.sec.txt file for more information and patch details.$BELL\n";
warn " This is just a warning. It does not affect DBD::Oracle in any way.\n\n";
sleep 6;
}
Expand All @@ -2034,7 +2034,7 @@ sub check_macos_symbol_table {
WARNING: symbol table may need modification in Oracle library:
$oracle_lib
If the build fails in the linking stage, manual modification is
required - see README.macosx.txt
required - see DBD::Oracle::Troubleshooting::Macos
END_WARNING

return;
Expand Down

0 comments on commit b48449c

Please sign in to comment.