Merge pull request #2764 from mesonbuild/generatorpath

Generator outputs can have path segments

14 files changed, 146 insertions, 3 deletions

diff --git a/test cases/common/173 preserve gendir/base.inp b/test cases/common/173 preserve gendir/base.inp
new file mode 100644
index 000000000..df967b96a
--- /dev/null
+++ b/test cases/common/173 preserve gendir/base.inp
@@ -0,0 +1 @@
+base
diff --git a/test cases/common/173 preserve gendir/com/mesonbuild/subbie.inp b/test cases/common/173 preserve gendir/com/mesonbuild/subbie.inp
new file mode 100644
index 000000000..df0f4e9ae
--- /dev/null
+++ b/test cases/common/173 preserve gendir/com/mesonbuild/subbie.inp
@@ -0,0 +1 @@
+subbie
diff --git a/test cases/common/173 preserve gendir/genprog.py b/test cases/common/173 preserve gendir/genprog.py
new file mode 100755
index 000000000..8bd2b9d82
--- /dev/null
+++ b/test cases/common/173 preserve gendir/genprog.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+
+import os, sys, argparse
+import pathlib
+
+h_templ = '''#pragma once
+
+int %s();
+'''
+
+c_templ = '''#include"%s.h"
+
+int %s() {
+    return 0;
+}
+'''
+
+parser = argparse.ArgumentParser()
+parser.add_argument('--searchdir', required=True)
+parser.add_argument('--outdir', required=True)
+parser.add_argument('ifiles', nargs='+')
+
+options = parser.parse_args()
+
+searchdir = options.searchdir
+outdir = options.outdir
+ifiles = options.ifiles
+
+rel_ofiles = []
+
+for ifile in ifiles:
+    if not ifile.startswith(options.searchdir):
+        sys.exit('Input file %s does not start with search dir %s.' % (ifile, searchdir))
+    rel_ofile = ifile[len(searchdir):]
+    if rel_ofile[0] == '/' or rel_ofile[0] == '\\':
+        rel_ofile = rel_ofile[1:]
+    rel_ofiles.append(os.path.splitext(rel_ofile)[0])
+
+ofile_bases = [os.path.join(outdir, i) for i in rel_ofiles]
+
+for i, ifile_name in enumerate(ifiles):
+    proto_name = open(ifile_name).readline().strip()
+    h_out = ofile_bases[i] + '.h'
+    c_out = ofile_bases[i] + '.c'
+    os.makedirs(os.path.split(ofile_bases[i])[0], exist_ok=True)
+    open(h_out, 'w').write(h_templ % (proto_name))
+    open(c_out, 'w').write(c_templ % (proto_name, proto_name))
diff --git a/test cases/common/173 preserve gendir/meson.build b/test cases/common/173 preserve gendir/meson.build
new file mode 100644
index 000000000..ce219f0d8
--- /dev/null
+++ b/test cases/common/173 preserve gendir/meson.build
@@ -0,0 +1,13 @@
+project('preserve subdir', 'c')
+
+gprog = find_program('genprog.py')
+
+gen = generator(gprog, \
+  output    : ['@BASENAME@.c', '@BASENAME@.h'],
+  arguments : ['--searchdir=@CURRENT_SOURCE_DIR@', '--outdir=@BUILD_DIR@', '@INPUT@'])
+
+generated = gen.process('base.inp', 'com/mesonbuild/subbie.inp',
+  preserve_path_from : meson.current_source_dir())
+
+e = executable('testprog', 'testprog.c', generated)
+test('testprog', e)
diff --git a/test cases/common/173 preserve gendir/testprog.c b/test cases/common/173 preserve gendir/testprog.c
new file mode 100644
index 000000000..46b460257
--- /dev/null
+++ b/test cases/common/173 preserve gendir/testprog.c
@@ -0,0 +1,6 @@
+#include"base.h"
+#include"com/mesonbuild/subbie.h"
+
+int main(int argc, char **argv) {
+    return base() + subbie();
+}
diff --git a/test cases/frameworks/5 protocol buffers/asubdir/defs.proto b/test cases/frameworks/5 protocol buffers/asubdir/defs.proto
index f7956517c..dad575470 100644
--- a/test cases/frameworks/5 protocol buffers/asubdir/defs.proto
+++ b/test cases/frameworks/5 protocol buffers/asubdir/defs.proto
@@ -1,3 +1,5 @@
+syntax = "proto3";
+
 message Dummy {
-  required string text = 1;
+  string text = 1;
 }
diff --git a/test cases/frameworks/5 protocol buffers/defs.proto b/test cases/frameworks/5 protocol buffers/defs.proto
index f7956517c..dad575470 100644
--- a/test cases/frameworks/5 protocol buffers/defs.proto
+++ b/test cases/frameworks/5 protocol buffers/defs.proto
@@ -1,3 +1,5 @@
+syntax = "proto3";
+
 message Dummy {
-  required string text = 1;
+  string text = 1;
 }
