From 0b469713a8845c10c73c26950e4a15f645235f0d Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Tue, 16 Apr 2024 17:18:20 +0900 Subject: [PATCH 1/5] add qsrv (PVA) to template build.mak --- modules/database/src/template/top/iocApp/src/build.mak | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/database/src/template/top/iocApp/src/build.mak b/modules/database/src/template/top/iocApp/src/build.mak index 6836d126..c039e191 100644 --- a/modules/database/src/template/top/iocApp/src/build.mak +++ b/modules/database/src/template/top/iocApp/src/build.mak @@ -17,6 +17,7 @@ DBD += $(APPNAME).dbd # _APPNAME_.dbd will be made up from these files: $(APPNAME)_DBD += base.dbd +$(APPNAME)_DBD += qsrv.dbd ## ISIS standard dbd ## $(APPNAME)_DBD += icpconfig.dbd $(APPNAME)_DBD += pvdump.dbd @@ -24,6 +25,7 @@ $(APPNAME)_DBD += asSupport.dbd $(APPNAME)_DBD += devIocStats.dbd $(APPNAME)_DBD += caPutLog.dbd $(APPNAME)_DBD += utilities.dbd +$(APPNAME)_DBD += PVAServerRegister.dbd ## Stream device support ## $(APPNAME)_DBD += calcSupport.dbd $(APPNAME)_DBD += asyn.dbd @@ -53,7 +55,7 @@ $(APPNAME)_LIBS += autosave $(APPNAME)_LIBS += utilities pugixml libjson zlib $(APPNAME)_LIBS += calc sscan $(APPNAME)_LIBS += pcrecpp pcre -$(APPNAME)_LIBS += seq pv +$(APPNAME)_LIBS += seq pv qsrv # _APPNAME__registerRecordDeviceDriver.cpp derives from _APPNAME_.dbd $(APPNAME)_SRCS += $(APPNAME)_registerRecordDeviceDriver.cpp @@ -66,6 +68,7 @@ $(APPNAME)_SRCS_vxWorks += -nil- #$(APPNAME)_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary # Finally link to the EPICS Base libraries +$(APPNAME)_LIBS += $(EPICS_BASE_PVA_CORE_LIBS) $(APPNAME)_LIBS += $(EPICS_BASE_IOC_LIBS) #=========================== From 548c324392fafb93932c32713bfea4358d831c7a Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Wed, 17 Apr 2024 10:36:29 +0900 Subject: [PATCH 2/5] use qsrv then pvxs --- .../src/template/top/iocApp/src/build.mak | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/modules/database/src/template/top/iocApp/src/build.mak b/modules/database/src/template/top/iocApp/src/build.mak index c039e191..173100d9 100644 --- a/modules/database/src/template/top/iocApp/src/build.mak +++ b/modules/database/src/template/top/iocApp/src/build.mak @@ -17,7 +17,6 @@ DBD += $(APPNAME).dbd # _APPNAME_.dbd will be made up from these files: $(APPNAME)_DBD += base.dbd -$(APPNAME)_DBD += qsrv.dbd ## ISIS standard dbd ## $(APPNAME)_DBD += icpconfig.dbd $(APPNAME)_DBD += pvdump.dbd @@ -25,7 +24,6 @@ $(APPNAME)_DBD += asSupport.dbd $(APPNAME)_DBD += devIocStats.dbd $(APPNAME)_DBD += caPutLog.dbd $(APPNAME)_DBD += utilities.dbd -$(APPNAME)_DBD += PVAServerRegister.dbd ## Stream device support ## $(APPNAME)_DBD += calcSupport.dbd $(APPNAME)_DBD += asyn.dbd @@ -55,7 +53,7 @@ $(APPNAME)_LIBS += autosave $(APPNAME)_LIBS += utilities pugixml libjson zlib $(APPNAME)_LIBS += calc sscan $(APPNAME)_LIBS += pcrecpp pcre -$(APPNAME)_LIBS += seq pv qsrv +$(APPNAME)_LIBS += seq pv # _APPNAME__registerRecordDeviceDriver.cpp derives from _APPNAME_.dbd $(APPNAME)_SRCS += $(APPNAME)_registerRecordDeviceDriver.cpp @@ -67,8 +65,21 @@ $(APPNAME)_SRCS_vxWorks += -nil- # Add support from base/src/vxWorks if needed #$(APPNAME)_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary -# Finally link to the EPICS Base libraries +# QSRV/PVXS for PVA +ifdef PVXS_MAJOR_VERSION # prefer QSRV2 :) +$(APPNAME)_DBD += pvxsIoc.dbd +$(APPNAME)_LIBS += pvxsIoc pvxs +else +ifdef EPICS_QSRV_MAJOR_VERSION # fallback to QSRV1 +$(APPNAME)_LIBS += qsrv $(APPNAME)_LIBS += $(EPICS_BASE_PVA_CORE_LIBS) +$(APPNAME)_DBD += PVAServerRegister.dbd +$(APPNAME)_DBD += qsrv.dbd +endif +endif + + +# Finally link to the EPICS Base libraries $(APPNAME)_LIBS += $(EPICS_BASE_IOC_LIBS) #=========================== From 3104804f622cb21f6c626543026c62a548228e3d Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Mon, 22 Apr 2024 15:23:43 +0100 Subject: [PATCH 3/5] use central pva.mak --- configure/pva.mak | 13 +++++++++++++ .../database/src/template/top/iocApp/src/build.mak | 14 ++------------ 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 configure/pva.mak diff --git a/configure/pva.mak b/configure/pva.mak new file mode 100644 index 00000000..9389d3e1 --- /dev/null +++ b/configure/pva.mak @@ -0,0 +1,13 @@ +# QSRV/PVXS for PVA +ifdef PVXS_MAJOR_VERSION # prefer QSRV2 :) +$(APPNAME)_DBD += pvxsIoc.dbd +$(APPNAME)_LIBS += pvxsIoc pvxs +else +ifdef EPICS_QSRV_MAJOR_VERSION # fallback to QSRV1 +$(APPNAME)_LIBS += qsrv +$(APPNAME)_LIBS += $(EPICS_BASE_PVA_CORE_LIBS) +$(APPNAME)_DBD += PVAServerRegister.dbd +$(APPNAME)_DBD += qsrv.dbd +endif +endif + diff --git a/modules/database/src/template/top/iocApp/src/build.mak b/modules/database/src/template/top/iocApp/src/build.mak index 173100d9..83a155f1 100644 --- a/modules/database/src/template/top/iocApp/src/build.mak +++ b/modules/database/src/template/top/iocApp/src/build.mak @@ -65,18 +65,8 @@ $(APPNAME)_SRCS_vxWorks += -nil- # Add support from base/src/vxWorks if needed #$(APPNAME)_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary -# QSRV/PVXS for PVA -ifdef PVXS_MAJOR_VERSION # prefer QSRV2 :) -$(APPNAME)_DBD += pvxsIoc.dbd -$(APPNAME)_LIBS += pvxsIoc pvxs -else -ifdef EPICS_QSRV_MAJOR_VERSION # fallback to QSRV1 -$(APPNAME)_LIBS += qsrv -$(APPNAME)_LIBS += $(EPICS_BASE_PVA_CORE_LIBS) -$(APPNAME)_DBD += PVAServerRegister.dbd -$(APPNAME)_DBD += qsrv.dbd -endif -endif +include $(TOP)/configure/pva.mak + # Finally link to the EPICS Base libraries From 832a47d0da438b667c4b3204126ce243f0dd016d Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Wed, 24 Apr 2024 18:08:31 +0100 Subject: [PATCH 4/5] Fix include path and restrict to QSRV1 for moment --- configure/{pva.mak => CONFIG_PVA_ISIS} | 11 +++++------ .../database/src/template/top/iocApp/src/build.mak | 4 +--- 2 files changed, 6 insertions(+), 9 deletions(-) rename configure/{pva.mak => CONFIG_PVA_ISIS} (63%) diff --git a/configure/pva.mak b/configure/CONFIG_PVA_ISIS similarity index 63% rename from configure/pva.mak rename to configure/CONFIG_PVA_ISIS index 9389d3e1..d30c0ed9 100644 --- a/configure/pva.mak +++ b/configure/CONFIG_PVA_ISIS @@ -1,13 +1,12 @@ # QSRV/PVXS for PVA -ifdef PVXS_MAJOR_VERSION # prefer QSRV2 :) -$(APPNAME)_DBD += pvxsIoc.dbd -$(APPNAME)_LIBS += pvxsIoc pvxs -else +#ifdef PVXS_MAJOR_VERSION # prefer QSRV2 :) +#$(APPNAME)_DBD += pvxsIoc.dbd +#$(APPNAME)_LIBS += pvxsIoc pvxs +#else ifdef EPICS_QSRV_MAJOR_VERSION # fallback to QSRV1 $(APPNAME)_LIBS += qsrv $(APPNAME)_LIBS += $(EPICS_BASE_PVA_CORE_LIBS) $(APPNAME)_DBD += PVAServerRegister.dbd $(APPNAME)_DBD += qsrv.dbd endif -endif - +#endif diff --git a/modules/database/src/template/top/iocApp/src/build.mak b/modules/database/src/template/top/iocApp/src/build.mak index 83a155f1..325ec11d 100644 --- a/modules/database/src/template/top/iocApp/src/build.mak +++ b/modules/database/src/template/top/iocApp/src/build.mak @@ -65,9 +65,7 @@ $(APPNAME)_SRCS_vxWorks += -nil- # Add support from base/src/vxWorks if needed #$(APPNAME)_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary -include $(TOP)/configure/pva.mak - - +include $(CONFIG)/CONFIG_PVA_ISIS # Finally link to the EPICS Base libraries $(APPNAME)_LIBS += $(EPICS_BASE_IOC_LIBS) From b03634cfc9a3044f7f9f7fa40f929683d199d0f0 Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Wed, 24 Apr 2024 18:10:03 +0100 Subject: [PATCH 5/5] remove space --- modules/database/src/template/top/iocApp/src/build.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/database/src/template/top/iocApp/src/build.mak b/modules/database/src/template/top/iocApp/src/build.mak index 325ec11d..caa90866 100644 --- a/modules/database/src/template/top/iocApp/src/build.mak +++ b/modules/database/src/template/top/iocApp/src/build.mak @@ -53,7 +53,7 @@ $(APPNAME)_LIBS += autosave $(APPNAME)_LIBS += utilities pugixml libjson zlib $(APPNAME)_LIBS += calc sscan $(APPNAME)_LIBS += pcrecpp pcre -$(APPNAME)_LIBS += seq pv +$(APPNAME)_LIBS += seq pv # _APPNAME__registerRecordDeviceDriver.cpp derives from _APPNAME_.dbd $(APPNAME)_SRCS += $(APPNAME)_registerRecordDeviceDriver.cpp