Merge branch 'dev/feature/meson-build' of https://github.com/hz-b/bact-archiver into dev/feature/meson-build

Author: hzb-ps

bact_archiver/carchiver.py

@@ -5,7 +5,7 @@
 """
 
 from .epics_event import read_chunk, decode
-from . import epics_event_pb2 as proto
+import bact_archiver_epics_event_pb2 as proto
 from .protocol_buffer import (Chunk, dtypes as _dtypes, decoder as _decoder,
                               dbrtypes as _dbrtypes, dsize as _dsize)
 from .archiver import ArchiverBasis, convert_datetime_to_timestamp

bact_archiver/meson.build

@@ -5,11 +5,6 @@ py_sources = run_command('/bin/sh',
 
 py.install_sources(
   py_sources,
-<<<<<<< HEAD
-  # 'epics_event_pb2.py',
-=======
-  'epics_event_pb2.py',
->>>>>>> cc30f5d ([FIX] included created python file)
   'archiver.cfg',
   pure: false,
   subdir: 'bact_archiver'

bact_archiver/proto/meson.build

@@ -6,31 +6,35 @@ cpp_gen = generator(protoc,
   output    : ['@[email protected]', '@[email protected]'],
   arguments : ['--proto_path=@CURRENT_SOURCE_DIR@', '--cpp_out=@BUILD_DIR@', '@INPUT@']
   )
+cpp_generated = cpp_gen.process('epics_event.proto')
+# does not fully work ..
+# how do I install it
 py_gen = generator(protoc,
   output    : ['@BASENAME@_pb2.py'],
   arguments : ['--proto_path=@CURRENT_SOURCE_DIR@', '--python_out=@BUILD_DIR@', '@INPUT@']
   )
-cpp_generated = cpp_gen.process('epics_event.proto')
 py_generated = py_gen.process('epics_event.proto')
 
-# cython extension
-incdir_numpy = run_command(py,
-  ['-c', 'import os; os.chdir(".."); import numpy; print(numpy.get_include())'],
-  check : true
-).stdout().strip()
-inc_dir = include_directories(incdir_numpy)
-
 py_gen2 = custom_target('epics_event_build_py',
     output: ['epics_event_pb2.py'],
     input: 'epics_event.proto',
     command: [
         protoc, '--proto_path=@SRCDIR@', '--python_out=@OUTDIR@', '@INPUT@'
     ],
     install: true,
-    install_dir: py.get_install_dir() / 'bact_archiver',  # need to install _umfpack.py
+    install_dir: py.get_install_dir() / 'bact_archiver',  # need to instalall epics_event_pb2.py
     install_tag: 'python-runtime',
 )
 
+
+# cython extension
+incdir_numpy = run_command(py,
+  ['-c', 'import os; os.chdir(".."); import numpy; print(numpy.get_include())'],
+  check : true
+).stdout().strip()
+inc_dir = include_directories(incdir_numpy)
+
+
 py.extension_module(
   'epics_event',
   'epics_event.pyx',