Experimental Physics and Industrial Control System

Core Group mtg: Further exploration on Perl ModuleDirs files by ANJ; diff comments with fixes, but in principle this is acceptable.

Diff comments:

> diff --git a/modules/ca/src/perl/capr.pl b/modules/ca/src/perl/capr.pl
> index e551afc..17a6dd0 100644
> --- a/modules/ca/src/perl/capr.pl
> +++ b/modules/ca/src/perl/capr.pl
> @@ -10,8 +10,7 @@
>  use strict;
>  
>  use FindBin qw($Bin);
> -use lib ($Bin, "$Bin/../../lib/perl");
> -use caModuleDirs;
> +use lib ("$Bin/../../lib/perl");
>  no lib $Bin;

Remove "no lib $Bin" in all non-template scripts where you removed $Bin from the "use lib" line.

>  
>  use Getopt::Std;
> diff --git a/modules/ca/src/template/top/caPerlApp/caget.pl b/modules/ca/src/template/top/caPerlApp/caget.pl
> index 0d9af37..dae3a77 100644
> --- a/modules/ca/src/template/top/caPerlApp/caget.pl
> +++ b/modules/ca/src/template/top/caPerlApp/caget.pl
> @@ -4,7 +4,7 @@ use strict;
>  
>  # This construct sets @INC to search lib/perl of all RELEASE entries
>  use FindBin qw($Bin);
> -use lib ($Bin, "$Bin/../../lib/perl");
> +use lib ("$Bin/../../lib/perl");

This probably breaks the template, and ANJ wants to keep the ModuleDirs stuff which is needed for this template code to work (or users have to set PERL5LIB to Base/lib/perl).

>  use _APPNAME_ModuleDirs;
>  no lib $Bin;
>  
> diff --git a/modules/libcom/configure/CONFIG b/modules/libcom/configure/CONFIG
> deleted file mode 100644
> index 774ed25..0000000
> --- a/modules/libcom/configure/CONFIG
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -# CONFIG - Load build configuration data
> -#
> -# Do not make changes to this file!
> -
> -ifeq ($(strip $(EPICS_HOST_ARCH)),)
> -  $(warning EPICS_HOST_ARCH is not set.)
> -endif
> -
> -# Allow user to override where the build rules come from
> -RULES = $(EPICS_BASE)
> -
> -# RELEASE files point to other application tops
> -include $(TOP)/configure/RELEASE
> --include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
> -ifdef T_A
> --include $(TOP)/configure/RELEASE.Common.$(T_A)
> --include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
> -endif
> -
> -ifeq ($(strip $(RULES)),)
> -  ifeq ($(strip $(EPICS_BASE)),)
> -    $(warning Build error: EPICS_BASE not set after including RELEASE files.)
> -  else
> -    $(warning Build error: EPICS_BASE set but RULES variable empty.)
> -  endif
> -  $(error Makefiles loaded: $(MAKEFILE_LIST))
> -  # Die before the include of $(CONFIG)/CONFIG below does
> -endif
> -
> -BUILDING_LIBCOM = DEFINED

Conditional stuff in CONFIG_LIBCOM_MODULE needs removing that used BUILDING_LIBCOM when building stand-alone.

> -
> -CONFIG = $(RULES)/configure
> -include $(CONFIG)/CONFIG
> -
> -# Override the Base definition:
> -INSTALL_LOCATION = $(TOP)
> -
> -# CONFIG_SITE files contain other build configuration settings
> -include $(TOP)/configure/CONFIG_SITE
> --include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
> -ifdef T_A
> - -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
> - -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
> -endif


-- 
https://code.launchpad.net/~epics-core/epics-base/+git/Com/+merge/361381
Your team EPICS Core Developers is requested to review the proposed merge of ~epics-core/epics-base/+git/Com:make-simple into epics-base:7.0.

Navigate by Date:

Prev: Re: [Merge] ~epics-core/epics-base/+git/asLib:as-hostname into epics-base:7.0 Andrew Johnson via Core-talk

Next: Build failed in Jenkins: epics-base-7.0-win64s-test #14 APS Jenkins via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  <2019>  2020  2021  2022  2023  2024 

Navigate by Thread:

Prev: [Merge] ~epics-core/epics-base/+git/asLib:as-hostname into epics-base:7.0 noreply--- via Core-talk

Next: Re: [Merge] ~epics-core/epics-base/+git/Com:make-simple into epics-base:7.0 mdavidsaver via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  <2019>  2020  2021  2022  2023  2024