Commit Graph

4948 Commits

Author SHA1 Message Date
Bo Yang
ddb9ef9cc3 Change array to map for reserved names in c extension 2017-09-11 15:51:57 -07:00
Bo Yang
89069ded5a Change array to associate array. 2017-09-11 12:30:24 -07:00
Bo Yang
e5d000cbb7 Add prefix to php reserved keywords. 2017-09-08 15:17:36 -07:00
Jan Tattermusch
6a4ffb2f90 Merge pull request #3596 from jtattermusch/csharp_target_net45
Google.Protobuf should target net45 (and not net451)
2017-09-07 16:39:35 +02:00
Jan Tattermusch
50a64759dd Google.Protobuf should target net45 2017-09-05 17:59:03 +02:00
Paul Yang
2807436cd8 change the field number of php_generic_service to fix the conflict with (#3576)
internal descriptor.proto
2017-08-30 16:50:07 -07:00
Jisi Liu
21b2372331 Merge pull request #3565 from pherl/fixdist
Add mising cmake files in dist
2017-08-24 16:41:22 -07:00
Jisi Liu
d8c6193d2c Add mising cmake files in dist 2017-08-24 14:11:37 -07:00
Jisi Liu
92ea0d20ef Merge pull request #3556 from matt-kwong/kokoro_mac_v3
Remove pre-installed softwares
2017-08-23 12:37:47 -07:00
Matt Kwong
78432eab43 Remove pre-installed softwares 2017-08-23 12:35:09 -07:00
Jisi Liu
07de70ea2c Merge pull request #3555 from pherl/fixdist
Make distcheck aware of test proto files.
2017-08-23 12:33:57 -07:00
Jisi Liu
55fdbe58f0 Make distcheck aware of test proto files. 2017-08-23 11:35:48 -07:00
Jisi Liu
30681c7578 Merge pull request #3546 from pherl/deathtest
Disable death tests on windows
2017-08-22 17:45:26 -07:00
Jisi Liu
6609e52124 Disable death tests on windows
Also remove cord related code
2017-08-22 12:59:32 -07:00
Jisi Liu
e416f5d2d3 Merge pull request #3537 from TeBoring/php-bug
Use message name as defined in php runtime.
2017-08-22 11:07:47 -07:00
Jisi Liu
7273b3c691 Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1
Merge pull request #3535 from drivehappy/clang_warn_cleanup
2017-08-22 10:59:50 -07:00
Jisi Liu
09fd1259c8 Merge pull request #3540 from drivehappy/3.4.x_clang_cleanup_2
Merge pull request #3494 from drivehappy/clang_warning_macro
2017-08-22 10:59:39 -07:00
Jisi Liu
c27b56c692 Merge pull request #3494 from drivehappy/clang_warning_macro
Fixing -Wexpansion-to-defined Clang warning
2017-08-21 16:29:27 -07:00
Jisi Liu
36ac06fdc7 Merge pull request #3535 from drivehappy/clang_warn_cleanup
Fixing unused parameter warnings under Clang.
2017-08-21 16:28:17 -07:00
Jisi Liu
92d768c113 Merge pull request #3536 from pherl/io32_11
Remove C++11 features in io_win32.cc
2017-08-21 15:17:42 -07:00
Jisi Liu
77a453a57f Fix compile errors 2017-08-21 14:21:00 -07:00
Bo Yang
dd5190980b Use message name as defined in php runtime. 2017-08-21 13:39:15 -07:00
Jisi Liu
4aadcd3c7b Remove C++11 features in io_win32.cc
- Use scoped_array instead of unique_ptr.
- Do not use string::front() and string::back()
2017-08-21 13:17:24 -07:00
Jisi Liu
26ac3e8e24 Merge pull request #3528 from pherl/rubyfix
Bump gemspec again
2017-08-18 16:20:38 -07:00
Jisi Liu
fdb5cd5e4b Merge pull request #3504 from pherl/3.4.x
Prefer system distributed binaries/libraries.
2017-08-18 16:19:45 -07:00
Jisi Liu
d76e4c7068 Bump gemspec again 2017-08-18 16:18:45 -07:00
Jisi Liu
fa46d11e2e Merge pull request #3514 from pherl/rubyfix
Bump gem version for the next upload
2017-08-17 13:51:05 -07:00
Jisi Liu
29c24abbf1 Merge pull request #3502 from pherl/pypi
Update testpypi URLs
2017-08-17 13:50:50 -07:00
Jisi Liu
19266369f0 Bump gem version for the next upload 2017-08-17 13:10:47 -07:00
Jie Luo
d1484cdec6 Update CHANGES.txt 2017-08-16 14:40:59 -07:00
Jie Luo
55d938c910 Update CHANGES.txt 2017-08-16 14:39:16 -07:00
Jisi Liu
98c6d04df4 Prefer system distributed binaries/libraries.
It seems like the image has a /usr/local/bin/autoconf installed, which
doesn't recognize/work with the yum installed libtools. Putting
distributed binaries/libraries first solves the problem
2017-08-16 13:34:14 -07:00
Bo Yang
e243082fe9 Update php version number to 3.4.0 2017-08-16 13:03:44 -07:00
Bo Yang
82dd4b3793 Update php c extension version number. 2017-08-16 13:00:50 -07:00
Jisi Liu
5d5df84913 clean up 2017-08-16 10:35:00 -07:00
Jisi Liu
19a7e2099b Update testpypi addresses.
The old one is deprecated and no longer working.
2017-08-16 10:30:38 -07:00
Jisi Liu
80a37e0782 Merge pull request #3495 from pherl/c++11
Add std::forward and std::move autoconf check
2017-08-15 16:39:12 -07:00
Jisi Liu
3d2f72bf01 Merge pull request #3496 from pherl/mingw64
Static link pthread for mingw64 protoc and enable cross compile
2017-08-15 14:25:44 -07:00
Jisi Liu
6654c8dd50 Update readme 2017-08-15 13:46:20 -07:00
Jisi Liu
f6196219f7 Merge pull request #3493 from pherl/cmath
Fix cmath/math.h include with non C++11 libstdc++
2017-08-15 13:21:44 -07:00
Jisi Liu
d909834ec6 static link for 32 bit build as well. 2017-08-15 13:15:37 -07:00
Jisi Liu
f7b3dd4329 Update comments that cross compile is feasible now
Need to install mingw-w64 on linux to cross compile
2017-08-15 13:13:10 -07:00
Jisi Liu
fa086c8a85 First try static linking pthread 2017-08-15 12:27:46 -07:00
Jisi Liu
4a4c67b6a2 Add std::forward and std::move autoconf check
Protobuf now uses these two features, which are not available on some
platforms.
2017-08-15 11:44:16 -07:00
Jisi Liu
3908b4e40d Fix cmath/math.h include with non C++11 libstdc++ 2017-08-15 11:14:00 -07:00
Jisi Liu
1cc4ecde1c Merge pull request #3488 from pherl/changelog
Update changelog for 3.4.x
2017-08-14 15:39:44 -07:00
Jisi Liu
3ae8c4c7da Update changelog for 3.4.x 2017-08-14 14:32:48 -07:00
Jisi Liu
eaeca0d42b Merge pull request #3485 from pherl/mingw
Fix build on MinGW32
2017-08-11 16:44:07 -07:00
Jisi Liu
1bd2d1fc75 Merge pull request #3484 from pherl/qualifier
Make compilers without ref-qualifier support happy.
2017-08-11 15:36:12 -07:00
Jisi Liu
651429b709 Fix comments 2017-08-11 14:01:41 -07:00