From dfa75e0599126a0168e50db745f840808f4d4c35 Mon Sep 17 00:00:00 2001
From: Wayne Lewis <wayne.lewis@ess.eu>
Date: Mon, 6 Dec 2021 12:11:22 -0800
Subject: [PATCH] Remove EPICS base 3 references
---
configure/CONFIG | 3 ---
require-ess/tools/driver.makefile | 14 ++------------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/configure/CONFIG b/configure/CONFIG
index 5487f778..7056f91f 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -31,9 +31,6 @@ include $(REQUIRE_CONFIG)/CONFIG_EPICS
include $(REQUIRE_CONFIG)/CONFIG_EXPORT
-VARS_EXCLUDES+=BASE_3_14
-VARS_EXCLUDES+=BASE_3_15
-VARS_EXCLUDES+=BASE_3_16
VARS_EXCLUDES+=BASE_7_0
VARS_EXCLUDES+=EPICS_VERSION
VARS_EXCLUDES+=EPICS_REVISION
diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile
index 0052e94a..c49f281c 100644
--- a/require-ess/tools/driver.makefile
+++ b/require-ess/tools/driver.makefile
@@ -507,7 +507,6 @@ COMMON_DIR = ../O.${EPICSVERSION}_Common
# Remove include directory for this module from search path.
INSTALL_INCLUDES =
-EPICS_INCLUDES =
# Add include directory of foreign modules to include file search path.
#
@@ -572,9 +571,6 @@ endif # MINOR
LDFLAGS += ${PROVIDES} ${USR_LDFLAGS_${T_A}}
# Create and include dependency files.
-# 3.14.8 uses HDEPENDS to select depends mode
-# 3.14.12 uses 'HDEPENDSCFLAGS -MMD' (does not catch #include <...>)
-# 3.15 uses 'HDEPENDS_COMPFLAGS = -MM -MF $@' (does not catch #include <...>)
HDEPENDS =
HDEPENDS_METHOD = COMP
HDEPENDS_COMPFLAGS = -c
@@ -595,9 +591,6 @@ SRC_INCLUDES = $(addprefix -I, $(wildcard $(foreach d,$(call uniq, $(filter-out
# Look for includes from standard locations relative to vendor libraries
USR_INCLUDES += $(addprefix -I,$(wildcard $(patsubst %/lib/$(T_A)/,../%/include,$(call uniq,$(dir $(VLIBS))) $(patsubst %/lib/,../%/include,$(call uniq,$(dir $(VLIBS)))))))
-# Different macro name for 3.14.8.
-GENERIC_SRC_INCLUDES = $(SRC_INCLUDES)
-
# Create dbd file for snl code.
DBDFILES += $(patsubst %.st,%_snl.dbd,$(notdir $(filter %.st,${SRCS})))
DBDFILES += $(patsubst %.stt,%_snl.dbd,$(notdir $(filter %.stt,${SRCS})))
@@ -605,8 +598,7 @@ DBDFILES += $(patsubst %.stt,%_snl.dbd,$(notdir $(filter %.stt,${SRCS})))
# Create dbd file for GPIB code.
DBDFILES += $(patsubst %.gt,%.dbd,$(notdir $(filter %.gt,${SRCS})))
-# snc location in 3.14: From latest version of module seq or fall back to globally installed snc.
-#SNC=$(lastword $(dir ${EPICS_BASE})seq/bin/$(EPICS_HOST_ARCH)/snc $(shell ls -dv ${EPICS_MODULES}/seq/$(or $(seq_VERSION),$(VERSIONGLOB))/bin/${EPICS_HOST_ARCH}/snc 2>/dev/null))
+# snc location
SNCALL=$(shell ls -dv $(E3_SITEMODS_PATH)/sequencer/$(call FETCH_BUILD_NUMBER,$(E3_SITEMODS_PATH),sequencer)/bin/$(EPICS_HOST_ARCH) 2> /dev/null)
SNC=$(lastword $(SNCALL))/snc
@@ -665,11 +657,9 @@ endif
# Fix incompatible release rules.
RELEASE_DBDFLAGS = -I ${EPICS_BASE}/dbd
RELEASE_INCLUDES = -I${EPICS_BASE}/include
-# For EPICS 3.15:
+# For EPICS 3.15+:
RELEASE_INCLUDES += -I${EPICS_BASE}/include/compiler/${CMPLR_CLASS}
RELEASE_INCLUDES += -I${EPICS_BASE}/include/os/${OS_CLASS}
-# Dor EPICS 3.13:
-EPICS_INCLUDES += -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS)
# Find all sources and set vpath accordingly.
$(foreach file, ${SRCS} ${TEMPLS} ${DBDINSTALLS} ${SCR}, $(eval vpath $(notdir ${file}) ../$(dir ${file})))
--
GitLab