aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* Fixed "make distcheck" for the Autotools buildAdam Cozzette2017-01-091-2/+4
| | | | | To make the test pass I needed to fix out-of-tree builds and update EXTRA_DIST and CLEANFILES.
* Fixed cross compilations with the Autotools buildAdam Cozzette2017-01-031-3/+6
| | | | | | | | Pull request #2517 caused cross compilations to start failing, because the js_embed binary was being built to run on the target platform instead of on the build machine. This change updates the Autotools build to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for the build machine and always use that when building js_embed.
* Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned upAdam Cozzette2016-12-201-1/+2
|
* Updated Makefile.am to fix out-of-tree buildsAdam Cozzette2016-12-201-1/+4
|
* Auto-generate well_known_types_embed.ccAdam Cozzette2016-12-191-2/+12
| | | | | | | Until now this file was just checked into the repo, but actually it should be generated from any.js, struct.js, and timestamp.js. This change updates the build system to make this happen. To make it work I also had to remove some C++11 features from embed.cc.
* Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-171-112/+112
|\
| * Fixing references to the removed atomicops_internals_pnacl.h file.Sergio Campama2016-11-101-111/+111
| |
* | Integrated internal changes from GoogleAdam Cozzette2016-11-171-0/+2
|/
* Bump library version to 11Bo Yang2016-10-101-2/+2
|
* Bump library veriosn to 3.1Bo Yang2016-10-101-1/+1
|
* Fix bugs for internal integration.Bo Yang2016-10-101-0/+1
|
* Integrate internal changesBo Yang2016-10-101-0/+6
|
* Merge pull request #2112 from pherl/mergeJisi Liu2016-09-151-0/+1
|\ | | | | Merge 3.0.x into master
| * Merge pull request #1905 from pherl/fixdocJisi Liu2016-08-021-0/+1
| |\ | | | | | | Add and fix C++ runtime docs
| | * Add and fix C++ runtime docsJisi Liu2016-08-021-0/+1
| | |
* | | Check in php implementation. (#2052)Paul Yang2016-09-151-0/+2
|/ / | | | | | | | | This pull request includes two implementation: C extension and PHP package. Both implementations support encode/decode of singular, repeated and map fields.
* / Change the build.zip.sh to support liteJisi Liu2016-07-281-0/+4
|/
* Fixed Makefile.am for Ruby file rename.Josh Haberman2016-07-261-1/+1
|
* Add a test to catch sign-comparison warnings.Feng Xiao2016-07-221-6/+28
| | | | | | | | 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
* Add files missing from "make dist".Feng Xiao2016-07-191-1/+3
| | | | Change-Id: I56a6cce613462794f172ff2e62b25d8a9fc162f3
* Add missing golden test file.Feng Xiao2016-07-141-0/+1
|
* Fix some failing travis tests.Feng Xiao2016-07-011-0/+1
| | | | | | | 1. Add missing header file to Makefile.am. 2. Re-generate objectivec generated code for well-known types. Change-Id: If28217c701cf8bd739ea0db240e9eee600f23ee7
* Change protobuf CPP proto generator to support the 'lite' option inChad Whipkey2016-04-151-0/+8
| | | | | | | | | proto3. Added a couple unit test proto3 files, for arena_lite and lite. Cloned the proto3_arena_unittest to test some of the basics of generated code (and to ensure that the generated proto3 test files are used by some test).
* Added access_level for typesGaurav Vaish2016-04-051-0/+1
| | | | | | | | | | | * `csharp_options`: Added `Options` to encapsulate generator options. Supported options for now - file_extension, base_namespace * `{Blah}Generator`: Now accept `Options*` as parameter to constructor * `csharp_generator.cc`: Parse and populate options * `Makefile.am`: Added `csharp_options.h` * `extract_includes.bat.in`: Added `csharp_options.h` Refactoring code to two commits. This is the first commit
* Integrate from google internal.Jisi Liu2016-01-291-0/+3
| | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration.
* Add missing files to EXTRA_DIST.Feng Xiao2015-12-281-3/+5
| | | | Also delete some unused files.
* Down-integrate from internal code base.Feng Xiao2015-12-111-2/+6
|
* Rename "umbrella" to "reflection" consistently.Jon Skeet2015-11-191-2/+2
| | | | This changes csharp_names.h, which will require a corresponding change in GRPC.
* Add support for POWER LinuxDoug Kwan2015-11-031-1/+1
|
* First pass at generating XML documentation from .proto comments.Jon Skeet2015-10-011-0/+2
| | | | | | This could be tidied up significantly, and at some point we will want to parse the markdown and generate more appropriate XML - but this is definitely better than nothing. Generated code changes coming in next commit.
* Down-integrate from internal code base.Feng Xiao2015-08-231-10/+31
|
* Merge branch 'master' of github.com:google/protobufJisi Liu2015-08-211-4/+5
|\ | | | | | | Change-Id: If3fb07754a734bae610d95124528e073515ac525
| * Merge pull request #629 from google/masterJon Skeet2015-07-211-0/+9
| |\ | | | | | | Integrate changes from upstream/master into csharp-experimental
| * \ Merge pull request #611 from jskeet/csharp-wrappersJon Skeet2015-07-171-1/+3
| |\ \ | | | | | | | | C# wrapper types
| | * | First part of implementing wrapper types. Not ready yet!Jon Skeet2015-07-161-1/+3
| | | |
| * | | Merge pull request #586 from jtattermusch/csharp_names_exportJan Tattermusch2015-07-161-0/+1
| |\ \ \ | | |/ / | |/| | Export c# naming routines publicly
| | * | export c# naming routines publiclyJan Tattermusch2015-07-101-0/+1
| | | |
| * | | Merge remote-tracking branch 'upstream/master' into csharp-experimentalJan Tattermusch2015-07-151-1/+0
| |\ \ \ | | |/ / | |/| |
| * | | First pass at map support.Jon Skeet2015-06-251-0/+2
| | | | | | | | | | | | | | | | More tests required. Generated code in next commit.
| * | | Merge remote-tracking branch 'upstream/master' into proto3-onlyJon Skeet2015-06-191-99/+201
| |\ \ \
| * \ \ \ Merged masterJon Skeet2015-06-171-23/+18
| |\ \ \ \
| * | | | | First stab at new proto3-only code generatorJon Skeet2015-06-051-5/+1
| | | | | |
* | | | | | Down-integrate from internal branch.Jisi Liu2015-08-211-5/+26
| |_|_|_|/ |/| | | | | | | | | | | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
* | | | | Merge branch 'master' of github.com:google/protobuf into splitheaderJisi Liu2015-07-171-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I5f6cbc2430200e3751ad754cc7ae604338db6f91
| * | | | | Install missing headersRob Earhart2015-07-141-0/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Install google/protobuf/stubs/status.h, and google/protobuf/stubs/stringpiece.h -- these are required in order to include google/protobuf/util/type_resolver.h. Install google/protobuf/stubs/bytestream.h -- this is required in order to include google/protobuf/util/json_util.h.
* / | | | Update make file for extra headers.Jisi Liu2015-07-171-0/+6
|/ / / / | | | | | | | | | | | | Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22
* | | / Internal local modifications.Bo Yang2015-07-091-1/+0
| |_|/ |/| |
* | | Merge pull request #501 from xfxyjwf/downFeng Xiao2015-06-171-99/+201
|\ \ \ | |_|/ |/| | Down-integrate from internal code base.
| * | Fix broken builds.Feng Xiao2015-06-171-15/+22
| | |
| * | Down-integrate from internal code base.Feng Xiao2015-06-151-97/+192
| | | | | | | | | | | | | | | | | | [ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d