Reorganized protobuf (#37)

steinwurf · Oct 10, 2023 · 2f987fa · 2f987fa
1 parent c26b173
commit 2f987fa
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 64 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -64,7 +64,7 @@ endif()
 target_link_libraries(abacus PRIVATE steinwurf::endian)
 target_link_libraries(abacus PUBLIC steinwurf::protobuf)
 
-target_include_directories(abacus INTERFACE src)
+target_include_directories(abacus PUBLIC src)
 target_compile_features(abacus PUBLIC cxx_std_14)
 add_library(steinwurf::abacus ALIAS abacus)
 

diff --git a/NEWS.rst b/NEWS.rst
@@ -6,7 +6,7 @@ every change, see the Git log.
 
 Latest
 ------
-* tbd
+* Patch: Reorganized protobuf.
 
 5.2.1
 -----

diff --git a/protobuf/abacus_metric.proto → protobuf/metrics.proto b/protobuf/abacus_metric.proto → protobuf/metrics.proto
diff --git a/src/abacus/detail/to_protobuf.hpp b/src/abacus/detail/to_protobuf.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "../protobuf/abacus_metric.pb.h"
+#include "../protobuf/metrics.pb.h"
 #include "../view.hpp"
 
 #include "../version.hpp"

diff --git a/src/abacus/protobuf/abacus_metric.pb.cc → src/abacus/protobuf/metrics.pb.cc b/src/abacus/protobuf/abacus_metric.pb.cc → src/abacus/protobuf/metrics.pb.cc
diff --git a/src/abacus/protobuf/abacus_metric.pb.h → src/abacus/protobuf/metrics.pb.h b/src/abacus/protobuf/abacus_metric.pb.h → src/abacus/protobuf/metrics.pb.h
diff --git a/src/abacus/to_protobuf.cpp b/src/abacus/to_protobuf.cpp
@@ -6,7 +6,7 @@
 // Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #include "detail/to_protobuf.hpp"
-#include "protobuf/abacus_metric.pb.h"
+#include "protobuf/metrics.pb.h"
 #include "to_protobuf.hpp"
 #include "view.hpp"
 

diff --git a/src/abacus/to_protobuf.hpp b/src/abacus/to_protobuf.hpp
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "protobuf/abacus_metric.pb.h"
+#include "protobuf/metrics.pb.h"
 #include "version.hpp"
 #include "view.hpp"
 

diff --git a/wscript b/wscript
@@ -33,6 +33,7 @@ def build(bld):
         use=["protobuf", "endian_includes", "bourne"],
         install_path="${PREFIX}/lib",
         cxxflags=cxxflags,
+        includes=["src"],
         export_includes=["src"],
     )
 
@@ -78,7 +79,7 @@ def protogen(ctx):
     os.mkdir("src/abacus/protobuf")
 
     ctx.exec_command(
-        f"./{protoc_location} --cpp_out ./src/abacus/protobuf --proto_path ./protobuf protobuf/*.proto"
+        f"(./{protoc_location} --cpp_out ./src --proto_path .. ../abacus/protobuf/*.proto)"
     )
 
     ctx.exec_command(
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ every change, see the Git log. @@
     Latest
     ------
-    * tbd
+    * Patch: Reorganized protobuf.
 .2.1
     -----
@@ Expand Down @@