Commit Graph

4726 Commits

Author SHA1 Message Date
Feng Xiao
710543d915 Merge pull request #3237 from calder/patch-1
Qualify string in java_options.h
2017-06-16 11:39:11 -07:00
Feng Xiao
491b32041d Merge pull request #3236 from buchgr/bazel-links
bazel: add bazel symlinks to .gitignore
2017-06-16 11:38:15 -07:00
Feng Xiao
888e287e3b Merge pull request #3235 from buchgr/java-target
bazel: Make compiled jars java 6 binary compatible.
2017-06-16 11:37:48 -07:00
Calder Coalson
4b36d4006b Qualify string in java_options.h
Building the protobuf compiler with Bazel fails to resolve the unqualifed "string"s in java_options.h:

```
ERROR: .../external/com_google_protobuf/BUILD:248:1: C++ compilation of rule '@com_google_protobuf//:protoc_lib' failed: Process exited with status 1 [sandboxed].
In file included from external/com_google_protobuf/src/google/protobuf/compiler/java/java_context.h:41:0,
                 from external/com_google_protobuf/src/google/protobuf/compiler/java/java_enum_field_lite.cc:38:
external/com_google_protobuf/src/google/protobuf/compiler/java/java_options.h:59:3: error: 'string' does not name a type
   string annotation_list_file;
   ^
external/com_google_protobuf/src/google/protobuf/compiler/java/java_options.h:62:3: error: 'string' does not name a type
   string output_list_file;
   ^
Use --strategy=CppCompile=standalone to disable sandboxing for the failing actions.
INFO: Elapsed time: 41.487s, Critical Path: 6.20s
//interpreter:eval_test                                               NO STATUS

Executed 0 out of 1 test: 1 was skipped.
```
2017-06-16 07:06:09 -07:00
Jakob Buchgraber
36e63da632 bazel: Make compiled jars java 6 binary compatible.
See: https://github.com/bazelbuild/bazel/issues/3198
2017-06-16 12:50:35 +02:00
Jakob Buchgraber
d0e6f3b9ab bazel: add bazel symlinks to .gitignore 2017-06-16 12:39:32 +02:00
Paul Yang
91bf623aa1 Fix php jenkins test (#3233)
Update commit id to upload latest composer.
Compile php with bc-math for future json support.
2017-06-15 13:04:08 -07:00
michaelbausor
8d97b3d8b5 Fix incorrect function call (#3232) 2017-06-15 10:49:24 -07:00
Brent Shaffer
b9b34e9b11 Follows proper autoloading standards (#3123)
* Follows proper autoloading standards
 - Splits PHP classes in descriptor.php into separate files
 - Splits MapFieldIter and RepeatedFieldIter into separate files
 - Moves descriptor.php to Internal/functions.php
 - Moves all namespaced functions into Iternal/functions.php

* fixes Makefile.am for added php files

* [PHP] moves all functions to GPBUtil

* removes description.php from the makefile
2017-06-14 15:57:11 -07:00
Thomas Van Lenten
09d2994b1f Merge pull request #3228 from thomasvl/add_tvos_to_podspec
Add tvOS to the podspec.
2017-06-14 15:57:55 -04:00
Thomas Van Lenten
6ecf38f427 Add tvOS to the podspec.
Fixes https://github.com/google/protobuf/issues/3217
2017-06-14 15:56:41 -04:00
Feng Xiao
c722c3d294 Merge pull request #3216 from traversaro/patch-1
Export symbols used in inline functions
2017-06-12 10:26:57 -07:00
Silvio Traversaro
9094bf0f7e Export symbols used in inline functions
fixed_address_empty_string symbol is used in an inline function.
We have to export it to avoid undefined reference link errors.
2017-06-12 17:09:55 +02:00
Gergely Nagy
9ba7d1c038 C++: Do not forward-declare dependencies in generated .h files 2017-06-12 14:34:51 +02:00
Adam Cozzette
96095f3a85 Merge pull request #3176 from acozzette/fix-3114
Ensure that for Java, imports of .proto files with empty packages works
2017-06-07 15:15:34 -07:00
Feng Xiao
c202b06de9 Merge pull request #3196 from matt-kwong/kokoro
Add continuous testing config files for Kokoro
2017-06-07 11:09:37 -07:00
Matt Kwong
0871e6a808 Add continuous testing config files for Kokoro 2017-06-07 11:08:00 -07:00
Feng Xiao
d4d41af19b Merge pull request #3191 from matt-kwong/kokoro
Add MacOS and Linux tests to Kokoro
2017-06-06 16:44:30 -07:00
Matt Kwong
6156af10e8 Add MacOS and Linux tests to Kokoro 2017-06-06 15:09:02 -07:00
Thomas Van Lenten
d555775836 Merge pull request #3189 from thomasvl/objc_proto3_unknown_fields
ObjC: Preserve unknown fields in proto3 syntax files.
2017-06-06 15:31:20 -04:00
Feng Xiao
2aeb4ab9c7 Merge pull request #3160 from meteorcloudy/winbuild
Refactor cc options in BUILD file for Windows
2017-06-06 10:31:21 -07:00
Adam Cozzette
ddbe36003e Merge pull request #3159 from yeswalrus/new-generate
CMake: Add modern protobuf_generate
2017-06-06 09:13:31 -07:00
Thomas Van Lenten
1d0988b8ef ObjC: Preserve unknown fields in proto3 syntax files.
As announced: https://groups.google.com/forum/#!topic/protobuf/VX5qEmTW3y0

The ObjC side of https://github.com/google/protobuf/issues/272
2017-06-06 10:44:14 -04:00
Thomas Van Lenten
516a81a424 Merge pull request #3190 from thomasvl/objc_IllegalZeroFieldNum
Properly error on a tag with field number zero.
2017-06-06 10:41:04 -04:00
Thomas Van Lenten
ecc0f54127 Properly error on a tag with field number zero. 2017-06-06 10:14:41 -04:00
Adam Cozzette
656dedbf07 Merge pull request #3157 from yeswalrus/fix-version-check
Fix CMake version check
2017-06-05 14:19:23 -07:00
Paul Yang
6f325805c0 Add new file option php_namespace. (#3162)
* Add new file option php_namespace.

Use this option to change the namespace of php generated classes.
Default is empty. When this option is empty, the package name will be
used for determining the namespace.

* Uncomment commented tests

* Revert gdb test change

* Update csharp descriptor.

* Add test for empty php_namespace.
2017-06-05 00:10:18 -07:00
Walter Gray
df3f8cf6dd fix check_and_save_build_option not correctly exporting build options 2017-06-02 19:59:03 -07:00
Walter Gray
0336770801 add protobuf_generate function, allows use of target_sources where available 2017-06-02 19:57:08 -07:00
Adam Cozzette
e9c15d601e Ensure that for Java, imports of .proto files with empty packages works
This fixes a compiler bug that caused a Java syntax error when one .proto file
would import another one with an empty package and java_package. This fixes
issue #3114.
2017-06-02 13:45:57 -07:00
Thomas Van Lenten
fbaad3617f Merge pull request #3169 from dmaclach/master
Optimize GPBDictionary.m codegen to reduce size of library
2017-06-01 15:34:00 -04:00
Thomas Van Lenten
63a97289dc Merge pull request #3170 from thomasvl/int64_map_issue
Fix some cases of reading of 64bit map values.
2017-06-01 14:27:24 -04:00
Thomas Van Lenten
46f36d79a2 Fix some cases of reading of 64bit map values.
Fixes https://github.com/google/protobuf/issues/3164.
2017-06-01 14:25:45 -04:00
Dave MacLachlan
ea43e0c5e8 Optimize GPBDictionary.m codegen to reduce size of overall library by 46K per architecture. 2017-06-01 10:28:06 -07:00
Yun Peng
0b059a3d8a Refactor cc options in BUILD file for Windows
Don't put gcc warnings options in copts, so that protobuf is able to
build by MSVC toolchain without python wrappers.
2017-05-31 14:01:30 +02:00
Walter Gray
a183a0df61 Fix the check_and_save_build_option macro never evaluating to true 2017-05-30 15:04:11 -07:00
Walter Gray
faa53989cb fix check_and_save_build_option not correctly exporting build options 2017-05-30 15:04:11 -07:00
Walter Gray
ae85cb8ef3 Fix find module not working when no version number was given 2017-05-30 15:04:11 -07:00
Wayne Zhang
d6470abef1 not to use std::random_device for map.Seed(). (#3133)
* not to use std::random_device for map.Seed().

* remove include random
2017-05-30 11:18:23 -07:00
Adam Cozzette
e222997c5b Merge pull request #3149 from KarrokDC/master
Add headers as part of cmake project generation
2017-05-30 09:27:21 -07:00
Paul Yang
1e86ef4e9f Oneof field should be serialized even it's equal to default. (#3153) 2017-05-29 22:04:20 -07:00
Paul Yang
282fb9e68e Add ARRAY for reserved name (#3150) 2017-05-29 15:30:47 -07:00
Brent Shaffer
4d5daf4ef9 Adds fluent setters for PHP (#3130) 2017-05-29 10:39:14 -07:00
Dennis Cappendijk
4eb02fe31e Add headers as part of cmake project
tested only on windows with visual studio 2015 as generator
2017-05-29 17:34:08 +02:00
Adam Cozzette
4674cc7c07 Merge pull request #3113 from phst/master
Improve fix for https://github.com/google/protobuf/issues/295
2017-05-26 09:50:18 -07:00
John Brock
95749d5af6 update csharp README and fix .NET 3.5 build error 2017-05-25 20:20:31 +01:00
lundefugl
aea4374393 Issue 3112: Object class with fully qualified name 2017-05-24 12:54:23 +02:00
Jon Skeet
0b07d7eb9e Add IncludeSource in csproj as per review comments 2017-05-24 09:07:33 +01:00
Jon Skeet
f26e8c2ae0 Convert C# projects to MSBuild (csproj) format
This has one important packaging change: the netstandard version now
depends (implicitly) on netstandard1.6.1 rather than on individual
packages. This is the preferred style of dependency, and shouldn't
affect any users - see http://stackoverflow.com/questions/42946951
for details.

The tests are still NUnit, but NUnit doesn't support "dotnet test"
yet; the test project is now an executable using NUnitLite. (When
NUnit supports dotnet test, we can adapt to it.)

Note that the project will now only work in Visual Studio 2017 (and
Visual Studio Code, and from the command line with the .NET Core
1.0.0 SDK); Visual Studio 2015 does *not* support this project file
format.
2017-05-24 09:07:33 +01:00
brian-peloton
40da1ed572 Removing undefined behavior and compiler warnings (#1315)
* Comment out unused arguments.

These last few are all that's needed to compile with -Wunused-arguments.

* Fix missing struct field initializer.

With this fix, everything compiles with -Wmissing-field-initializers.

* Add support for disabling unaligned memory accesses on x86 too.

ubsan doesn't like these because they are technically undefined
behavior, so -DGOOGLE_PROTOBUF_DONT_USE_UNALIGNED will disable them easily.

* Avoid undefined integer overflow.

ubsan catches all of these.
2017-05-23 16:22:57 -07:00