Merge branch 'devEpics' into 'master'

E3-574: Fixing the .dbd install issue

See merge request e3/wrappers/core/e3-asyn!13

asyn.Makefile

-##################################################
-#
-# From R.4.37+:
-#
-# In order to compile the generated devEpics.dbd (which is done in RULES.Db), we need to define
-# $(DBDCAT) and $(devEpics_DBD) before we include that file, i.e. before we include driver.makefile.
-#
-##################################################
+LEGACY_RSET = YES
+
+where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+include $(E3_REQUIRE_TOOLS)/driver.makefile
+include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS
 
 ASYN = asyn
 
@@ -22,37 +19,6 @@ ASYNGPIB:=$(ASYN)/asynGpib
 ASYNDRIVER:=$(ASYN)/asynDriver
 
 
-DBDCAT += devEpics.dbd 
-
-devEpics_DBD += $(DEVEPICS)/devAsynOctet.dbd
-devEpics_DBD += $(DEVEPICS)/devAsynInt32.dbd
-devEpics_DBD += $(DEVEPICS)/devAsynInt8Array.dbd
-devEpics_DBD += $(DEVEPICS)/devAsynInt16Array.dbd
-devEpics_DBD += $(DEVEPICS)/devAsynInt32Array.dbd
-devEpics_DBD += $(DEVEPICS)/devAsynInt32TimeSeries.dbd
-devEpics_DBD += $(DEVEPICS)/devAsynUInt32Digital.dbd
-devEpics_DBD += $(DEVEPICS)/devAsynFloat64.dbd
-devEpics_DBD += $(DEVEPICS)/devAsynFloat32Array.dbd
-devEpics_DBD += $(DEVEPICS)/devAsynFloat64Array.dbd
-devEpics_DBD += $(DEVEPICS)/devAsynFloat64TimeSeries.dbd
-devEpics_DBD += $(DEVEPICS)/devAsynInt64.dbd
-devEpics_DBD += $(DEVEPICS)/devAsynInt64Array.dbd
-devEpics_DBD += $(DEVEPICS)/devAsynInt64TimeSeries.dbd
-devEpics_DBD += $(DEVEPICS)/devAsynInt64Misc.dbd
-
-# 3.15 and above support lsi, lso and printf records
-#devEpics_DBD += $(DEVEPICS)/devAsynOctetLs.dbd
-
-# If we include calc and sscan in the asyn build, then uncomment these lines.
-#devEpics_DBD += $(DEVEPICS)/asynCalc.dbd
-
-
-LEGACY_RSET = YES
-
-where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-include $(E3_REQUIRE_TOOLS)/driver.makefile
-include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS
-
 USR_CFLAGS   += -Wno-unused-variable
 USR_CFLAGS   += -Wno-unused-function
 USR_CFLAGS   += -Wno-unused-but-set-variable
@@ -65,7 +31,7 @@ USR_CXXFLAGS += -DHAVE_DEVINT64
 
 # The following need to be set after driver.makefile is included, as USR_CLFAGS is set to "" in CONFIG_COMMON
 # 3.15 and above support lsi, lso and printf records. 
-#USR_CFLAGS += -DHAVE_LSREC
+USR_CFLAGS += -DHAVE_LSREC
 
 # If we include calc and sscan in the asyn build, then uncomment these lines.
 #USR_CFLAGS += -DHAVE_CALCMOD
@@ -187,15 +153,9 @@ SOURCES += $(MISCELLANEOUS)/asynInterposeCom.c
 SOURCES += $(MISCELLANEOUS)/asynInterposeEos.c
 SOURCES += $(MISCELLANEOUS)/asynInterposeFlush.c
 
