From 9404a076e1ec3c1470d89549b525da7a535f4a56 Mon Sep 17 00:00:00 2001 From: Pierre Schnizer Date: Mon, 16 Dec 2024 16:23:21 +0100 Subject: [PATCH] [Snapshot] current development --- .../proto}/epics_event.proto | 0 .../proto}/epics_event.pxd | 0 .../proto}/epics_event.pyx | 0 {proto => bact_archiver/proto}/meson.build | 21 +++++++++++++------ 4 files changed, 15 insertions(+), 6 deletions(-) rename {proto => bact_archiver/proto}/epics_event.proto (100%) rename {proto => bact_archiver/proto}/epics_event.pxd (100%) rename {proto => bact_archiver/proto}/epics_event.pyx (100%) rename {proto => bact_archiver/proto}/meson.build (62%) diff --git a/proto/epics_event.proto b/bact_archiver/proto/epics_event.proto similarity index 100% rename from proto/epics_event.proto rename to bact_archiver/proto/epics_event.proto diff --git a/proto/epics_event.pxd b/bact_archiver/proto/epics_event.pxd similarity index 100% rename from proto/epics_event.pxd rename to bact_archiver/proto/epics_event.pxd diff --git a/proto/epics_event.pyx b/bact_archiver/proto/epics_event.pyx similarity index 100% rename from proto/epics_event.pyx rename to bact_archiver/proto/epics_event.pyx diff --git a/proto/meson.build b/bact_archiver/proto/meson.build similarity index 62% rename from proto/meson.build rename to bact_archiver/proto/meson.build index 16f4176..8591939 100644 --- a/proto/meson.build +++ b/bact_archiver/proto/meson.build @@ -13,12 +13,21 @@ py_gen = generator(protoc, cpp_generated = cpp_gen.process('epics_event.proto') py_generated = py_gen.process('epics_event.proto') -py_proc = custom_target('py_proto', - command: [ 'cp', '@INPUT@', '@OUTPUT@' ], - input : py_generated, - output : 'epics_event_pb2.py', - build_by_default : true) - +# py_proc = custom_target('py_proto', +# command: [ 'cp', '@INPUT@', '@OUTPUT@' ], +# input : py_generated, +# output : 'epics_event_pb2.py', +# build_by_default : true) +message('install dir') +message(py.get_install_dir()) +py_proc2 = configure_file(#'python_proto_as_config', + # command: [ 'proto_wrap.sh', '@INPUT@', '@OUTPUT@' ], + copy : true, + input : 'epics_event.proto', + output : 'epics_event_pb2.py', + install : true, + install_dir: py.get_install_dir(), +) # cython extension incdir_numpy = run_command(py, ['-c', 'import os; os.chdir(".."); import numpy; print(numpy.get_include())'],