diff --git a/.gitignore b/.gitignore index 7dde283..ca4dbdd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,15 @@ -bin/ -lib/ -doc/ -include/ -db/ -dbd/ -documentation/html -documentation/*.tag +/bin/ +/cfg/ +/lib/ +/include/ +/db/ +/dbd/ +/documentation/html +/documentation/*.tag +/configure/*.local +/configure/RELEASE.* +/configure/CONFIG_SITE.* +/!configure/ExampleRELEASE.local envPaths -configure/*.local -configure/RELEASE.* -configure/CONFIG_SITE.* -!configure/ExampleRELEASE.local **/O.* QtC-* diff --git a/configure/CONFIG_QSRV_VERSION b/configure/CONFIG_QSRV_VERSION new file mode 100644 index 0000000..de3e0ec --- /dev/null +++ b/configure/CONFIG_QSRV_VERSION @@ -0,0 +1,9 @@ +# Module (source) version +EPICS_QSRV_MAJOR_VERSION = 1 +EPICS_QSRV_MINOR_VERSION = 0 +EPICS_QSRV_MAINTENANCE_VERSION = 0 +EPICS_QSRV_DEVELOPMENT_FLAG = 1 + +# ABI version +EPICS_QSRV_ABI_MAJOR_VERSION = 1 +EPICS_QSRV_ABI_MINOR_VERSION = 0 diff --git a/configure/Makefile b/configure/Makefile index 9254309..a3f78d3 100644 --- a/configure/Makefile +++ b/configure/Makefile @@ -5,4 +5,6 @@ include $(TOP)/configure/CONFIG TARGETS = $(CONFIG_TARGETS) CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS))) +CFG += CONFIG_QSRV_VERSION + include $(TOP)/configure/RULES diff --git a/pdbApp/Makefile b/pdbApp/Makefile index 92258ce..37844d6 100644 --- a/pdbApp/Makefile +++ b/pdbApp/Makefile @@ -7,6 +7,8 @@ include $(TOP)/configure/CONFIG LIBRARY += qsrv +SHRLIB_VERSION ?= $(EPICS_QSRV_ABI_MAJOR_VERSION).$(EPICS_QSRV_ABI_MINOR_VERSION) + USR_CPPFLAGS += -I$(TOP)/common -I$(TOP)/p2pApp qsrv_SRCS += pvif.cpp diff --git a/pdbApp/qsrv.dbd b/pdbApp/qsrv.dbd index ce5f41e..14046d0 100644 --- a/pdbApp/qsrv.dbd +++ b/pdbApp/qsrv.dbd @@ -1,3 +1,6 @@ +# Changes to this file may require incrementing +# the ABI version in CONFIG_QSRV_VERSION + registrar(QSRVRegistrar) #registrar(installPVAAddLinkHook) #link("pva", "lsetPVA")