aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* `.gitignore` generated fileTamir Duberstein2015-03-311-0/+1
|
* Change fixture name to be consistentTamir Duberstein2015-03-312-3/+3
| | | | | This fixes the problem where `make check` generates files not ignored by `.gitignore`.
* Merge pull request #257 from kentonv/masterJoshua Haberman2015-03-261-240/+0
|\ | | | | Delete "SEBS" (aka: Clean up Kenton's old trash)
| * Delete "SEBS" (aka: Clean up Kenton's old trash)Kenton Varda2015-03-261-240/+0
|/ | | 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.
* Merge the release branch for v2.4.1Feng Xiao2015-03-240-0/+0
|\ | | | | | | Change-Id: I4a8dcb4aba0104305b5dd052ed3bd532ddbedfb2
| * Update version number to 2.4.1v2.4.1Feng Xiao2015-03-243-3/+3
| | | | | | | | Change-Id: Ief6eccab82712be04285fc918bf0102102bbce21
* | Merge the release branch for v2.5.0Feng Xiao2015-03-240-0/+0
|\ \ | | | | | | | | | Change-Id: I81b1f178ef9dafa3ab8704967d3f0e926cccb10f
| * | Update version number to 2.5.0v2.5.0Feng Xiao2015-03-244-5/+5
| | | | | | | | | | | | Change-Id: Ie5114bde3574c6cb0c67d5852b4658287561a0d3
* | | Merge pull request #245 from numberten/patch-1Jisi Liu2015-03-184-32/+62
|\ \ \ | | | | | | | | Rename README.txt to README.md
| * | | converted javanano README to markdown. Corrected Makefilejesse2015-03-172-25/+44
| | | |
| * | | rename python README, and fix markdown in java and python respectivelyjesse2015-03-162-7/+18
| | | |
| * | | Rename README.txt to README.mdJesse Frankley2015-03-161-0/+0
| | | |
* | | | Merge pull request #248 from tamird/test-on-osxFeng Xiao2015-03-182-2/+6
|\ \ \ \ | | | | | | | | | | CI: OS X + faster builds
| * | | | Parallelize CITamir Duberstein2015-03-181-1/+1
| | | | |
| * | | | Use Travis container-based buildsTamir Duberstein2015-03-181-0/+1
| | | | |
| * | | | Add OS X to travis; fix tests to pass on OS XTamir Duberstein2015-03-182-1/+4
|/ / / /
* | | | Merge pull request #228 from cconroy/sanitize-enumsJisi Liu2015-03-165-5/+50
|\ \ \ \ | |/ / / |/| | | Sanitize Enum names from collisions with reserved words.
| * | | Sanitize Enum names from collisions with reserved words.Chris Conroy2015-03-165-5/+50
| | | |
* | | | Merge pull request #244 from TeBoring/teboringPaul Yang2015-03-154-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 Yang2015-03-144-83/+0
|/ / / /
* | | | Add a missing proto file.Feng Xiao2015-03-132-1/+47
| | | | | | | | | | | | | | | | Change-Id: Ic98584616bd6ee49680273f0cdbe6d9c038ec0e9
* | | | Merge pull request #146 from isaiah/jrubyChris Fallin2015-03-1028-25/+4641
|\ \ \ \ | | | | | | | | | | protobuf support for jruby
| * | | | add jruby support by protobuf-java reflection APIIsaiah Peng2015-03-1028-25/+4641
|/ / / /
* | | | Merge pull request #193 from TeBoring/sbPaul Yang2015-03-095-2/+215
|\ \ \ \ | | | | | | | | | | Implement a feature to generate a dependency file
| * | | | Fix absolute/relative path in outputBo Yang2015-02-092-12/+16
| | | | |
| * | | | Change target to output filenamesBo Yang2015-02-073-25/+73
| | | | |
| * | | | Fix commentBo Yang2015-02-041-2/+2
| | | | |
| * | | | Clean codeBo Yang2015-02-042-20/+20
| | | | |
| * | | | Remove "include sstream" from command_line_interface.ccBo Yang2015-02-041-1/+0
| | | | |
| * | | | Change flag for generating dependency file to "dependency_out". DeleteBo Yang2015-02-044-150/+12
| | | | | | | | | | | | | | | | | | | | test-driver
| * | | | Fix comments.Bo Yang2015-02-031-2/+2
| | | | |
| * | | | Implement a feature to generate a dependency file. By giving protoc the flagBo Yang2015-02-036-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 makeRichard Geary2015-01-233-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-fixChris Fallin2015-03-051-0/+60
|\ \ \ \ \ | | | | | | | | | | | | Add maven release profile for JavaNano.
| * | | | | Add maven release profile for JavaNano.Jisi Liu2015-03-051-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I885b561c85325db05595f0d86338dcd7c06cf058
* | | | | | Fix tile atomicops macro.Jisi Liu2015-03-051-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a3acadd059f87c26a2e26f3b7a169c0780e981e
* | | | | | Merge pull request #175 from martiert/tile-supportJisi Liu2015-03-054-0/+83
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add support for the TILE-Gx processor family.
| * | | | | | Add support for the TILE-Gx processor family.Martin Ertsaas2015-01-224-0/+83
| | |/ / / / | |/| | | |
* | | | | | Fix python versions to comply with pep-0440.Jisi Liu2015-03-042-2/+14
| |_|/ / / |/| | | | | | | | | | | | | | Change-Id: Ifb4958e4f371b36f249faa466473f851697edb5c
* | | | | Merge remote-tracking branch 'github/alpha-2-fix'Jisi Liu2015-03-041-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: I4c5186b8451713fda38e60dc3f828da6196c7a5e
| * | | | Fix python package version to alpha-2.Jisi Liu2015-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iae16dcae833959681a5c8e98764e5d1071e6fdcf
* | | | | Merge pull request #225 from google/post-alpha2-integrateJisi Liu2015-03-03147-3306/+11280
|\ \ \ \ \ | | | | | | | | | | | | Post alpha2 integrate from google internal for C++ and Java
| * | | | | Remove the extra -j8 as it can be passed in $@ already.Jisi Liu2015-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I97960f30d50b1635aa6c395377cd021ef5ebddd5
| * | | | | Initialize data members in constructors instead of direct initialize inJisi Liu2015-03-011-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 Liu2015-03-011-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 Liu2015-03-013-43/+48
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0fdb52c17b9495c73b8ce15879531383a148585
| * | | | | Fix hash_map type parameter to add Alloc for other platforms.Jisi Liu2015-03-011-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idc5fb65a2cc469d55aff6f2cde0b51b326be0963
| * | | | | Use portable GOOGLE_PROTOBUF_THREAD_LOCAL instead of __thread.Jisi Liu2015-03-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaa75f8333541bc378bea699e7f147c7f17b652ad
| * | | | | Add missing files in vsprojects.Jisi Liu2015-03-015-8/+49
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I23abcd7f5ad4a1c6b94b0035ac0441ea874cf55d
| * | | | | Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-28140-3257/+11183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-06 07:33:28 +0000