Restore original folder structure for proto files

Author: Tobias Hafner

doc-generator/config.py

@@ -49,7 +49,7 @@
 # ----------------------------------------------------------------------------------
 
 # The directory containing the proto files
-PROTO_DIR = '../prism'
+PROTO_DIR = '../org/polypheny/prism'
 
 # ----------------------------------------------------------------------------------
 # PROTO COMPILER

doc-generator/proto_utils.py

@@ -16,6 +16,7 @@ def compile_file(proto_file, proto_path=config.IMPORT_BASE_DIR, descriptor_set_o
             'protoc',
             f'--proto_path={proto_path}',
             f'--descriptor_set_out={descriptor_set_out}',
+            f'--experimental_allow_proto3_optional',
             '--include_source_info',
             proto_file
         ]

meson.build

@@ -17,30 +17,30 @@ run_command('mkdir', '-p', gen_dir)
 prism_gen = generator(protoc,
                       output : ['@[email protected]', '@[email protected]'],
                       arguments : [
-                          '--proto_path=@CURRENT_SOURCE_DIR@/prism',
+                          '--proto_path=@CURRENT_SOURCE_DIR@',
                           '--cpp_out=@BUILD_DIR@',
                           '--experimental_allow_proto3_optional',
                           '@INPUT@'
                       ]
 )
 
 prism_files = files(
-    'prism/connection_requests.proto',
-    'prism/connection_responses.proto',
-    'prism/document_frame.proto',
-    'prism/error.proto',
-    'prism/graph_frame.proto',
-    'prism/meta_requests.proto',
-    'prism/meta_responses.proto',
-    'prism/namespace_meta_requests.proto',
-    'prism/namespace_meta_responses.proto',
-    'prism/protointerface.proto',
-    'prism/relational_frame.proto',
-    'prism/statement_requests.proto',
-    'prism/statement_responses.proto',
-    'prism/transaction_requests.proto',
-    'prism/transaction_responses.proto',
-    'prism/value.proto'
+    'org/polypheny/prism/connection_requests.proto',
+    'org/polypheny/prism/connection_responses.proto',
+    'org/polypheny/prism/document_frame.proto',
+    'org/polypheny/prism/error.proto',
+    'org/polypheny/prism/graph_frame.proto',
+    'org/polypheny/prism/meta_requests.proto',
+    'org/polypheny/prism/meta_responses.proto',
+    'org/polypheny/prism/namespace_meta_requests.proto',
+    'org/polypheny/prism/namespace_meta_responses.proto',
+    'org/polypheny/prism/protointerface.proto',
+    'org/polypheny/prism/relational_frame.proto',
+    'org/polypheny/prism/statement_requests.proto',
+    'org/polypheny/prism/statement_responses.proto',
+    'org/polypheny/prism/transaction_requests.proto',
+    'org/polypheny/prism/transaction_responses.proto',
+    'org/polypheny/prism/value.proto'
 )
 
 # ========================

prism/connection_requests.proto renamed to org/polypheny/prism/connection_requests.proto

@@ -4,7 +4,7 @@ Messages pertaining to document frames as used to represent results from the doc
 
 syntax = "proto3";
 
-import "value.proto";
+import "org/polypheny/prism/value.proto";
 
 option java_multiple_files = true;
 option java_package = "org.polypheny.prism";

prism/connection_responses.proto renamed to org/polypheny/prism/connection_responses.proto

@@ -3,7 +3,7 @@ Messages related to graph frames as used to represent results form the labeled p
 */
 
 syntax = "proto3";
-import "value.proto";
+import "org/polypheny/prism/value.proto";
 
 option java_multiple_files = true;
 option java_package = "org.polypheny.prism";