Skip to content

Commit 3b6dafb

Browse files
committed
Add PVA support
1 parent faadf6c commit 3b6dafb

File tree

5 files changed

+14
-6
lines changed

5 files changed

+14
-6
lines changed

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", "epicscorelibs>=7.0.4.99.1"]
2+
requires = ["setuptools", "wheel", "setuptools_dso", "epicscorelibs>=7.0.6.99.1.0a1"]
33
build-backend = "setuptools.build_meta:__legacy__"

setup.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,16 @@ def _add_file(f):
7373
epicscorelibs.path.include_path,
7474
devIocStats_src, devIocStats_os, devIocStats_default
7575
],
76-
dsos = ['epicscorelibs.lib.dbCore', 'epicscorelibs.lib.Com'],
76+
dsos = [
77+
'epicscorelibs.lib.qsrv',
78+
'epicscorelibs.lib.pvAccessIOC',
79+
'epicscorelibs.lib.pvAccess',
80+
'epicscorelibs.lib.pvData',
81+
'epicscorelibs.lib.dbRecStd',
82+
'epicscorelibs.lib.dbCore',
83+
'epicscorelibs.lib.ca',
84+
'epicscorelibs.lib.Com',
85+
],
7786
define_macros = get_config_var('CPPFLAGS'),
7887
extra_compile_args = get_config_var('CFLAGS') + ["-std=c99"],
7988
extra_link_args = get_config_var('LDFLAGS'),

softioc/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212

1313
# Need to do this before calling anything in device.py
1414
iocshRegisterCommon()
15-
dbLoadDatabase("base.dbd", os.path.join(path.base_path, "dbd"), None)
15+
for dbd in ('base.dbd', 'PVAServerRegister.dbd', 'qsrv.dbd'):
16+
dbLoadDatabase(dbd, os.path.join(path.base_path, "dbd"), None)
1617
dbLoadDatabase("devIocStats.dbd", os.path.dirname(__file__), None)
1718

1819
if registerRecordDeviceDriver(pdbbase):

softioc/imports.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'''External DLL imports used for implementing Python EPICS device support.
22
'''
33

4-
import os
5-
import os.path
64
import sys
75
from ctypes import *
86

softioc/softioc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ def call_f(*args):
224224
ExportTest('eltc', (c_int,), (), '''\
225225
eltc(noYes)
226226
227-
TThis determines if error messages are displayed on the IOC console. 0 means no
227+
This determines if error messages are displayed on the IOC console. 0 means no
228228
and any other value means yes.''',
229229
lib=imports.Com)
230230

0 commit comments

Comments
 (0)