Commit Graph

5732 Commits

Author SHA1 Message Date
Yilun Chong
5fb73f80f2
Merge pull request #4415 from BSBandme/experiement
Add dashboard support
2018-04-10 14:23:07 -07:00
Yilun Chong
805174eda2 Add script for run and upload the benchmark result to bq 2018-04-10 13:26:17 -07:00
urfinjuezz
d7d863ea07 fix json_decode call parameters (#4381) 2018-04-09 14:14:31 -07:00
Brent Shaffer
13e627ad69 includes the expected class in the exception, otherwise the error is harder to track down (#3371) 2018-04-09 14:08:58 -07:00
Thomas Hisch
451e0446ab Add __init__.py files to compiler and util subpackages (#4117)
The compiler and util subpackages are created by the build_py class in
setup.py. This has caused an issue in the protobuf package in
conda-forge (https://github.com/conda-forge/protobuf-feedstock/issues/40),
which is fixed by this commit.
2018-04-09 12:43:10 -07:00
Paul Yang
3b6d027ba2
For windows, all python version should use /MT (#4468) 2018-04-06 15:43:32 -07:00
Thomas Van Lenten
dce8229a38 Add the files added in #4485. 2018-04-06 10:52:31 -04:00
Sergio Campama
ce24b8a224 Update Xcode settings 2018-04-06 10:37:14 -04:00
Jon Skeet
da3ce67171 Deliberately call simple code to avoid Unity linker pruning
The SampleEnumMethod method was previously only called via
reflection, so the Unity linker thought it could be removed. Ditto
the parameterless constructor in ReflectionHelper.

This PR should avoid that issue, reducing the work needed by
customers to use Google.Protobuf from Unity.
2018-04-06 08:05:32 +01:00
Feng Xiao
a72da27f5a
Merge pull request #4475 from chenchuanyin/patch-1
Fix problem: cmake build failed in c++11  by clang
2018-04-05 16:46:06 -07:00
Feng Xiao
e7e6c6b8d1
Merge pull request #4283 from ObsidianMinor/csharp/better-test-runners
[C#] Update test project to be used with dotnet test and Visual Studio Test Explorer
2018-04-04 17:01:09 -07:00
ObsidianMinor
f72ac9f987 Updated csharp/README.md to reflect testing changes 2018-04-04 16:04:12 -05:00
Silver Chan
d3e8a54020
Fix problem: cmake build failed in c++11 by clang
CMakeLists.txt adds c++11 flags for clang
2018-04-04 10:31:05 +08:00
Paul Yang
c931743461
Merge branch (#4466)
* Fix setup.py for windows build.

* Bump version number to 3.5.2

* Cat the test-suite.log on errors for presubits
2018-04-02 15:55:28 -07:00
Charlie Moad
579f81e1c6 js message support for jstype string on integers (#4332) 2018-04-02 15:44:28 -07:00
Feng Xiao
40d6eca832
Merge pull request #4467 from xfxyjwf/error
Improve error message when googletest is missing.
2018-04-02 14:46:58 -07:00
Feng Xiao
8f88a507ee Improve error message when googletest is missing. 2018-04-02 14:28:25 -07:00
Feng Xiao
7f92711085
Merge pull request #4411 from pravin-dsilva/protobuf-ppc64le
Add support for Power (ppc64le) arch
2018-04-02 13:56:22 -07:00
Feng Xiao
4274e6af2d
Merge pull request #4447 from ejona86/cleaner-protoc-artifacts
Cleaner protoc artifacts
2018-04-02 13:55:12 -07:00
Feng Xiao
c934d1d185
Merge pull request #4452 from xfxyjwf/doc
Update instructions about getting protobuf source.
2018-04-02 11:18:26 -07:00
Thomas Van Lenten
aab0f898c9
Merge pull request #4464 from thomasvl/includes3
Move ObjC WKTs to minimal imports to avoid import cycle.
2018-04-02 14:09:19 -04:00
Thomas Van Lenten
bd941d5d69 Don't generate imports for the WKTs unless generating the WKTs.
Since the generated header import GPBProtocolBuffers.h, there is no need
to generate imports for the WKTs as they will have already been imported.
2018-04-02 09:54:29 -04:00
Thomas Van Lenten
e998b8ff66 Add compile test sources for to test include order.
To ensure all headers aren't dependent on other things being imported
before/after them, make a source that just imports each header and add
it to the unittesting target, that way we ensure it can be included on
its own with ordering issues.

Also do this testing with a few generated headers that aren't part of
the library to help ensure the different generated imports needed are
complete.
2018-04-02 09:54:29 -04:00
Thomas Van Lenten
bca797dac9 Trim imports for bundled generated protos.
To avoid a cycle between headers, have the WKTs use minimal imports instead
of using the helper to get everything from the library.

Fixes https://github.com/google/protobuf/issues/4301
Fixes https://github.com/google/protobuf/issues/4403
2018-04-02 09:54:29 -04:00
Feng Xiao
014e76e2cd Update instructions about getting protobuf source. 2018-03-29 13:14:00 -07:00
Eric Anderson
cdbfdd8da8 protoc-artifacts: Use ENTRYPOINT to enable devtoolset-1.1
ENTRYPOINT is used even when other commands are specified on the "docker
run" command line. This allows running one-off commands in the docker
image (especially combined with volume binding with the host) with the
correct environment variables.
2018-03-28 17:24:07 -07:00
Eric Anderson
67c1cd4cb7 protoc-artifacts: Avoid storing temporary files and use fewer layers
This is just better Dockerfile hygene as it produces smaller resulting
images with fewer useless files.
2018-03-28 17:24:07 -07:00
Eric Anderson
5f052ae7ae protoc-artifacts: Avoid checking out protobuf code
It is a bad idea to check out code into the docker image, as it will be
out-of-date. It is better to have the image just be the environment, and
let any scripts that need source check them out themselves.

This fixes #4419 in that it allows the image to build again, albeit
users would need to use wget to grab the source of the version of
protobuf they wish.
2018-03-28 17:24:07 -07:00
Feng Xiao
7bf47a6b5d
Merge pull request #4433 from xfxyjwf/license
Cleanup LICENSE file.
2018-03-28 14:10:13 -07:00
Feng Xiao
c8ed695872
Merge pull request #4445 from xfxyjwf/badge
Add kokoro build status badges.
2018-03-28 10:58:26 -07:00
Feng Xiao
eac0e92798 Add kokoro build status badges.
Moved the badges to the language table as they are per-language based.
Some badges are not yet available due to stuck kokoro jobs.
2018-03-27 17:43:41 -07:00
Feng Xiao
59c4328d7c
Merge pull request #4442 from xfxyjwf/clean
Delete unused directories.
2018-03-27 17:30:21 -07:00
Feng Xiao
107cd70c7c Delete unused directories.
jenkins has been replaced by kokoro and we never use more_tests.
2018-03-27 15:33:56 -07:00
Adam Cozzette
d3d7cdbcad
Merge pull request #4439 from acozzette/remove-atomicops-stub
Removed atomicops.h stub
2018-03-27 12:47:35 -07:00
Adam Cozzette
612b670086 Updated .gitignore to exclude downloaded gmock/ directory 2018-03-27 09:54:33 -07:00
Adam Cozzette
4875dfe9be Removed atomicops.h since it is no longer used 2018-03-27 09:46:38 -07:00
Jan Tattermusch
2537bea6b8
Merge pull request #3794 from jskeet/reflection
Change C# reflection to avoid using expression trees
2018-03-27 13:31:29 +02:00
Jon Skeet
9c05c35341 Address review comments 2018-03-27 10:17:44 +01:00
Jon Skeet
7b19d20882 Add extra C# file to Makefile.am 2018-03-27 08:44:42 +01:00
Jon Skeet
8e23d4e49c Work around an "old runtime" issue with reflection
For oneofs, to get the case, we need to call the property that
returns the enum value. We really want it as an int, and modern
runtimes allow us to create a delegate which returns an int from the
method. (I suspect that the MS runtime has always allowed that.)
Old versions of Mono (e.g. used by Unity3d) don't allow that, so we
have to convert the enum value to an int via boxing. It's ugly, but
it should work.
2018-03-27 08:42:27 +01:00
Jon Skeet
aa59eaa77b Introduce a compatiblity shim to support .NET 3.5 delegate creation 2018-03-27 08:42:27 +01:00
Jon Skeet
8ba420f040 Change C# reflection to avoid using expression trees
This should work on Unity, Mono and .NET 3.5 as far as I'm aware.
It won't work on platforms where reflection itself is prohibited,
but that's a non-starter basically.
2018-03-27 08:42:26 +01:00
Feng Xiao
63bba9bba1
Merge pull request #4432 from xfxyjwf/rmnanokokoro
Delete javanano kokoro build configs.
2018-03-26 16:40:21 -07:00
Feng Xiao
5050269207
Merge pull request #4434 from xfxyjwf/buildstatus
Remove broken build status icons.
2018-03-26 16:39:49 -07:00
Feng Xiao
9f5bdedbe1 Remove broken build status icons. 2018-03-26 15:14:55 -07:00
Feng Xiao
9e080f7ac0 Cleanup LICENSE file.
Remove copyright attributions to files that no longer exist; Change the
year to 2008 to be consistent with the copyright header of other source
files.
2018-03-26 15:03:41 -07:00
Feng Xiao
68de0cf390 Delete javanano kokoro build configs.
Their job configs are being deleted in cl/190526138
2018-03-26 14:44:23 -07:00
Carlos O'Ryan
3c5442a95d Include googletest as a submodule (#3993)
Add googletest as a submodule in third_party/googletest.
2018-03-26 13:54:32 -07:00
Joshua Humphries
1156ee7ea7 source code info for interpreted options; fix source code info for extension range options (#4342)
* when interpreting options, rewrite file descriptor's source code info
- so that interpreted option paths have correct location information
- so that corresponding uninterpreted option paths are removed
also includes a fix to source code locations for extension range options
2018-03-26 13:49:31 -07:00
Feng Xiao
d34e3190df
Merge pull request #4431 from xfxyjwf/rmnano
Remove javanano.
2018-03-26 13:43:54 -07:00