Skip to content

Try to include the correct protobuf compiler generated cpp file #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Try to include the correct protobuf compiler generated cpp file #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b3ddfc
minor fix: include the correct protobuf compiler generated file
angushe Mar 20, 2013
53f17e7
generate file names that are consistent with protobuf's
angushe Mar 22, 2013
1e43842
add plugin_pb2 python module gen script
angushe Oct 21, 2013
b1b404a
Make scripts python 2.4 compatiable
angushe Sep 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions gen_plugin_pb2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

import google.protobuf
import os
from distutils.spawn import find_executable
import subprocess
import sys


def gen_plugin_pb2(pb_dir):
pkgdir = os.path.dirname(google.protobuf.__file__)
outputdir = os.path.join(pkgdir, "compiler")
os.makedirs(outputdir)
open(os.path.join(outputdir, "__init__.py"), "w+").close()
protoc = find_executable('protoc')
subprocess.call(
[protoc, "-I" + os.path.join(pb_dir, "src"),
"--python_out=" + os.path.join(pkgdir, "../../"),
os.path.join(pb_dir, "src/google/protobuf/compiler/plugin.proto")])


if __name__ == '__main__':
if len(sys.argv) < 2:
sys.stderr.write("gen_plugin_pb2.py <protubuf project dir>\n")
sys.exit(1)
gen_plugin_pb2(os.path.expanduser(sys.argv[1]))
8 changes: 4 additions & 4 deletions lua_protobuf/generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ def c_header_header(filename, package):
'//',
'// source proto file: %s' % filename,
'',
'#ifndef LUA_PROTOBUF_%s_H' % package.replace('.', '_'),
'#define LUA_PROTOBUF_%s_H' % package.replace('.', '_'),
'#ifndef LUA_PROTOBUF_%s_H' % filename[:-len('.proto')],
'#define LUA_PROTOBUF_%s_H' % filename[:-len('.proto')],
'',
'#include "lua-protobuf.h"',
'#include <%s.pb.h>' % package.replace('.', '/'),
'#include <%s.pb.h>' % filename[:-len('.proto')],
'',
'#ifdef __cplusplus',
'extern "C" {',
Expand All @@ -152,7 +152,7 @@ def source_header(filename, package):
'//',
'// source proto file: %s' % filename,
'',
'#include "%s.pb-lua.h"' % package.replace('.', '/'),
'#include "%s.pb-lua.h"' % filename[:-len('.proto')],
'',
'#ifdef __cplusplus',
'extern "C" { // make sure functions treated with C naming',
Expand Down
6 changes: 3 additions & 3 deletions protoc-gen-lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from lua_protobuf.generator import file_source, file_header, lua_protobuf_header, lua_protobuf_source
from google.protobuf.descriptor import FieldDescriptor
from google.protobuf.compiler.plugin_pb2 import CodeGeneratorRequest, CodeGeneratorResponse
from sys import stdin, stdout, stderr
from sys import stdin, stdout, stderr, exit

serialized = stdin.read()
request = CodeGeneratorRequest()
Expand All @@ -55,11 +55,11 @@ for i in range(0, len(request.proto_file)):
cpp_namespace = '::%s' % package.replace('.', '::')

f = response.file.add()
f.name = '%s.pb-lua.h' % package.replace('.', '/')
f.name = '%s.pb-lua.h' % filename[:-len('.proto')]
f.content = file_header(file_descriptor)

f = response.file.add()
f.name = '%s.pb-lua.cc' % package.replace('.', '/')
f.name = '%s.pb-lua.cc' % filename[:-len('.proto')]
f.content = file_source(file_descriptor)

f = response.file.add()
Expand Down