From 3872cd024e8dcf4f4e3eabf9d9060c0433113027 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Mon, 27 May 2013 01:46:27 +0300
Subject: [PATCH] Source generator now works with Protocol Buffers.

---
 backends.py                                          | 4 ++--
 test cases/frameworks/5 protocol buffers/main.cpp    | 5 ++++-
 test cases/frameworks/5 protocol buffers/meson.build | 3 +--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/backends.py b/backends.py
index 56f0a93cb..13e00b108 100755
--- a/backends.py
+++ b/backends.py
@@ -531,11 +531,11 @@ class NinjaBackend(Backend):
                 exe_file = exe.get_command()
             base_args = generator.get_arglist()
             for i in range(len(infilelist)):
-                infilename = os.path.join(self.build_to_src, infilelist[i])
+                infilename = os.path.join(self.environment.get_source_dir(), infilelist[i])
                 outfilename = os.path.join(self.get_target_private_dir(target), outfilelist[i])
                 args = [x.replace("@INPUT@", infilename).replace('@OUTPUT@', outfilename)\
                         for x in base_args]
-                args = [x.replace("@SOURCE_DIR@", self.environment.get_source_dir()).replace("@BUILD_DIR@", self.environment.get_build_dir())
+                args = [x.replace("@SOURCE_DIR@", self.environment.get_source_dir()).replace("@BUILD_DIR@", self.get_target_private_dir(target))
                         for x in args]
                 cmdlist = [exe_file] + args
                 elem = NinjaBuildElement(outfilename, 'CUSTOM_COMMAND', infilename)
diff --git a/test cases/frameworks/5 protocol buffers/main.cpp b/test cases/frameworks/5 protocol buffers/main.cpp
index 9fdb20b57..f6566d52e 100644
--- a/test cases/frameworks/5 protocol buffers/main.cpp	
+++ b/test cases/frameworks/5 protocol buffers/main.cpp	
@@ -1,6 +1,9 @@
 #include "defs.pb.h"
 
 int main(int argc, char **argv) {
-    Dummy d;
+    GOOGLE_PROTOBUF_VERIFY_VERSION;
+    Dummy *d = new Dummy;
+    delete d;
+    google::protobuf::ShutdownProtobufLibrary();
     return 0;
 }
diff --git a/test cases/frameworks/5 protocol buffers/meson.build b/test cases/frameworks/5 protocol buffers/meson.build
index cf0005346..37531a1d7 100644
--- a/test cases/frameworks/5 protocol buffers/meson.build	
+++ b/test cases/frameworks/5 protocol buffers/meson.build	
@@ -9,6 +9,5 @@ gen = generator(protoc, \
 
 generated = gen.process('defs.proto')
 e = executable('prog', 'main.cpp', generated,
- include_dirs: include_directories('.'),
- dep : dep)
+ deps : dep)
 add_test('prototest', e)