Skip to content

Commit 5fac491

Browse files
committed
[Snapshot] on including generated python file
1 parent 6c3f3a6 commit 5fac491

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

bact_archiver/carchiver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"""
66

77
from .epics_event import read_chunk, decode
8-
from . import epics_event_pb2 as proto
8+
import bact_archiver_epics_event_pb2 as proto
99
from .protocol_buffer import (Chunk, dtypes as _dtypes, decoder as _decoder,
1010
dbrtypes as _dbrtypes, dsize as _dsize)
1111
from .archiver import ArchiverBasis, convert_datetime_to_timestamp

bact_archiver/proto/meson.build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ py_generated = py_gen.process('epics_event.proto')
2020
# build_by_default : true)
2121
message('install dir')
2222
message(py.get_install_dir())
23-
py_proc2 = configure_file(#'python_proto_as_config',
24-
# command: [ 'proto_wrap.sh', '@INPUT@', '@OUTPUT@' ],
25-
copy : true,
23+
py_proc2 = configure_file(# 'python_proto_as_config',
24+
command: [ 'proto_wrap.sh', '@INPUT@', '@OUTPUT@' ],
25+
# copy : true,
2626
input : 'epics_event.proto',
27-
output : 'epics_event_pb2.py',
27+
output : 'bact_archiver_epics_event_pb2.py',
2828
install : true,
2929
install_dir: py.get_install_dir(),
3030
)

meson.build

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ py = import('python').find_installation(pure: false)
1212

1313
# need to build the proto generated files before
1414
# I can build the cython extension
15-
subdir('proto')
16-
subdir('bact_archiver')
15+
subdir('bact_archiver')

0 commit comments

Comments
 (0)