From e467ff35490b78962fbf3c09aa1740b1e9b94774 Mon Sep 17 00:00:00 2001
From: Tom Cobb <tom.cobb@diamond.ac.uk>
Date: Tue, 6 Jun 2023 13:27:58 +0000
Subject: [PATCH] Try to use pvxslibs instead of qsrv

---
 pyproject.toml      | 2 +-
 setup.py            | 9 +++++----
 softioc/__init__.py | 8 +++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 24ab8bae..7bdcd717 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools", "wheel", "setuptools_dso>=2.1", "epicscorelibs>=7.0.7.99.0.0"]
+requires = ["setuptools", "wheel", "setuptools_dso>=2.1", "epicscorelibs>=7.0.7.99.0.0", "pvxslibs>=1.2.1a1"]
 build-backend = "setuptools.build_meta:__legacy__"
diff --git a/setup.py b/setup.py
index 34157bce..7bb060dc 100644
--- a/setup.py
+++ b/setup.py
@@ -4,6 +4,8 @@
 from setuptools.command.develop import develop
 import epicscorelibs.path
 import epicscorelibs.version
+import pvxslibs.path
+import pvxslibs.version
 from setuptools_dso import Extension, setup
 from epicscorelibs.config import get_config_var
 
@@ -58,13 +60,11 @@
     sources = sources,
     include_dirs=[
         epicscorelibs.path.include_path,
+        pvxslibs.path.include_path,
         devIocStats_src, devIocStats_os, devIocStats_default
     ],
     dsos = [
-        'epicscorelibs.lib.qsrv',
-        'epicscorelibs.lib.pvAccessIOC',
-        'epicscorelibs.lib.pvAccess',
-        'epicscorelibs.lib.pvData',
+        'pvxslibs.lib.pvxsIoc',
         'epicscorelibs.lib.dbRecStd',
         'epicscorelibs.lib.dbCore',
         'epicscorelibs.lib.ca',
@@ -95,6 +95,7 @@ def install_for_development(self):
     install_requires = [
         # Dependency version declared in pyproject.toml
         epicscorelibs.version.abi_requires(),
+        pvxslibs.version.abi_requires(),
         "numpy",
         "epicsdbbuilder>=1.4"
     ],
diff --git a/softioc/__init__.py b/softioc/__init__.py
index 2fb60947..8470a669 100644
--- a/softioc/__init__.py
+++ b/softioc/__init__.py
@@ -1,7 +1,8 @@
 '''Python soft IOC module.'''
 import os
 
-from epicscorelibs import path
+import epicscorelibs.path
+import pvxslibs.path
 from epicscorelibs.ioc import \
     iocshRegisterCommon, registerRecordDeviceDriver, pdbbase
 
@@ -17,8 +18,9 @@
 
 # Need to do this before calling anything in device.py
 iocshRegisterCommon()
-for dbd in ('base.dbd', 'PVAServerRegister.dbd', 'qsrv.dbd'):
-    dbLoadDatabase(dbd, os.path.join(path.base_path, 'dbd'), None)
+base_dbd_path = os.path.join(epicscorelibs.path.base_path, 'dbd')
+dbLoadDatabase('base.dbd', base_dbd_path, None)
+dbLoadDatabase('pvxsIoc.dbd', pvxslibs.path.dbd_path, None)
 iocStats = os.path.join(os.path.dirname(__file__), "iocStats", "devIocStats")
 dbLoadDatabase('devIocStats.dbd', iocStats, None)