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

1320 commits

This branch
This branch
All branches
Author SHA1 Message Date
Feng Xiao
a56d1309e4 Merge pull request #263 from tamird/gitignore 
Clean up generated files
 2015-03-31 10:44:05 -07:00
Tamir Duberstein
b63d432add .gitignore generated file 2015-03-31 10:21:49 -07:00
Tamir Duberstein
53bee665f8 Change fixture name to be consistent 
This fixes the problem where `make check` generates files not ignored
by `.gitignore`.
 2015-03-31 10:21:49 -07:00
Joshua Haberman
86d93063c6 Merge pull request #257 from kentonv/master 
Delete "SEBS" (aka: Clean up Kenton's old trash)
 2015-03-26 17:43:14 -07:00
Kenton Varda
60df829ae4 Delete "SEBS" (aka: Clean up Kenton's old trash) 
The file `SEBS` is a build file for a toy build system I was writing in my spare time six years ago, back when I maintained protobufs. Arguably it was never appropriate for me to have placed this file in the protobuf tree, but it was convenient at the time and didn't seem to hurt anything. It clearly doesn't belong here now, though.
 2015-03-26 17:13:15 -07:00
Feng Xiao
0a1763b6af Merge the release branch for v2.4.1 
Change-Id: I4a8dcb4aba0104305b5dd052ed3bd532ddbedfb2
 2015-03-24 17:27:24 -07:00
Feng Xiao
0aa1f748bf Update version number to 2.4.1 
Change-Id: Ief6eccab82712be04285fc918bf0102102bbce21
 2015-03-24 17:19:19 -07:00
Feng Xiao
775d973254 Merge the release branch for v2.5.0 
Change-Id: I81b1f178ef9dafa3ab8704967d3f0e926cccb10f
 2015-03-24 16:53:37 -07:00
Feng Xiao
774d630bde Update version number to 2.5.0 
Change-Id: Ie5114bde3574c6cb0c67d5852b4658287561a0d3
 2015-03-24 16:38:08 -07:00
Jisi Liu
519fbe944f Merge pull request #245 from numberten/patch-1 
Rename README.txt to README.md
 2015-03-18 10:57:37 -07:00
Feng Xiao
d8866ed535 Merge pull request #248 from tamird/test-on-osx 
CI: OS X + faster builds
 2015-03-18 09:50:34 -07:00
Tamir Duberstein
a2655e7c4e Parallelize CI 2015-03-18 00:58:46 -07:00
Tamir Duberstein
d57e703f01 Use Travis container-based builds 2015-03-18 00:45:55 -07:00
Tamir Duberstein
ed715048c6 Add OS X to travis; fix tests to pass on OS X 2015-03-18 00:43:34 -07:00
jesse
0481bf32c4 converted javanano README to markdown. Corrected Makefile 2015-03-17 12:14:55 -07:00
Jisi Liu
813d6d652d Merge pull request #228 from cconroy/sanitize-enums 
Sanitize Enum names from collisions with reserved words.
 2015-03-16 15:48:06 -07:00
Chris Conroy
0d77c824e7 Sanitize Enum names from collisions with reserved words. 2015-03-16 18:42:26 -04:00
jesse
cd04e9b702 rename python README, and fix markdown in java and python respectively 2015-03-16 15:15:59 -07:00
Jesse Frankley
bf05592652 Rename README.txt to README.md 2015-03-16 14:41:57 -07:00
Paul Yang
8e2a377fab Merge pull request #244 from TeBoring/teboring 
Revert pull request 175: Add support for the TILE-Gx processor family.
 2015-03-15 11:05:56 -07:00
Bo Yang
12a91417fb Revert pull request 175: Add support for the TILE-Gx processor family. 2015-03-14 14:14:26 -07:00
Feng Xiao
9d31c227a3 Add a missing proto file. 
Change-Id: Ic98584616bd6ee49680273f0cdbe6d9c038ec0e9
 2015-03-13 17:06:10 -07:00
Chris Fallin
9861c0d796 Merge pull request #146 from isaiah/jruby 
protobuf support for jruby
 2015-03-10 16:17:20 -07:00
Isaiah Peng
27e2b57830 add jruby support by protobuf-java reflection API 2015-03-10 23:14:08 +01:00
Paul Yang
a5f7bb8ebb Merge pull request #193 from TeBoring/sb 
Implement a feature to generate a dependency file
 2015-03-09 06:49:58 +08:00
Chris Fallin
88eda4d776 Merge pull request #231 from google/alpha-2-fix 
Add maven release profile for JavaNano.
 2015-03-05 17:40:33 -08:00
Jisi Liu
6c8a036e3e Fix tile atomicops macro. 
Change-Id: I1a3acadd059f87c26a2e26f3b7a169c0780e981e
 2015-03-05 16:25:30 -08:00
Jisi Liu
0ddbafab2a Merge pull request #175 from martiert/tile-support 
Add support for the TILE-Gx processor family.
 2015-03-05 14:57:14 -08:00
Jisi Liu
efd4009487 Add maven release profile for JavaNano. 
Change-Id: I885b561c85325db05595f0d86338dcd7c06cf058
 2015-03-05 14:43:34 -08:00
Jisi Liu
4573e110b8 Fix python versions to comply with pep-0440. 
Change-Id: Ifb4958e4f371b36f249faa466473f851697edb5c
 2015-03-04 16:45:13 -08:00
Jisi Liu
e4a9ace541 Merge remote-tracking branch 'github/alpha-2-fix' 
Change-Id: I4c5186b8451713fda38e60dc3f828da6196c7a5e
 2015-03-04 15:37:21 -08:00
Jisi Liu
8e61d323bf Fix python package version to alpha-2. 
Change-Id: Iae16dcae833959681a5c8e98764e5d1071e6fdcf
 2015-03-04 15:28:35 -08:00
Jisi Liu
ed3c8a11f9 Merge pull request #225 from google/post-alpha2-integrate 
Post alpha2 integrate from google internal for C++ and Java
 2015-03-03 17:51:05 -08:00
Jisi Liu
c6170a96e3 Merge "Add a release profile for Java mvn project, which includes source file, javadoc packaging and signing." 2015-03-04 01:49:21 +01:00
Jisi Liu
b386c73c43 Add a release profile for Java mvn project, which includes source file, 
javadoc packaging and signing.

Change-Id: I70632f01274b70e6f48dae5f4be15f123eb19a46
 2015-03-03 16:27:10 -08:00
Chris Fallin
dfdec3b654 Updated Ruby gem version and added note to ruby/README.md regarding version number scheme. 
Change-Id: Idb29077c153530de78ce28c094442aa8f51ddd25
 2015-03-03 10:56:23 -08:00
Jisi Liu
40f2df3c16 Bump the version number to 3.0.0-alpha-3-pre 
Change-Id: I33479e529b060e4fed532a827a386d3baecc835e
 2015-03-02 19:31:31 -08:00
Jisi Liu
0b3cfc7981 Remove the extra -j8 as it can be passed in $@ already. 
Change-Id: I97960f30d50b1635aa6c395377cd021ef5ebddd5
 2015-03-02 10:54:10 -08:00
Jisi Liu
329fa02b42 Initialize data members in constructors instead of direct initialize in 
class definition, which is a C++11 extension.

Change-Id: I477fe484d737f4c60c519d68f431940ffaa33431
 2015-03-01 21:34:49 -08:00
Jisi Liu
f0e8df3b66 use is_proto_enum instead of is_enum for repeated accessor field. 
The later is not supported by some versions of MSVC and the former is
more accurate for the use case.

Change-Id: I7096226b1ebfef8340d288bbaf2788540aa3e97f
 2015-03-01 21:18:34 -08:00
Jisi Liu
4065a31644 Fix hash.h for MSVC and platforms without hash map/set support. 
Change-Id: Ic0fdb52c17b9495c73b8ce15879531383a148585
 2015-03-01 21:02:22 -08:00
Jisi Liu
14fe0c99bb Fix hash_map type parameter to add Alloc for other platforms. 
Change-Id: Idc5fb65a2cc469d55aff6f2cde0b51b326be0963
 2015-03-01 19:51:58 -08:00
Jisi Liu
0a25cfe69d Use portable GOOGLE_PROTOBUF_THREAD_LOCAL instead of __thread. 
Change-Id: Iaa75f8333541bc378bea699e7f147c7f17b652ad
 2015-03-01 19:44:46 -08:00
Jisi Liu
b25caa5c0a Add missing files in vsprojects. 
Change-Id: I23abcd7f5ad4a1c6b94b0035ac0441ea874cf55d
 2015-03-01 17:39:29 -08:00
Jisi Liu
885b612f74 Down integrate from Google internal branch for C++ and Java. 
- Maps for C++ lite
- C++ Arena optimizations.
- Java Lite runtime code size optimization.

Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
 2015-02-28 17:06:49 -08:00
Jisi Liu
1939efed2d Add .so to .gitignore. 
Change-Id: I5418606cb51a43a8cd7f91f26448cf0e8dde1016
 2015-02-28 16:54:15 -08:00
Jisi Liu
7e9020fb0e Merge pull request #185 from mzhaom/remove-unused 
Remove unused methods:
 2015-02-26 12:46:53 -08:00
Jisi Liu
a779ae609c Merge pull request #199 from google/wkt 
Add the .proto files for well-known types.
 2015-02-26 10:04:37 -08:00
Jisi Liu
0e5fc48e58 Merge pull request #216 from cnauroth/Parser-JavaDoc 
Correct JavaDoc return value documentation for Parser#parseDelimitedFrom...
 2015-02-26 10:03:55 -08:00
Jisi Liu
0c59f2e6fc Merge pull request #222 from google/v3.0.0-alpha-2 
V3.0.0 alpha 2
 2015-02-26 02:00:06 -08:00