Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add OS X to travis; fix tests to pass on OS X | Tamir Duberstein | 2015-03-18 | 2 | -1/+4 |
| | |||||
* | Merge pull request #228 from cconroy/sanitize-enums | Jisi Liu | 2015-03-16 | 5 | -5/+50 |
|\ | | | | | Sanitize Enum names from collisions with reserved words. | ||||
| * | Sanitize Enum names from collisions with reserved words. | Chris Conroy | 2015-03-16 | 5 | -5/+50 |
| | | |||||
* | | Merge pull request #244 from TeBoring/teboring | Paul Yang | 2015-03-15 | 4 | -83/+0 |
|\ \ | | | | | | | Revert pull request 175: Add support for the TILE-Gx processor family. | ||||
| * | | Revert pull request 175: Add support for the TILE-Gx processor family. | Bo Yang | 2015-03-14 | 4 | -83/+0 |
|/ / | |||||
* | | Add a missing proto file. | Feng Xiao | 2015-03-13 | 2 | -1/+47 |
| | | | | | | | | Change-Id: Ic98584616bd6ee49680273f0cdbe6d9c038ec0e9 | ||||
* | | Merge pull request #146 from isaiah/jruby | Chris Fallin | 2015-03-10 | 28 | -25/+4641 |
|\ \ | | | | | | | protobuf support for jruby | ||||
| * | | add jruby support by protobuf-java reflection API | Isaiah Peng | 2015-03-10 | 28 | -25/+4641 |
|/ / | |||||
* | | Merge pull request #193 from TeBoring/sb | Paul Yang | 2015-03-09 | 5 | -2/+215 |
|\ \ | | | | | | | Implement a feature to generate a dependency file | ||||
| * | | Fix absolute/relative path in output | Bo Yang | 2015-02-09 | 2 | -12/+16 |
| | | | |||||
| * | | Change target to output filenames | Bo Yang | 2015-02-07 | 3 | -25/+73 |
| | | | |||||
| * | | Fix comment | Bo Yang | 2015-02-04 | 1 | -2/+2 |
| | | | |||||
| * | | Clean code | Bo Yang | 2015-02-04 | 2 | -20/+20 |
| | | | |||||
| * | | Remove "include sstream" from command_line_interface.cc | Bo Yang | 2015-02-04 | 1 | -1/+0 |
| | | | |||||
| * | | Change flag for generating dependency file to "dependency_out". Delete | Bo Yang | 2015-02-04 | 4 | -150/+12 |
| | | | | | | | | | | | | test-driver | ||||
| * | | Fix comments. | Bo Yang | 2015-02-03 | 1 | -2/+2 |
| | | | |||||
| * | | Implement a feature to generate a dependency file. By giving protoc the flag | Bo Yang | 2015-02-03 | 6 | -34/+115 |
| | | | | | | | | | | | | | | | | | | | | | "--dependency_manifest_out=FILE", protoc will write dependencies of input proto files into FILE. In FILE, the format will be <full path to FILE>: <full path to 1st proto>\\\n <full path to 2nd proto> ... This cl is based on https://github.com/google/protobuf/pull/178 | ||||
| * | | Add support for outputting dependency manifest files, used by ninja and make | Richard Geary | 2015-01-23 | 3 | -0/+219 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use --manifest-file=somefile.d to output the dependency manifest. This file will contain a list of files which were read by protoc as part of creating the output files. It doesn't include the plugin inputs if plugins are used, that could be a later extension. The manifest file is in the format <output file>: <input files>. The manifest file format only allows you to specify one output file, which isn't a problem as it's used to detect input changes in order to detect when to rerun the protoc command. The output file used in the manifest is the manifest filename itself; to use this in ninja you should declare the manifest file as the first output as well as the depfile input. | ||||
* | | | Merge pull request #231 from google/alpha-2-fix | Chris Fallin | 2015-03-05 | 1 | -0/+60 |
|\ \ \ | | | | | | | | | Add maven release profile for JavaNano. | ||||
| * | | | Add maven release profile for JavaNano. | Jisi Liu | 2015-03-05 | 1 | -0/+60 |
| | | | | | | | | | | | | | | | | Change-Id: I885b561c85325db05595f0d86338dcd7c06cf058 | ||||
* | | | | Fix tile atomicops macro. | Jisi Liu | 2015-03-05 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | Change-Id: I1a3acadd059f87c26a2e26f3b7a169c0780e981e | ||||
* | | | | Merge pull request #175 from martiert/tile-support | Jisi Liu | 2015-03-05 | 4 | -0/+83 |
|\ \ \ \ | | | | | | | | | | | Add support for the TILE-Gx processor family. | ||||
| * | | | | Add support for the TILE-Gx processor family. | Martin Ertsaas | 2015-01-22 | 4 | -0/+83 |
| | |/ / | |/| | | |||||
* | | | | Fix python versions to comply with pep-0440. | Jisi Liu | 2015-03-04 | 2 | -2/+14 |
| |_|/ |/| | | | | | | | | Change-Id: Ifb4958e4f371b36f249faa466473f851697edb5c | ||||
* | | | Merge remote-tracking branch 'github/alpha-2-fix' | Jisi Liu | 2015-03-04 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | | | | Change-Id: I4c5186b8451713fda38e60dc3f828da6196c7a5e | ||||
| * | | Fix python package version to alpha-2. | Jisi Liu | 2015-03-04 | 1 | -1/+1 |
| | | | | | | | | | | | | Change-Id: Iae16dcae833959681a5c8e98764e5d1071e6fdcf | ||||
* | | | Merge pull request #225 from google/post-alpha2-integrate | Jisi Liu | 2015-03-03 | 147 | -3306/+11280 |
|\ \ \ | | | | | | | | | Post alpha2 integrate from google internal for C++ and Java | ||||
| * | | | Remove the extra -j8 as it can be passed in $@ already. | Jisi Liu | 2015-03-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Change-Id: I97960f30d50b1635aa6c395377cd021ef5ebddd5 | ||||
| * | | | Initialize data members in constructors instead of direct initialize in | Jisi Liu | 2015-03-01 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | class definition, which is a C++11 extension. Change-Id: I477fe484d737f4c60c519d68f431940ffaa33431 | ||||
| * | | | use is_proto_enum instead of is_enum for repeated accessor field. | Jisi Liu | 2015-03-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The later is not supported by some versions of MSVC and the former is more accurate for the use case. Change-Id: I7096226b1ebfef8340d288bbaf2788540aa3e97f | ||||
| * | | | Fix hash.h for MSVC and platforms without hash map/set support. | Jisi Liu | 2015-03-01 | 3 | -43/+48 |
| | | | | | | | | | | | | | | | | Change-Id: Ic0fdb52c17b9495c73b8ce15879531383a148585 | ||||
| * | | | Fix hash_map type parameter to add Alloc for other platforms. | Jisi Liu | 2015-03-01 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | Change-Id: Idc5fb65a2cc469d55aff6f2cde0b51b326be0963 | ||||
| * | | | Use portable GOOGLE_PROTOBUF_THREAD_LOCAL instead of __thread. | Jisi Liu | 2015-03-01 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | Change-Id: Iaa75f8333541bc378bea699e7f147c7f17b652ad | ||||
| * | | | Add missing files in vsprojects. | Jisi Liu | 2015-03-01 | 5 | -8/+49 |
| | | | | | | | | | | | | | | | | Change-Id: I23abcd7f5ad4a1c6b94b0035ac0441ea874cf55d | ||||
| * | | | Down integrate from Google internal branch for C++ and Java. | Jisi Liu | 2015-02-28 | 140 | -3257/+11183 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13 | ||||
* | | | | Merge "Add a release profile for Java mvn project, which includes source ↵ | Jisi Liu | 2015-03-04 | 1 | -0/+58 |
|\ \ \ \ | | |/ / | |/| | | | | | | file, javadoc packaging and signing." | ||||
| * | | | Add a release profile for Java mvn project, which includes source file, | Jisi Liu | 2015-03-03 | 1 | -0/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | javadoc packaging and signing. Change-Id: I70632f01274b70e6f48dae5f4be15f123eb19a46 | ||||
* | | | | Updated Ruby gem version and added note to ruby/README.md regarding version ↵ | Chris Fallin | 2015-03-03 | 2 | -1/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | number scheme. Change-Id: Idb29077c153530de78ce28c094442aa8f51ddd25 | ||||
* | | | | Bump the version number to 3.0.0-alpha-3-pre | Jisi Liu | 2015-03-02 | 5 | -7/+7 |
| |/ / |/| | | | | | | | | Change-Id: I33479e529b060e4fed532a827a386d3baecc835e | ||||
* | | | Add .so to .gitignore. | Jisi Liu | 2015-02-28 | 1 | -0/+1 |
| | | | | | | | | | | | | Change-Id: I5418606cb51a43a8cd7f91f26448cf0e8dde1016 | ||||
* | | | Merge pull request #185 from mzhaom/remove-unused | Jisi Liu | 2015-02-26 | 2 | -26/+1 |
|\ \ \ | | | | | | | | | Remove unused methods: | ||||
| * | | | Remove unused methods: | Ming Zhao | 2015-01-29 | 2 | -26/+1 |
| | | | | | | | | | | | | | | | | MessageTypeProtoName, IsVariableLenType | ||||
* | | | | Merge pull request #199 from google/wkt | Jisi Liu | 2015-02-26 | 6 | -0/+635 |
|\ \ \ \ | | | | | | | | | | | Add the .proto files for well-known types. | ||||
| * | | | | Add the .proto files for well-known types. | Feng Xiao | 2015-02-09 | 6 | -0/+635 |
| | | | | | |||||
* | | | | | Merge pull request #216 from cnauroth/Parser-JavaDoc | Jisi Liu | 2015-02-26 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Correct JavaDoc return value documentation for Parser#parseDelimitedFrom... | ||||
| * | | | | | Correct JavaDoc return value documentation for Parser#parseDelimitedFrom. | cnauroth | 2015-02-23 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #222 from google/v3.0.0-alpha-2 | Jisi Liu | 2015-02-26 | 52 | -2126/+6363 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | V3.0.0 alpha 2 | ||||
| * | | | | | A few tweaks to CHANGES.txt.v3.0.0-alpha-2 | Josh Haberman | 2015-02-25 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Added release notes about Python changes. | Josh Haberman | 2015-02-25 | 1 | -0/+17 |
| | | | | | | |||||
| * | | | | | Fix the order of BUILT_FILES so that pbconfig.h will be built before | Jisi Liu | 2015-02-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anyother targets. Change-Id: I507009cd92a711739d7d58ccee93dfbf0a9fe135 |