epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge remote-tracking branch 'lp-Com/make-simple' into 7.0

Browse Source 
* main/make-simple:
  restore ModuleDirs in caPerlApp
  simplify e_flex/antelope path compute
  further no need to search for perl modules under bin
  skip RELEASE_TOPS
  configure: Don't hide any perl scripts being run
  missed a TOP
  no need to search for perl modules under bin/
  drop unnecessary *ModuleDirs
  avoided embedded TOP for non sub-modules
This commit is contained in:
Michael Davidsaver
2019-09-17 14:57:21 -07:00
parent d58996992d 1a94376c19
commit 966965c2c1
80 changed files with 86 additions and 1056 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/database/src/Makefile
+1 -1
View File
@@ -7,7 +7,7 @@
# in the file LICENSE that is included with this distribution.
#*************************************************************************
TOP = ..
TOP = ../../..
include $(TOP)/configure/CONFIG
# PDB Tools
modules/database/src/ioc/Makefile
+5 -3
View File
@@ -6,12 +6,14 @@
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP=../..
IOCDIR := $(or $(dir $(lastword $(MAKEFILE_LIST))), .)
TOP=../../../..
include $(TOP)/configure/CONFIG
SRC = $(TOP)/src
IOCDIR = $(SRC)/ioc
USR_CPPFLAGS += -DUSE_TYPED_RSET
SHRLIB_VERSION = 3.17.0
LIBRARY_IOC += dbCore
dbCore_LIBS += ca Com
modules/database/src/std/Makefile
+5 -3
View File
@@ -6,11 +6,13 @@
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP = ../..
STDDIR := $(or $(dir $(lastword $(MAKEFILE_LIST))), .)
TOP = ../../../..
include $(TOP)/configure/CONFIG
STDDIR=$(TOP)/src/std
USR_CPPFLAGS += -DUSE_TYPED_RSET
SHRLIB_VERSION = 3.17.0
LIBRARY_IOC += dbRecStd
dbRecStd_LIBS = dbCore ca Com
modules/database/src/template/Makefile
+1 -1
View File
@@ -1,4 +1,4 @@
TOP=../..
TOP=../../../..
include $(TOP)/configure/CONFIG
modules/database/src/tools/Makefile
+1 -3
View File
@@ -4,7 +4,7 @@
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP=../..
TOP=../../../..
include $(TOP)/configure/CONFIG
@@ -27,8 +27,6 @@ PERL_MODULES += DBD/Variable.pm
PERL_MODULES += EPICS/IOC.pm
HTMLS += EPICS/IOC.html
PERL_SCRIPTS += databaseModuleDirs.pm
PERL_SCRIPTS += makeIncludeDbd.pl
PERL_SCRIPTS += dbdToMenuH.pl
modules/database/src/tools/dbExpand.pl
+1 -3
View File
@@ -12,9 +12,7 @@
use strict;
use FindBin qw($Bin);
use lib ($Bin, "$Bin/../../lib/perl");
use databaseModuleDirs;
no lib $Bin;
use lib ("$Bin/../../lib/perl");
use DBD;
use DBD::Parser;
modules/database/src/tools/dbdExpand.pl
+1 -3
View File
@@ -10,9 +10,7 @@
use strict;
use FindBin qw($Bin);
use lib ($Bin, "$Bin/../../lib/perl");
use databaseModuleDirs;
no lib $Bin;
use lib ("$Bin/../../lib/perl");
use DBD;
use DBD::Parser;
modules/database/src/tools/dbdReport.pl
+1 -3
View File
@@ -8,9 +8,7 @@
#*************************************************************************
use FindBin qw($Bin);
use lib ($Bin, "$Bin/../../lib/perl");
use databaseModuleDirs;
no lib $Bin;
use lib ("$Bin/../../lib/perl");
use DBD;
use DBD::Parser;
modules/database/src/tools/dbdToHtml.pl
+1 -3
View File
@@ -10,9 +10,7 @@
use strict;
use FindBin qw($Bin);
use lib ($Bin, "$Bin/../../lib/perl");
use databaseModuleDirs;
no lib $Bin;
use lib ("$Bin/../../lib/perl");
use DBD;
use DBD::Parser;
modules/database/src/tools/dbdToMenuH.pl
+1 -3
View File
@@ -8,9 +8,7 @@
#*************************************************************************
use FindBin qw($Bin);
use lib ($Bin, "$Bin/../../lib/perl");
use databaseModuleDirs;
no lib $Bin;
use lib ("$Bin/../../lib/perl");
use EPICS::Getopts;
use File::Basename;
modules/database/src/tools/dbdToRecordtypeH.pl
+1 -3
View File
@@ -8,9 +8,7 @@
#*************************************************************************
use FindBin qw($Bin);
use lib ($Bin, "$Bin/../../lib/perl");
use databaseModuleDirs;
no lib $Bin;
use lib ("$Bin/../../lib/perl");
use EPICS::Getopts;
use File::Basename;
modules/database/src/tools/registerRecordDeviceDriver.pl
+1 -3
View File
@@ -12,9 +12,7 @@
use strict;
use FindBin qw($Bin);
use lib ($Bin, "$Bin/../../lib/perl");
use databaseModuleDirs;
no lib $Bin;
use lib ("$Bin/../../lib/perl");
use DBD;
use DBD::Parser;