Skip to content

Commit e467ff3

Browse files
committed
Try to use pvxslibs instead of qsrv
1 parent 860f59c commit e467ff3

3 files changed

Lines changed: 11 additions & 8 deletions

File tree

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[build-system]
2-
requires = ["setuptools", "wheel", "setuptools_dso>=2.1", "epicscorelibs>=7.0.7.99.0.0"]
2+
requires = ["setuptools", "wheel", "setuptools_dso>=2.1", "epicscorelibs>=7.0.7.99.0.0", "pvxslibs>=1.2.1a1"]
33
build-backend = "setuptools.build_meta:__legacy__"

‎setup.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
from setuptools.command.develop import develop
55
import epicscorelibs.path
66
import epicscorelibs.version
7+
import pvxslibs.path
8+
import pvxslibs.version
79
from setuptools_dso import Extension, setup
810
from epicscorelibs.config import get_config_var
911

@@ -58,13 +60,11 @@
5860
sources = sources,
5961
include_dirs=[
6062
epicscorelibs.path.include_path,
63+
pvxslibs.path.include_path,
6164
devIocStats_src, devIocStats_os, devIocStats_default
6265
],
6366
dsos = [
64-
'epicscorelibs.lib.qsrv',
65-
'epicscorelibs.lib.pvAccessIOC',
66-
'epicscorelibs.lib.pvAccess',
67-
'epicscorelibs.lib.pvData',
67+
'pvxslibs.lib.pvxsIoc',
6868
'epicscorelibs.lib.dbRecStd',
6969
'epicscorelibs.lib.dbCore',
7070
'epicscorelibs.lib.ca',
@@ -95,6 +95,7 @@ def install_for_development(self):
9595
install_requires = [
9696
# Dependency version declared in pyproject.toml
9797
epicscorelibs.version.abi_requires(),
98+
pvxslibs.version.abi_requires(),
9899
"numpy",
99100
"epicsdbbuilder>=1.4"
100101
],

‎softioc/__init__.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
'''Python soft IOC module.'''
22
import os
33

4-
from epicscorelibs import path
4+
import epicscorelibs.path
5+
import pvxslibs.path
56
from epicscorelibs.ioc import \
67
iocshRegisterCommon, registerRecordDeviceDriver, pdbbase
78

@@ -17,8 +18,9 @@
1718

1819
# Need to do this before calling anything in device.py
1920
iocshRegisterCommon()
20-
for dbd in ('base.dbd', 'PVAServerRegister.dbd', 'qsrv.dbd'):
21-
dbLoadDatabase(dbd, os.path.join(path.base_path, 'dbd'), None)
21+
base_dbd_path = os.path.join(epicscorelibs.path.base_path, 'dbd')
22+
dbLoadDatabase('base.dbd', base_dbd_path, None)
23+
dbLoadDatabase('pvxsIoc.dbd', pvxslibs.path.dbd_path, None)
2224
iocStats = os.path.join(os.path.dirname(__file__), "iocStats", "devIocStats")
2325
dbLoadDatabase('devIocStats.dbd', iocStats, None)
2426

0 commit comments

Comments
 (0)