Install databaseModuleDirs.pm into bin/<host>

Adjust all scripts to use it from there.
Host arch's may use different absolute paths to the same Base directory,
so they can't share a single copy of that module.
This commit is contained in:
Andrew Johnson
2017-12-06 22:09:49 -06:00
parent 7d105aec9e
commit f44bfd897e
8 changed files with 19 additions and 14 deletions

View File

@@ -24,7 +24,7 @@ PERL_MODULES += DBD/Record.pm
PERL_MODULES += DBD/Registrar.pm
PERL_MODULES += DBD/Variable.pm
PERL_MODULES += databaseModuleDirs.pm
PERL_SCRIPTS += databaseModuleDirs.pm
PERL_SCRIPTS += makeIncludeDbd.pl

View File

@@ -12,8 +12,9 @@
use strict;
use FindBin qw($Bin);
use lib "$Bin/../../lib/perl";
use lib ($Bin, "$Bin/../../lib/perl");
use databaseModuleDirs;
no lib $Bin;
use DBD;
use DBD::Parser;

View File

@@ -10,8 +10,9 @@
use strict;
use FindBin qw($Bin);
use lib "$Bin/../../lib/perl";
use lib ($Bin, "$Bin/../../lib/perl");
use databaseModuleDirs;
no lib $Bin;
use DBD;
use DBD::Parser;

View File

@@ -8,8 +8,9 @@
#*************************************************************************
use FindBin qw($Bin);
use lib "$Bin/../../lib/perl";
use lib ($Bin, "$Bin/../../lib/perl");
use databaseModuleDirs;
no lib $Bin;
use DBD;
use DBD::Parser;
@@ -64,4 +65,3 @@ if (%recordtypes) {
my @records = sort keys %{$dbd->records};
print wrap("Records: ", "\t", join(', ', @records)), "\n"
if @records;

View File

@@ -10,8 +10,9 @@
use strict;
use FindBin qw($Bin);
use lib "$Bin/../../lib/perl";
use lib ($Bin, "$Bin/../../lib/perl");
use databaseModuleDirs;
no lib $Bin;
use DBD;
use DBD::Parser;
@@ -244,4 +245,3 @@ sub DBD::Recfield::writable {
if $special eq "SPC_DBADDR";
return $fld->dbf_type eq "DBF_NOACCESS" ? 'No' : 'Yes';
}

View File

@@ -8,8 +8,9 @@
#*************************************************************************
use FindBin qw($Bin);
use lib "$Bin/../../lib/perl";
use lib ($Bin, "$Bin/../../lib/perl");
use databaseModuleDirs;
no lib $Bin;
use EPICS::Getopts;
use File::Basename;

View File

@@ -8,8 +8,9 @@
#*************************************************************************
use FindBin qw($Bin);
use lib "$Bin/../../lib/perl";
use lib ($Bin, "$Bin/../../lib/perl");
use databaseModuleDirs;
no lib $Bin;
use EPICS::Getopts;
use File::Basename;
@@ -168,7 +169,7 @@ sub newtables {
"\n};\n\n";
print OUTFILE "static const ${rn}FieldIndex ${rn}RecordLinkFieldIndices[] = {\n",
join(",\n", map {
" ${rn}Record" . $_->name;
" ${rn}Record" . $_->name;
} grep {
$_->dbf_type =~ m/^DBF_(IN|OUT|FWD)LINK/;
} $rtyp->fields),
@@ -209,7 +210,7 @@ sub newtables {
print OUTFILE " dbRegisterMenu(pbase, \&${name}MenuMetaData);\n";
}
print OUTFILE map {
" ${rn}FieldMetaData[${rn}Record" .
" ${rn}FieldMetaData[${rn}Record" .
$_->name .
"].typDat.pmenu = \n".
" \&" .
@@ -219,7 +220,7 @@ sub newtables {
print OUTFILE map {
" ${rn}FieldMetaData[${rn}Record" .
$_->name .
"].typDat.base = CT_HEX;\n";
"].typDat.base = CT_HEX;\n";
} grep {
$_->attribute('base') eq 'HEX';
} $rtyp->fields;

View File

@@ -6,14 +6,15 @@
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
# in file LICENSE that is included with this distribution.
#*************************************************************************
use strict;
use FindBin qw($Bin);
use lib "$Bin/../../lib/perl";
use lib ($Bin, "$Bin/../../lib/perl");
use databaseModuleDirs;
no lib $Bin;
use DBD;
use DBD::Parser;