Skip to content

Commit

Permalink
Try to use pvxslibs instead of qsrv
Browse files Browse the repository at this point in the history
  • Loading branch information
coretl committed Jun 6, 2023
1 parent 860f59c commit e467ff3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -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__"
9 changes: 5 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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"
],
Expand Down
8 changes: 5 additions & 3 deletions softioc/__init__.py
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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)

Expand Down

0 comments on commit e467ff3

Please sign in to comment.