organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
3754 commits 28 branches 36 tags 41 MiB
Commit graph

3754 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jisi Liu
de30c56391 Merge pull request #1874 from pherl/buildzip 
Change the build.zip.sh to support lite
 2016-07-28 14:48:46 -07:00
Jisi Liu
e3fac65add Change the build.zip.sh to support lite 2016-07-28 14:24:05 -07:00
Jisi Liu
2662fd3d0c Merge pull request #1871 from pherl/fixwin 
Fix build protoc script for windows
 2016-07-28 12:53:42 -07:00
Jisi Liu
1b1a8f4017 Fix build protoc script for windows 2016-07-28 19:07:54 +00:00
Jisi Liu
e8ae137c96 Merge pull request #1864 from pherl/galogs 
Change log for 3.0 GA release.
 2016-07-27 14:40:30 -07:00
Jisi Liu
e0d817e0de Change log for 3.0 GA release. 2016-07-27 12:08:01 -07:00
Jisi Liu
7ba044a1c0 Merge pull request #1853 from pherl/3.0.0-GA 
Make protoc-artifacts able to build plugins.
 2016-07-26 16:51:47 -07:00
Jisi Liu
7c9c314ca7 fix comments. 2016-07-26 16:51:30 -07:00
Jisi Liu
0750797db4 Merge remote-tracking branch 'origin/3.0.0-GA' into 3.0.0-GA 2016-07-26 16:36:37 -07:00
Jisi Liu
54feb9ac24 Fix the script comments. 2016-07-26 16:35:28 -07:00
Jisi Liu
b1aac0b4ed Make protoc-artifacts able to build plugin. 2016-07-26 16:34:30 -07:00
Jisi Liu
032fb914e2 Merge branch 'master' of github.com:google/protobuf into 3.0.0-GA 2016-07-26 12:29:03 -07:00
Feng Xiao
b6b521b6b7 Merge pull request #1851 from xfxyjwf/cint 
Fixes traivs cpp build.
 2016-07-26 12:15:31 -07:00
Feng Xiao
12581b4c8e Fixes traivs cpp build. 
Remove the use of INT64_C/UINT64_C and add static_cast when neccessary.
 2016-07-26 11:59:39 -07:00
Joshua Haberman
234ec01795 Merge pull request #1847 from haberman/GAfixes 
GA fixes
 2016-07-26 10:55:34 -07:00
Josh Haberman
43b36dd983 Fixed Makefile.am for Ruby file rename. 2016-07-26 10:28:18 -07:00
Jisi Liu
f11a4f1fe4 Merge pull request #1841 from pherl/3.0.0-GA 
Bump version number for GA
 2016-07-26 10:01:16 -07:00
Josh Haberman
b3b07cd851 Merge branch 'master' into 3.0.0-GA 
We need to pick up some of the last-minute Ruby fixes.
 2016-07-25 17:39:07 -07:00
Joshua Haberman
ba52f2b678 Merge pull request #1788 from google/rubypackagecap 
Ruby: translate package names from snake_case -> PascalCase.
 2016-07-25 16:48:32 -07:00
Feng Xiao
c43f71886d Merge pull request #1846 from xfxyjwf/zip 
Add a script to build protoc zip packages.
 2016-07-25 15:35:13 -07:00
Josh Haberman
97e20261ac Added new file to ruby_EXTRA_DIST. 2016-07-25 15:16:23 -07:00
Josh Haberman
6d92233e72 Added unit test for PascalCasing package names in Ruby. 2016-07-25 15:16:23 -07:00
Josh Haberman
6cab568e0b Ruby: translate package names from snake_case -> PascalCase. 2016-07-25 15:15:44 -07:00
Feng Xiao
b553b87b26 Add a script to build protoc zip packages. 
[ci skip]

Change-Id: Ia0e0bf3bb6bd24633dc8f294318bb20ac837f8b9
 2016-07-25 15:01:38 -07:00
Joshua Haberman
b1cecb6762 Merge pull request #1837 from haberman/rubygencodename 
Ruby: generated foo.proto -> foo_pb.rb instead of foo.rb.
 2016-07-25 14:58:41 -07:00
Jisi Liu
0973822d03 remove extra zeros. 2016-07-25 14:14:44 -07:00
Jisi Liu
5a6c921217 Make jruby still depend on beta-4 2016-07-25 13:19:52 -07:00
Feng Xiao
a17367f44a Define intX as standard exact-width integer types. 
Fixes https://github.com/google/protobuf/issues/823

Change-Id: I7f4c2bfcac2f81d8b34c030dd3d12ea02aaa2264
 2016-07-25 13:18:38 -07:00
Jisi Liu
fb7a7c5f1f Bump version number for GA 2016-07-25 12:07:56 -07:00
Josh Haberman
4f19797baf Ruby: generated foo.proto -> foo_pb.rb instead of foo.rb. 
This brings us more into line with other langauges, and makes it more
obvious when we are requiring protobuf generated code.
 2016-07-25 11:09:23 -07:00