diff --git a/test cases/frameworks/5 protocol buffers/meson.build b/test cases/frameworks/5 protocol buffers/meson.build
index 58666f9b9..94fa9801c 100644
--- a/test cases/frameworks/5 protocol buffers/meson.build
+++ b/test cases/frameworks/5 protocol buffers/meson.build
@@ -10,7 +10,7 @@ endif
 
 gen = generator(protoc, \
   output    : ['@BASENAME@.pb.cc', '@BASENAME@.pb.h'],
-  arguments : ['--proto_path=@SOURCE_DIR@', '--cpp_out=@BUILD_DIR@', '@INPUT@'])
+  arguments : ['--proto_path=@CURRENT_SOURCE_DIR@', '--cpp_out=@BUILD_DIR@', '@INPUT@'])
 
 generated = gen.process('defs.proto')
 e = executable('prog', 'main.cpp', generated,
@@ -18,3 +18,5 @@ e = executable('prog', 'main.cpp', generated,
 test('prototest', e)
 
 subdir('asubdir')
+subdir('withpath')
+subdir('sidedir')
diff --git a/test cases/frameworks/5 protocol buffers/sidedir/meson.build b/test cases/frameworks/5 protocol buffers/sidedir/meson.build
new file mode 100644
index 000000000..ce9b7be1c
--- /dev/null
+++ b/test cases/frameworks/5 protocol buffers/sidedir/meson.build
@@ -0,0 +1,7 @@
+# Generated source defined in one directory but
+# used in another.
+
+e = executable('sideprog', 'sideprog.cpp', generated,
+  override_options : ['unity=off'],
+  dependencies : dep)
+test('sideprog', e)
diff --git a/test cases/frameworks/5 protocol buffers/sidedir/sideprog.cpp b/test cases/frameworks/5 protocol buffers/sidedir/sideprog.cpp
new file mode 100644
index 000000000..83af4b256
--- /dev/null
+++ b/test cases/frameworks/5 protocol buffers/sidedir/sideprog.cpp
@@ -0,0 +1,16 @@
+#include"com/mesonbuild/simple.pb.h"
+#include"com/mesonbuild/subsite/complex.pb.h"
+
+#include<memory>
+
+int main(int argc, char **argv) {
+    GOOGLE_PROTOBUF_VERIFY_VERSION;
+    {
+        subdirectorial::SimpleMessage *s = new subdirectorial::SimpleMessage();
+        s->set_the_integer(3);
+        subdirectorial::ComplexMessage c;
+        c.set_allocated_sm(s);
+    }
+    google::protobuf::ShutdownProtobufLibrary();
+    return 0;
+}
diff --git a/test cases/frameworks/5 protocol buffers/withpath/com/mesonbuild/simple.proto b/test cases/frameworks/5 protocol buffers/withpath/com/mesonbuild/simple.proto
new file mode 100644
index 000000000..336779f3d
--- /dev/null
+++ b/test cases/frameworks/5 protocol buffers/withpath/com/mesonbuild/simple.proto
@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package subdirectorial;
+
+message SimpleMessage {
+  int32 the_integer = 1;
+}
diff --git a/test cases/frameworks/5 protocol buffers/withpath/com/mesonbuild/subsite/complex.proto b/test cases/frameworks/5 protocol buffers/withpath/com/mesonbuild/subsite/complex.proto
new file mode 100644
index 000000000..8dc32c205
--- /dev/null
+++ b/test cases/frameworks/5 protocol buffers/withpath/com/mesonbuild/subsite/complex.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package subdirectorial;
+
+import "com/mesonbuild/simple.proto";
+
+message ComplexMessage {
+  string a_message = 1;
+  SimpleMessage sm = 2;
+}
diff --git a/test cases/frameworks/5 protocol buffers/withpath/meson.build b/test cases/frameworks/5 protocol buffers/withpath/meson.build
new file mode 100644
index 000000000..68a738179
--- /dev/null
+++ b/test cases/frameworks/5 protocol buffers/withpath/meson.build
@@ -0,0 +1,13 @@
+# Testing protobuf files that are deeply hierarchical
+# and must preserve their path segments in output files
+# because protoc will always put it in there.
+
+generated = gen.process('com/mesonbuild/simple.proto',
+  'com/mesonbuild/subsite/complex.proto',
+  preserve_path_from : meson.current_source_dir(),
+  )
+
+e = executable('pathprog', 'pathprog.cpp', generated,
+  override_options : ['unity=off'],
+  dependencies : dep)
+test('pathprog', e)
diff --git a/test cases/frameworks/5 protocol buffers/withpath/pathprog.cpp b/test cases/frameworks/5 protocol buffers/withpath/pathprog.cpp
new file mode 100644
index 000000000..83af4b256
--- /dev/null
+++ b/test cases/frameworks/5 protocol buffers/withpath/pathprog.cpp
@@ -0,0 +1,16 @@
+#include"com/mesonbuild/simple.pb.h"
+#include"com/mesonbuild/subsite/complex.pb.h"
+
+#include<memory>
+
+int main(int argc, char **argv) {
+    GOOGLE_PROTOBUF_VERIFY_VERSION;
+    {
+        subdirectorial::SimpleMessage *s = new subdirectorial::SimpleMessage();
+        s->set_the_integer(3);
+        subdirectorial::ComplexMessage c;
+        c.set_allocated_sm(s);
+    }
+    google::protobuf::ShutdownProtobufLibrary();
+    return 0;
+}