Commit Graph

5153 Commits

Author SHA1 Message Date
Jisi Liu
19b8c8bfd3 Update conformance tests again. 2017-07-25 16:08:17 -07:00
Adam Cozzette
8d5f2c57e8 Merge pull request #3410 from adam-26/1745
Fix issue #1745 - javascript allow dot in filename
2017-07-25 15:52:25 -07:00
Jisi Liu
12c186f7c6 Fix makefile.am 2017-07-25 14:38:00 -07:00
Jisi Liu
de6debcf2b Fix conformance tests 2017-07-25 14:37:37 -07:00
Jisi Liu
e177739fa2 Fix build files 2017-07-25 14:37:19 -07:00
Jisi Liu
9b8f6589f2 Remove dependency on guava 20 2017-07-25 13:46:17 -07:00
Jisi Liu
d974cc2e9a Update conformance tests 2017-07-25 12:22:32 -07:00
Jisi Liu
f39d4de94f Merge remote-tracking branch 'origin/master' into merge 2017-07-25 12:00:29 -07:00
Jisi Liu
759245a49a Merge from master 2017-07-25 11:52:33 -07:00
Sergey
bb8664419b need for php math functions. used in mergeFromJsonString (#3409) 2017-07-25 10:40:10 -07:00
Adam Cozzette
e9f4e8e4f5 Merge pull request #3407 from bklarson/master
Add declaration for AddDescriptorsImpl()
2017-07-25 06:44:14 -07:00
Paul Yang
451d061141 Fix cycle dependency for repeated field not collected by gc (#3399) 2017-07-25 00:49:16 -07:00
Jisi Liu
4bff88e0fb Merge pull request #3413 from pherl/3.4.x
Update version number for 3.4.0
2017-07-25 00:16:35 -07:00
Jisi Liu
ce4416705b Merge remote-tracking branch 'origin/3.4.x' into vb 2017-07-24 20:44:59 -07:00
Jisi Liu
4ae94d69ff Merge pull request #3414 from pherl/fixzip
Omit the zip test if tools are not available
2017-07-24 20:38:29 -07:00
Jisi Liu
eb6b3320a5 Merge pull request #3412 from anandolee/3.4.x
Use keys() instead of iterkeys() to be python3 compatbile.
2017-07-24 20:37:35 -07:00
Jisi Liu
02250a7ff4 Omit the zip test if tools are not available 2017-07-24 17:17:57 -07:00
Jie Luo
9c012ed07d Add __bool__ as well as __nonzero__ for python3 2017-07-24 16:42:23 -07:00
Jisi Liu
11b4d5ec73 Update required version on pre-generated files 2017-07-24 16:23:43 -07:00
Jisi Liu
8b24feb6ad Update pre generated files 2017-07-24 16:20:17 -07:00
Jisi Liu
7bb39bef1a Update version number for 3.4.0 2017-07-24 16:03:49 -07:00
Jie Luo
a484794820 Use keys() instead of iterkeys() to be python3 compatbile. 2017-07-24 15:44:16 -07:00
Jisi Liu
72cc5a6eb3 Merge pull request #3393 from pherl/3.4.x
Create 3.4.x branch
2017-07-24 14:59:27 -07:00
Brad Larson
b6da2262e8 Put AddDescriptorsImpl() in anonymous namespace
AddDescriptorsImpl() is a private static implementation detail,
and needs to be declared but won't be used from outside the
source file.  Place it inside an anonymous namespace to fix a
previous build error that would result in more restrictive
build enviornments that use -Werror=missing-declarations or
similar compiler flags.
2017-07-24 16:52:04 -05:00
Yilun Chong
a713b73076 Merge pull request #3281 from BSBandme/ConformanceTestYilunChong
Proto2 test message support to conformance test
2017-07-24 14:50:52 -07:00
Adam
2b6db00de1 Fix quotation marks 2017-07-24 23:00:49 +02:00
Adam
a3a65b320d Fix issue #1745 - javascript allow dot in filename 2017-07-24 22:41:09 +02:00
Feng Xiao
f15185d370 Merge pull request #2969 from laszlocsomor/master
Windows: support long paths in open/mkdir/access
2017-07-24 10:26:55 -07:00
Brad Larson
0d9a34c7b2 Add -Werror=missing-declarations to test builds
Treat missing declarations as an error for test builds, to prevent
future updates which add functions without properly declaring them.
This will prevent broken builds in more restrictive build environments.
2017-07-24 11:51:47 -05:00
Axel Huebl
ebe659dced
Travis: Exclude CMake .pc files
Exclude the unconfigured .pc input files of the CMake
based install: they shall not be packed/distributed,
only their outputs are
2017-07-24 18:06:03 +02:00
Axel Huebl
2f3cf52722
CMake: Install .pc Files
Adds pkg-config (`.pc`) files for CMake based installs.
2017-07-24 18:05:58 +02:00
Adam Cozzette
eef2edcb84 Merge pull request #3403 from ax3l/topic-cmake-pkgconfig
CMake: Install .pc Files
2017-07-24 08:11:38 -07:00
Axel Huebl
74dcf447af
Travis: Exclude CMake .pc files
Exclude the unconfigured .pc input files of the CMake
based install: they shall not be packed/distributed,
only their outputs are
2017-07-23 20:48:02 +02:00
Axel Huebl
668712c58f
CMake: Install .pc Files
Adds pkg-config (`.pc`) files for CMake based installs.
2017-07-23 18:28:04 +02:00
Adam Cozzette
e8a32d07ff Merge pull request #3401 from aschrijver/patch-2
Updated outdated hyperlink
2017-07-21 07:55:07 -07:00
Arnold Schrijver
d640cddf19 Updated outdated hyperlink
Github repo had moved, pointing to correct location.
2017-07-21 13:06:04 +02:00
Feng Xiao
062df3d072 Merge pull request #3179 from bjwatson/fix-duration-typo
Fix typos in comment
2017-07-20 13:01:04 -07:00
Adam Cozzette
040f56e61b Merge pull request #3397 from acozzette/initialization
Fixed default instance initialization for C++ lite
2017-07-20 08:31:48 -07:00
Jie Luo
bba4c4ae51 Merge pull request #3262 from snnn/master
Make it compatible with python 3.6.1
2017-07-19 16:25:05 -07:00
Adam Cozzette
417aae6154 Fixed dynamic initialization for C++ lite
An ifdef condition seems to have been inverted by mistake, causing the
dynamic initialization to occur for lite if and only if the
_NO_STATIC_INITIALIZER macro is set. This problem manifested itself as
segfaults due to uninitialized empty strings:
https://github.com/google/protobuf/issues/2839

Since no one complained about initialization not happening, it would
appear that we can just disable this initialization for lite
unconditionally, so that is what this change does. Instead of the
default instance initialization happening pre-main, it now always
happens lazily when needed.
2017-07-19 15:29:28 -07:00
Jisi Liu
dd091aad48 Fix code to use values() instead 2017-07-19 15:00:19 -07:00
Brent Shaffer
aa61bb0d3c compiles removal of newline (#3333) (#3370) 2017-07-19 14:57:34 -07:00
Jisi Liu
1876a27e66 Update filelist again 2017-07-19 14:46:49 -07:00
Jisi Liu
66c1dace00 Add lite and python extra_dist files 2017-07-19 14:38:57 -07:00
Jisi Liu
bf658c28d0 Add java and JS dist files. 2017-07-19 14:32:22 -07:00
Jisi Liu
988376c95b remove broken imports in JS 2017-07-19 14:07:09 -07:00
Jisi Liu
b07cdb6e8e Use itmes() instead of itervalues() to be python3 compatbile. 2017-07-19 13:55:58 -07:00
Jisi Liu
e45214e312 Fix distcheck 2017-07-19 13:07:19 -07:00
Jisi Liu
8084e03c33 remove profile 2017-07-19 12:46:33 -07:00
Jisi Liu
11b6661e66 update build file list 2017-07-19 12:10:43 -07:00