From 62755a01ae07709e4575009691d35e188d6840df Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Wed, 3 Mar 2021 10:29:51 +0100
Subject: [PATCH] Fixed issue with iocshRegisterCommon.h missing from
require_registerRecordDeviceDriver.cpp
---
App/tools/driver.makefile | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile
index f1d98f2..76485e7 100644
--- a/App/tools/driver.makefile
+++ b/App/tools/driver.makefile
@@ -738,19 +738,6 @@ DBDFILES += $(patsubst %.stt,%_snl.dbd,$(notdir $(filter %.stt,${SRCS})))
# Create dbd file for GPIB code.
DBDFILES += $(patsubst %.gt,%.dbd,$(notdir $(filter %.gt,${SRCS})))
-# Create dbd file with references to all subRecord functions.
-# Problem: functions may be commented out. Better preprocess, but then generate headers first.
-#define maksubfuncfile
-#/static/ {static=1} \
-#/\([\t ]*(struct)?[\t ]*(genSub|sub|aSub)Record[\t ]*\*[\t ]*\w+[\t ]*\)/ { \
-# match ($$0,/(\w+)[\t ]*\([\t ]*(struct)?[\t ]*\w+Record[\t ]*\*[\t ]*\w+[\t ]*\)/, a); \
-# n=a[1];if(!static && !f[n]){f[n]=1;print "function (" n ")"}} \
-#/[;{}]/ {static=0}
-#endef
-#
-#$(shell awk '$(maksubfuncfile)' $(addprefix ../,$(filter %.c %.cc %.C %.cpp, $(SRCS))) > ${SUBFUNCFILE})
-#DBDFILES += $(if $(shell cat ${SUBFUNCFILE}),${SUBFUNCFILE})
-
# snc location in 3.14: From latest version of module seq or fall back to globally installed snc.
# In a conda environment we have only one version so this could be simplify
SNC=$(lastword $(dir ${EPICS_BASE})seq/bin/$(EPICS_HOST_ARCH)/snc $(shell ls -dv ${EPICS_MODULES}/seq/$(or $(seq_VERSION),+([0-9]).+([0-9]).+([0-9]))/bin/${EPICS_HOST_ARCH}/snc 2>/dev/null))
@@ -1010,9 +997,7 @@ ${VERSIONFILE}:
# EPICS R3.14.*:
# Create file to fill registry from dbd file.
${REGISTRYFILE}: ${MODULEDBD}
- $(RM) $@ temp.cpp
- $(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl $< $(basename $@) | grep -v iocshRegisterCommon > temp.cpp
- $(MV) temp.cpp $@
+ $(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl $< $(basename $@) > $@
# 3.14.12 complains if this rule is not overwritten
./%Include.dbd:
--
GitLab