Skip to content

Commit b59c053

Browse files
committed
Changes following #133
1 parent e467ff3 commit b59c053

3 files changed

Lines changed: 6 additions & 6 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", "pvxslibs>=1.2.1a1"]
2+
requires = ["setuptools", "wheel", "setuptools_dso>=2.1", "epicscorelibs>=7.0.7.99.0.0"]
33
build-backend = "setuptools.build_meta:__legacy__"

‎setup.py‎

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

@@ -60,11 +58,9 @@
6058
sources = sources,
6159
include_dirs=[
6260
epicscorelibs.path.include_path,
63-
pvxslibs.path.include_path,
6461
devIocStats_src, devIocStats_os, devIocStats_default
6562
],
6663
dsos = [
67-
'pvxslibs.lib.pvxsIoc',
6864
'epicscorelibs.lib.dbRecStd',
6965
'epicscorelibs.lib.dbCore',
7066
'epicscorelibs.lib.ca',
@@ -95,7 +91,7 @@ def install_for_development(self):
9591
install_requires = [
9692
# Dependency version declared in pyproject.toml
9793
epicscorelibs.version.abi_requires(),
98-
pvxslibs.version.abi_requires(),
94+
"pvxslibs>=1.2.1a1",
9995
"numpy",
10096
"epicsdbbuilder>=1.4"
10197
],

‎softioc/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
'''Python soft IOC module.'''
22
import os
3+
import ctypes
34

5+
from setuptools_dso.runtime import find_dso
46
import epicscorelibs.path
57
import pvxslibs.path
68
from epicscorelibs.ioc import \
@@ -24,6 +26,8 @@
2426
iocStats = os.path.join(os.path.dirname(__file__), "iocStats", "devIocStats")
2527
dbLoadDatabase('devIocStats.dbd', iocStats, None)
2628

29+
ctypes.CDLL(find_dso('pvxslibs.lib.pvxsIoc'), ctypes.RTLD_GLOBAL)
30+
os.environ.setdefault('PVXS_QSRV_ENABLE', 'YES')
2731
if registerRecordDeviceDriver(pdbbase):
2832
raise RuntimeError('Error registering')
2933

0 commit comments

Comments
 (0)