-
-# From R4-36 : show two new files such as
-# SOURCES += $(MISCELLANEOUS)/asynInterposeDelay.c
-# SOURCES += $(MISCELLANEOUS)/asynInterposeEcho.c
-# We have to use the following tricks to keep the backward compatibility.
-asynInterposeDelay_src += $(MISCELLANEOUS)/asynInterposeDelay.c
-SOURCES += $(filter $(asynInterposeDelay_src), $(wildcard $(MISCELLANEOUS)/*.c))
-asynInterposeEcho_src += $(MISCELLANEOUS)/asynInterposeEcho.c
-SOURCES += $(filter $(asynInterposeEcho_src), $(wildcard $(MISCELLANEOUS)/*.c))
+# From R4-36 onwards:
+SOURCES += $(MISCELLANEOUS)/asynInterposeDelay.c
+SOURCES += $(MISCELLANEOUS)/asynInterposeEcho.c
 
 #
 HEADERS += $(ASYNPORTDRIVER)/exceptions/ParamListInvalidIndex.h
@@ -226,11 +186,26 @@ SOURCES += $(ASYNPORTDRIVER)/asynPortDriver.cpp
 HEADERS += $(ASYNPORTCLIENT)/asynPortClient.h
 SOURCES += $(ASYNPORTCLIENT)/asynPortClient.cpp
 
-# These need to be added after driver.makefile, since it 
-# * writes over DBDS
-# * while in the directory O.$(EPICS_VERSION)_$(T_A) (pass 4), $(COMMON_DIR) already has the prefix ../ included.
+DBDS += $(DEVEPICS)/devAsynOctet.dbd
+DBDS += $(DEVEPICS)/devAsynInt32.dbd
+DBDS += $(DEVEPICS)/devAsynInt8Array.dbd
+DBDS += $(DEVEPICS)/devAsynInt16Array.dbd
+DBDS += $(DEVEPICS)/devAsynInt32Array.dbd
+DBDS += $(DEVEPICS)/devAsynInt32TimeSeries.dbd
+DBDS += $(DEVEPICS)/devAsynUInt32Digital.dbd
+DBDS += $(DEVEPICS)/devAsynFloat64.dbd
+DBDS += $(DEVEPICS)/devAsynFloat32Array.dbd
+DBDS += $(DEVEPICS)/devAsynFloat64Array.dbd
+DBDS += $(DEVEPICS)/devAsynFloat64TimeSeries.dbd
+DBDS += $(DEVEPICS)/devAsynInt64.dbd
+DBDS += $(DEVEPICS)/devAsynInt64Array.dbd
+DBDS += $(DEVEPICS)/devAsynInt64TimeSeries.dbd
+DBDS += $(DEVEPICS)/devAsynInt64Misc.dbd
+DBDS += $(DEVEPICS)/devAsynOctetLs.dbd
+
+# If we include calc and sscan in the asyn build, then uncomment this line.
+# DBDS += $(DEVEPICS)/asynCalc.dbd
 
-DBDS += $(devEpics_DBD)
 DBD_SRCS += $(addprefix $(COMMON_DIR)/,$(DBDCAT))
 
 
@@ -331,16 +306,15 @@ SCRIPTS += $(wildcard ./iocsh/*.iocsh)
 
 asynRecord$(OBJ): $(COMMON_DIR)/asynRecord.h
 
+# asyn.dbd explicitly includes devEpics.dbd, which is used in the usual build process to conditionally
+# include certain other files. We are building a fixed dbd file, so we can just generate a blank one.
 
-# For 3.14
-#drvVxi11$(OBJ): ../$(VXI11)/vxi11intr.h
-# For 3.15
-#drvVxi11$(DEP): ../$(VXI11)/vxi11intr.h ../$(VXI11)/vxi11core.h
-#vxi11core_xdr.c$(DEP): ../$(VXI11)/vxi11core.h
+DBDEXPANDPATH += -I .
 
-# Override the default DBDCAT_COMMAND
-$(COMMON_DIR)/devEpics.dbd: DBDCAT_COMMAND = $(PERL) $(TOOLS)/makeIncludeDbd.pl $(devEpics_DBD) $(notdir $@)
+asyn.dbd: devEpics.dbd
 
+devEpics.dbd:
+	echo "# This is a generated file." > $@
 
 $(DBDINC_DEPS): $(DBDINC_HDRS)
 

configure/module/RULES_MODULE

@@ -20,4 +20,11 @@ epics:
 epics-clean:
 	$(SUDOBASH) "$(MAKE) -C $(E3_MODULE_SRC_PATH) clean"
 
+module_tests: check_dbd_install
+
+.PHONY: check_dbd_install
+check_dbd_install:
+	install_dir=$$(mktemp -d); \
+	make cellbuild E3_CELL_PATH="$${install_dir}" ; \
+	[[ "$$(ls "$${install_dir}" | wc -l)" = 0 ]]