2
0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-05 18:12:09 +01:00
Commit Graph

25 Commits

Author SHA1 Message Date
fedepell
1837984e7e protoc: make sure output directory exists for java 2019-05-06 08:17:20 +02:00
Federico Pellegrin
429c4c88d9 protoc: simplify the java generation also solving problems with .proto input files generated during build 2019-01-20 10:41:51 +00:00
Thomas Nagy
2f3d5e5163
Prevent protoc errors on "waf list" 2019-01-19 09:40:11 +01:00
fedepell
f876a7b18c protoc: fix filename generation for .java 2019-01-17 14:45:40 +01:00
fedepell
70f1522fa1 protoc: handle extra taskgen and out of project include directories 2018-12-21 06:16:08 +01:00
fedepell
ba1947b113 protoc: fix included protoc search on nested wscripts
previously code was erroneously using tg.bld.path instead of tg.path
so for nested wscript calls the wrong directory was used in search.

added also better error handling with error message if an included
directory does not exist
2018-12-19 15:45:48 +01:00
fedepell
bb458769ee protoc: add .proto dependencies also in include path otherwise protoc will fail if dependency is in another directory 2018-03-22 23:13:40 +01:00
fedepell
adbee3f23a protoc: protoc (ver 2 and 3) strips underscores when generating .java file names. consider this in node name generation otherwise the generated java file will not be found 2018-03-09 17:39:55 +01:00
fedepell
e9eca13d92 protoc: fix generation of include directories when having nested wscripts 2018-03-06 09:14:10 +01:00
fedepell
a02c6d8727 protoc: handle case of proto files in deep directories when output is generated with paths 2018-03-02 19:33:38 +01:00
Federico Pellegrin
a02b71a163 protoc: add java support for protobuffers (#2049)
* protoc: added java support

Modified protoc to support also .proto -> .java generation. the .java file
name generated is not obvious as in C++/Python but follows a couple of rules
that were implemented.

As cxx/python and javaw Tools are quite different the implementation is not
as clean as for cxx/python but is hopefully fine (ie. protoc still uses
sources for input files while javac uses src_dir).

In javaw a small detail was added: a new attribute was added (gencode) that
instructs javac to look for source files also in the build directory. This
are realistically generated code (and .proto -> .java is an example) and
are therefore in the build. Default is false keeping all the previous
behaviour.

* protoc for java enhanchments (protoc version, regex, docs)

In configure stage get protoc version as java naming changes depending on the
version. Implement the version differences between version < 2 and > 2

Improve regex for option catching and implement a mix of them in playground
to verify it.

Add some documentation on how java filenames and paths are generated.

* protoc: build dir with generated code is automatically added, so no need to explicitly use gencode in javac
2017-09-26 19:17:40 +02:00
Thomas Nagy
e40e52a383
Follow-up on #2028 2017-09-15 20:59:37 +02:00
Federico Pellegrin
2474218874 protoc: extend extra to support also Python language (#2028)
* protoc: extend extra to support also Python language
* protoc: fix ext_out, unite c++/python generation, fix protoc_includes name
2017-09-15 20:52:08 +02:00
Roman C. Podolski
fc021cd060 Fix protoc #2009
Fix bug described in #2009 and extend example in playground to include
described scenario.
2017-08-17 07:50:28 +02:00
Thomas Nagy
f8aa0d9da4
Update protoc #2009 2017-08-16 19:47:34 +02:00
Roman C. Podolski
a6f4ad6e1d Protoc: Fix bug in src-path
The tool was using an relative path for the includes, but an absolute
for the src-files. Protoc cannot distinguish between relative and
absolute paths and is not able to find sources when relative and
absolute paths are combined.

Tested with protoc 2.6.1, python 3.5.1
2017-07-23 13:24:28 +02:00
Thomas Nagy
93053013f9
Cleanup: Break multiple statements on multiple lines 2017-04-17 13:20:00 +02:00
Thomas Nagy
f6b6191480
Additional crutches for protoc 2015-05-28 23:08:07 +02:00
Thomas Nagy
04556a4d28
Use adequate variable for include paths in protoc.py 2015-05-27 18:45:20 +02:00
Thomas Nagy
80344dee5e
Use splitlines when possible 2015-03-03 12:19:25 +01:00
Thomas Nagy
e22f7b0cc2
reverting r522e3fb43a1dca184aa346a0cf00ac6bc83b3366 - Issue 1338 2015-02-08 18:51:39 +01:00
Jérôme Carretero
00946bacdb extras: protoc: document protoc trickiness
I tried to quickly go through the protoc source to find how the include
paths are interpreted, but I'm sleepy now.
2013-09-05 01:10:20 -04:00
Jérôme Carretero
bf5ce8b30c extras: protoc: add dep scanner 2013-09-05 00:48:29 -04:00
Alexander Afanasyev
522e3fb43a protoc: small correction
Signed-off-by: Thomas Nagy <tnagy2pow10@gmail.com>
2013-04-28 10:08:42 +02:00
Thomas Nagy
b52d97adff Issue 1184 2012-09-27 21:08:26 +02:00