From a028de1e7b6c3b7055bcfba7da9506b8409536bf Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Mon, 31 Jul 2017 13:16:44 +0200 Subject: [PATCH] Perl scripts use perl module for RELEASE dependencies --- src/tools/Makefile | 2 ++ src/tools/dbdExpand.pl | 1 + src/tools/dbdReport.pl | 3 ++- src/tools/dbdToHtml.pl | 4 +++- src/tools/dbdToMenuH.pl | 3 ++- src/tools/dbdToRecordtypeH.pl | 3 ++- src/tools/makeIncludeDbd.pl | 1 + src/tools/registerRecordDeviceDriver.pl | 2 ++ test/tools/Breaktable.plt | 5 +++-- test/tools/DBD.plt | 5 +++-- test/tools/Device.plt | 5 +++-- test/tools/Driver.plt | 5 +++-- test/tools/Function.plt | 5 +++-- test/tools/Makefile | 3 +++ test/tools/Menu.plt | 5 +++-- test/tools/Recfield.plt | 5 +++-- test/tools/Recordtype.plt | 5 +++-- test/tools/Registrar.plt | 5 +++-- test/tools/Variable.plt | 5 +++-- test/tools/macLib.plt | 5 +++-- 20 files changed, 51 insertions(+), 26 deletions(-) diff --git a/src/tools/Makefile b/src/tools/Makefile index ccfd12dc8..284871603 100644 --- a/src/tools/Makefile +++ b/src/tools/Makefile @@ -24,6 +24,8 @@ PERL_MODULES += DBD/Record.pm PERL_MODULES += DBD/Registrar.pm PERL_MODULES += DBD/Variable.pm +PERL_MODULES += databaseModuleDirs.pm + PERL_SCRIPTS += makeIncludeDbd.pl PERL_SCRIPTS += dbdToMenuH.pl diff --git a/src/tools/dbdExpand.pl b/src/tools/dbdExpand.pl index 71f938418..18d5597ee 100644 --- a/src/tools/dbdExpand.pl +++ b/src/tools/dbdExpand.pl @@ -11,6 +11,7 @@ use strict; use FindBin qw($Bin); use lib "$Bin/../../lib/perl"; +use databaseModuleDirs; use DBD; use DBD::Parser; diff --git a/src/tools/dbdReport.pl b/src/tools/dbdReport.pl index 876ec0abb..6f5dc681a 100644 --- a/src/tools/dbdReport.pl +++ b/src/tools/dbdReport.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl #************************************************************************* # Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne @@ -9,6 +9,7 @@ use FindBin qw($Bin); use lib "$Bin/../../lib/perl"; +use databaseModuleDirs; use DBD; use DBD::Parser; diff --git a/src/tools/dbdToHtml.pl b/src/tools/dbdToHtml.pl index 2c0417cbb..a809920aa 100644 --- a/src/tools/dbdToHtml.pl +++ b/src/tools/dbdToHtml.pl @@ -1,4 +1,5 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + #************************************************************************* # Copyright (c) 2012 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. @@ -10,6 +11,7 @@ use strict; use FindBin qw($Bin); use lib "$Bin/../../lib/perl"; +use databaseModuleDirs; use DBD; use DBD::Parser; diff --git a/src/tools/dbdToMenuH.pl b/src/tools/dbdToMenuH.pl index eaa236902..b646d3afd 100644 --- a/src/tools/dbdToMenuH.pl +++ b/src/tools/dbdToMenuH.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl #************************************************************************* # Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne @@ -9,6 +9,7 @@ use FindBin qw($Bin); use lib "$Bin/../../lib/perl"; +use databaseModuleDirs; use EPICS::Getopts; use File::Basename; diff --git a/src/tools/dbdToRecordtypeH.pl b/src/tools/dbdToRecordtypeH.pl index ccf6b21b2..de9db4057 100644 --- a/src/tools/dbdToRecordtypeH.pl +++ b/src/tools/dbdToRecordtypeH.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl #************************************************************************* # Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne @@ -9,6 +9,7 @@ use FindBin qw($Bin); use lib "$Bin/../../lib/perl"; +use databaseModuleDirs; use EPICS::Getopts; use File::Basename; diff --git a/src/tools/makeIncludeDbd.pl b/src/tools/makeIncludeDbd.pl index f4ab8be3d..ab728da83 100644 --- a/src/tools/makeIncludeDbd.pl +++ b/src/tools/makeIncludeDbd.pl @@ -1,4 +1,5 @@ #!/usr/bin/env perl + #************************************************************************* # Copyright (c) 2014 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. diff --git a/src/tools/registerRecordDeviceDriver.pl b/src/tools/registerRecordDeviceDriver.pl index cd54f90f8..07bf8edb9 100644 --- a/src/tools/registerRecordDeviceDriver.pl +++ b/src/tools/registerRecordDeviceDriver.pl @@ -1,4 +1,5 @@ #!/usr/bin/env perl + #************************************************************************* # Copyright (c) 2012 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. @@ -12,6 +13,7 @@ use strict; use FindBin qw($Bin); use lib "$Bin/../../lib/perl"; +use databaseModuleDirs; use DBD; use DBD::Parser; diff --git a/test/tools/Breaktable.plt b/test/tools/Breaktable.plt index 99df5457a..4caf47e1f 100644 --- a/test/tools/Breaktable.plt +++ b/test/tools/Breaktable.plt @@ -1,6 +1,7 @@ -#!/usr/bin/perl +#!/usr/bin/env perl -use lib '../..'; +use lib '../O.Common'; +use databaseModuleDirs; use Test::More tests => 9; diff --git a/test/tools/DBD.plt b/test/tools/DBD.plt index 2bfe6ef48..ec75cbda5 100644 --- a/test/tools/DBD.plt +++ b/test/tools/DBD.plt @@ -1,6 +1,7 @@ -#!/usr/bin/perl +#!/usr/bin/env perl -use lib '../..'; +use lib '../O.Common'; +use databaseModuleDirs; use Test::More tests => 18; diff --git a/test/tools/Device.plt b/test/tools/Device.plt index 3341d5ee0..95be70031 100644 --- a/test/tools/Device.plt +++ b/test/tools/Device.plt @@ -1,6 +1,7 @@ -#!/usr/bin/perl +#!/usr/bin/env perl -use lib '../..'; +use lib '../O.Common'; +use databaseModuleDirs; use Test::More tests => 16; diff --git a/test/tools/Driver.plt b/test/tools/Driver.plt index 17e3a0c78..7d43b87e8 100644 --- a/test/tools/Driver.plt +++ b/test/tools/Driver.plt @@ -1,6 +1,7 @@ -#!/usr/bin/perl +#!/usr/bin/env perl -use lib '../..'; +use lib '../O.Common'; +use databaseModuleDirs; use Test::More tests => 2; diff --git a/test/tools/Function.plt b/test/tools/Function.plt index 130693293..d599d99a3 100644 --- a/test/tools/Function.plt +++ b/test/tools/Function.plt @@ -1,6 +1,7 @@ -#!/usr/bin/perl +#!/usr/bin/env perl -use lib '../..'; +use lib '../O.Common'; +use databaseModuleDirs; use Test::More tests => 2; diff --git a/test/tools/Makefile b/test/tools/Makefile index e246a90a1..66e3cd6a6 100644 --- a/test/tools/Makefile +++ b/test/tools/Makefile @@ -23,3 +23,6 @@ TESTS += Variable TESTSCRIPTS_HOST += $(TESTS:%=%.t) include $(TOP)/configure/RULES + +# Create local copy else out-of-tree installs break the scripts +$(TESTSCRIPTS_HOST) : $(COMMON_DIR)/databaseModuleDirs.pm diff --git a/test/tools/Menu.plt b/test/tools/Menu.plt index 8165d000c..4dcc1f541 100644 --- a/test/tools/Menu.plt +++ b/test/tools/Menu.plt @@ -1,6 +1,7 @@ -#!/usr/bin/perl +#!/usr/bin/env perl -use lib '../..'; +use lib '../O.Common'; +use databaseModuleDirs; use Test::More tests => 14; diff --git a/test/tools/Recfield.plt b/test/tools/Recfield.plt index cdad4dbb7..d0e8289e3 100644 --- a/test/tools/Recfield.plt +++ b/test/tools/Recfield.plt @@ -1,6 +1,7 @@ -#!/usr/bin/perl +#!/usr/bin/env perl -use lib '../..'; +use lib '../O.Common'; +use databaseModuleDirs; use Test::More tests => 76; diff --git a/test/tools/Recordtype.plt b/test/tools/Recordtype.plt index c5384b7a9..fc3d066a5 100644 --- a/test/tools/Recordtype.plt +++ b/test/tools/Recordtype.plt @@ -1,6 +1,7 @@ -#!/usr/bin/perl +#!/usr/bin/env perl -use lib '../..'; +use lib '../O.Common'; +use databaseModuleDirs; use Test::More tests => 17; diff --git a/test/tools/Registrar.plt b/test/tools/Registrar.plt index b297077b4..f1a5c9e3d 100644 --- a/test/tools/Registrar.plt +++ b/test/tools/Registrar.plt @@ -1,6 +1,7 @@ -#!/usr/bin/perl +#!/usr/bin/env perl -use lib '../..'; +use lib '../O.Common'; +use databaseModuleDirs; use Test::More tests => 2; diff --git a/test/tools/Variable.plt b/test/tools/Variable.plt index 57f92e9a7..00094a328 100644 --- a/test/tools/Variable.plt +++ b/test/tools/Variable.plt @@ -1,6 +1,7 @@ -#!/usr/bin/perl +#!/usr/bin/env perl -use lib '../..'; +use lib '../O.Common'; +use databaseModuleDirs; use Test::More tests => 4; diff --git a/test/tools/macLib.plt b/test/tools/macLib.plt index d492c3bc1..0ec4a812c 100644 --- a/test/tools/macLib.plt +++ b/test/tools/macLib.plt @@ -1,6 +1,7 @@ -#!/usr/bin/perl +#!/usr/bin/env perl -use lib '../..'; +use lib '../O.Common'; +use databaseModuleDirs; use Test::More tests => 35;