Feng Xiao
868ea59256 Merge pull request #1831 from xfxyjwf/protoc 
Fix maven links.
 2016-07-25 10:46:19 -07:00
Feng Xiao
b6cd9dd759 Merge pull request #1834 from sergiocampama/framework 
Correctly sets the generate_for_named_framework option after parsing.
 2016-07-25 10:19:17 -07:00
Joshua Haberman
44bd6bda58 Merge pull request #1821 from haberman/rubyfreezestr 
Ruby: encode and freeze strings when the are assigned or decoded.
 2016-07-25 10:09:15 -07:00
Josh Haberman
d07a9963df Ruby: fixed string freezing for JRuby. 2016-07-25 01:26:14 -07:00
Feng Xiao
9e3c98f17b Fix maven path. 
Change-Id: I252d7a644a9e4064a9f1a816a2be3f25f37b4c43
 2016-07-23 19:43:03 -07:00
Sergio Campama
3a1259cb45 Correctly sets the generate_for_named_framework option after parsing. 
- Also updates the documentation with a bit more information.
 2016-07-23 21:37:53 -04:00
Feng Xiao
0622030332 Merge pull request #1830 from xfxyjwf/travis 
Remove linux tests from travis.
 2016-07-23 00:39:28 +00:00
Feng Xiao
1b3796c890 Merge pull request #1829 from xfxyjwf/fixcpp 
Fix sign-comparison warnings and add a test for that.
 2016-07-23 00:24:07 +00:00
Feng Xiao
fdd970e4ed Fix maven links. 
[ci skip]

Change-Id: Ibefbdf441d932c5751235c635244450d7cbacc53
 2016-07-22 16:24:52 -07:00
Feng Xiao
9702b9f785 Keep cpp_distcheck on travis for now. 
When it runs in parallel with other jenkins tests, multiple tests start
to fail probably because cpp_distcheck will update the C++ lib that
other tests (such as python_cpp) are depending on.

Change-Id: Ibca0243084bb6b81c811b62c75288e20cc2aabf5
 2016-07-22 16:04:11 -07:00
Feng Xiao
c2ced9ad48 Remove linux tests from travis. 
These tests are already covered by jenkins and right now jenkins can
finish these tests much quicker then travis.

Change-Id: I5799761ccc338211d750940e3cf4c8e2569c8144
 2016-07-22 14:57:28 -07:00
Feng Xiao
9009662b71 Fix sign-comparison warnings in public header files. 2016-07-22 21:41:17 +00:00
Feng Xiao
16adea3ddc Add a test to catch sign-comparison warnings. 
grpc build treates them as errors and such issues (protobuf change
breaks grpc) has been reported repeatedly. For example:
  https://github.com/google/protobuf/issues/1813

Change-Id: I077c4557cf3effd5195f88802c38999b884edc30
 2016-07-22 14:15:40 -07:00
Feng Xiao
4ddaad4f3a Merge pull request #1825 from xfxyjwf/jenkins2 
Add more tests to jenkins.
 2016-07-22 21:02:46 +00:00
Feng Xiao
de5236dc9f Merge pull request #1828 from sergiocampama/framework 
Fixes the parsing of the proto-framework map file.
 2016-07-22 20:51:13 +00:00
Sergio Campama
2ff93494a7 Fixes the parsing of the proto-framework map file. 
- Fixes memory issue where the pointer to the StringPiece would be allocated on the stack, and would mangle the output.
 - Fixes length of the file name when parsing the comma separated files.
 2016-07-22 12:56:36 -04:00
Feng Xiao
20fbb357d0 Add more tests to jenkins. 
1. Added ruby22 and jruby tests to jenkins.
2. Added javascript tests to jenkins.
3. Added golang tests to jenkins.
4. Removed ruby19/ruby20 tests from travis. Support for ruby 2.0 has
   ended since 2016/02/24.
   https://www.ruby-lang.org/en/news/2016/02/24/support-plan-of-ruby-2-0-0-and-2-1/

Change-Id: Ie984b06772335352a4be7067ab2485f923875685
 2016-07-21 18:11:12 -07:00
Feng Xiao
2ba058c66c Merge pull request #1822 from xfxyjwf/java6 
Update travis tests for Java.
 2016-07-21 21:03:55 +00:00
Josh Haberman
ff7f68ae9f Ruby: encode and freeze strings when the are assigned or decoded. 2016-07-21 11:37:54 -07:00
Feng Xiao
ad49ed78f3 Update travis tests for Java. 
1. Set JAVA_HOME so mvn can pick up the correct java version.
2. Remove jdk6 tests. It has been broken for a while and remain undetected as
   mvn is actually using java 7 to build the code. Given that we have
   set -source and -target to 6 in the pom.xml and the built .jar
   should be usable by java 6, having a dedicated java 6 test doesn't
   seem necessary (assuming very few Java 6 users want to compile protobuf
   Java from source).

Change-Id: I4f14da772632df3e47801f180198242b306c3f0f
 2016-07-21 11:37:46 -07:00