Commit Graph

4483 Commits

Author SHA1 Message Date
Bo Yang
3a055be925 Prepare jenkins for testing php zts build. 2016-10-04 17:23:21 +00:00
Adam Cozzette
640c947458 Merge pull request #2204 from acozzette/enum-names
Do strict enum name checking only for proto3
2016-10-04 09:58:54 -07:00
Adam Cozzette
149659b72a Do strict enum name checking only for proto3
There seem to already be .proto files out there that have conflicting
enum names, which will not be able to build successfully for some
languages (like C#). To prevent this problem from spreading, let's make
it an error for proto3 but just issue a warning for proto2. This fixes
issue #2179.
2016-10-04 07:19:54 -07:00
Bo Yang
858db7a202 Add travis test on Mac for php. 2016-10-03 23:07:21 +00:00
Thomas Van Lenten
4d87527807 Merge pull request #2218 from thomasvl/xcode8_updates
Update the ObjC projects for Xcode 8
2016-10-03 17:11:23 -04:00
Bo Yang
bcb32c0b86 Test php5.5_c test on jenkins 2016-10-03 20:48:39 +00:00
Thomas Van Lenten
297449aaf4 Update the ObjC projects for Xcode 8
- Let Xcode 8 update settings on the projects/schemes.
- Migrate Swift tests to Swift 3 syntax.
- Update the build/test script:
  - Require Xcode 8 (because of the Swift 3 requirement for tests)
  - Update the devices to what Xcode 8 has (8.x simulator seem to fail even
    though they can be downloaded in Xcode 8)
- Update the travis images to ones with Xcode 8.
2016-10-03 13:24:24 -04:00
Wojciech Mandrysz
fe1d0a1f5a JS: Added string encoding/decoding tests for UTF-8 2016-10-03 01:44:15 +02:00
Wojciech Mandrysz
23f108d471 JS: Fixed UTF-8 string encoder/decoder for high codepoints. 2016-10-03 01:44:15 +02:00
Adam Cozzette
350d49449b Merge pull request #2206 from acozzette/gitignore
Updated .gitignore with Java and JavaScript build artifacts
2016-09-30 10:47:20 -07:00
Bo Yang
dae50dc56a Trigger automated tests for php. 2016-09-30 01:20:41 +00:00
Bo Yang
f17528a1fa Set up environment for php automated tests. 2016-09-30 01:10:34 +00:00
Bo Yang
1baaedfb3d Add php test script for automated tests. 2016-09-30 01:08:33 +00:00
Adam Cozzette
25dbc8b1ea Updated .gitignore with Java and JavaScript build artifacts 2016-09-29 16:20:43 -07:00
Jason Lunn
6005648c2c Add development dependency requirements
Uses values from the removed `Gemfile.lock` as a baseline for version requirements, though it has been observed to work with the latest versions of all the referenced gems - see https://travis-ci.org/google/protobuf/builds/163625616 for details
2016-09-29 17:31:11 -04:00
Derek Murray
1d2c7b6c73 Fix MSVC build when HAVE_LONG_LONG is defined. 2016-09-29 12:52:54 -07:00
Jason Lunn
ee19a7c346 Remove hanging reference to Gemfile.lock 2016-09-29 02:33:17 -04:00
Jason Lunn
d94ff4142a Delete Gemfile.lock
Avoid [failures in travis](https://travis-ci.org/google/protobuf/jobs/163611664) under jruby
2016-09-29 02:18:32 -04:00
Jason Lunn
07f3cab3dd Set platform to "java" under JRuby
Proposed fix for #1594
2016-09-29 00:18:55 -04:00
Bo Yang
b9bad65bf3 Add script to build Google.Protobuf.Tools for csharp. 2016-09-28 13:51:57 -07:00
Joshua Haberman
3b88a4ae87 Merge pull request #2196 from haberman/nodefix
Added alias getFieldProto3 as used by older generated code.
2016-09-28 12:39:23 -07:00
Thomas Van Lenten
3d598eecee Merge pull request #2197 from thomasvl/swift_docs
Drop the swift docs directory (and content).
2016-09-28 15:34:16 -04:00
Thomas Van Lenten
fb85b4316b Drop the swift docs directory (and content).
Since the official home is looking like it will be in another repo, it makes
more sense for the relevant docs to live there instead.
2016-09-28 15:32:51 -04:00
Josh Haberman
8b54280395 Added alias getFieldProto3 as used by older generated code.
Un-breaks users who have old generated code and upgrade
to the 3.1.0 release.
2016-09-28 11:11:52 -07:00
Adam Cozzette
c4d70123ac Fixed references to foreign nested messages with CommonJS-style imports
A bug was causing generated JSPB code with CommonJS-style imports to
refer incorrectly to nested messages from other .proto files. The
generated code would have things like "test_pb.InnerMessage" instead of
"test_pb.OuterMessage.InnerMessage". This commit fixes the problem by
correctly taking into account any message nesting.
2016-09-27 17:25:00 -07:00
Jisi Liu
3f59452448 Merge pull request #2192 from google/3.0.x
Merge 3.0.x into master.
2016-09-27 14:19:30 -07:00
Bo Yang
787f3fb163 Fixing inconsistent php version number. 2016-09-26 12:48:28 -07:00
Feng Xiao
c531b49d38 Merge pull request #2181 from google/jtattermusch-patch-2
Update README.md
2016-09-26 10:13:08 -07:00
Jan Tattermusch
530eede12b Update README.md 2016-09-26 10:38:00 +02:00
Feng Xiao
4d3e4cfa4a Fix MSVC stack overflow issue. 2016-09-23 23:53:43 -07:00
Bo Yang
a428e42072 Add php files for make dist. 2016-09-23 19:12:45 -07:00
Paul Yang
e7269aa4f6 Update change log for 3.1.0 (#2173) 2016-09-23 18:33:25 -07:00
Feng Xiao
87d61e44fa Merge pull request #2175 from xfxyjwf/fix_json
Fix VS test failures.
2016-09-23 17:57:41 -07:00
Feng Xiao
5248f61a34 Force a rebuild of Jenkins docker image.
Needed to pick up a Java dependency change and re-populate the offline
repo.

[skip ci]
2016-09-23 17:35:23 -07:00
Stanley Cheung
907a075d7e php: support 5.5.9 for pecl extension (#2174) 2016-09-23 17:05:45 -07:00
Feng Xiao
3c88e1b53d Fix VS test failures. 2016-09-23 16:53:01 -07:00
Feng Xiao
c454b44335 Merge pull request #2171 from xfxyjwf/fix_json
Reduce test length to avoid stack overflow on VS.
2016-09-23 16:50:42 -07:00
Feng Xiao
73c8723266 Use "appveyor DownloadFile"
"ps: StartFileDownload" is broken by a recent appveyor image update:
http://help.appveyor.com/discussions/problems/5308-ci-frequently-hangs-with-recent-image-update

Change-Id: Ia73aa8b12f77eb9bbec556a4c05310153aad97bf
2016-09-23 16:04:38 -07:00
Bo Yang
18f336b98a Update php supported version. 2016-09-23 22:22:18 +00:00
Feng Xiao
f6b4d188b4 Reduce test length to avoid stack overflow on VS. 2016-09-23 21:45:03 +00:00
Bo Yang
411968d01f Fix python cpp. 2016-09-23 21:38:35 +00:00
Feng Xiao
37c3d05f57 Merge pull request #2167 from xfxyjwf/fix_vs
Fix Visual Studio compile issues.
2016-09-23 12:11:04 -07:00
Feng Xiao
0798d91f55 Fix Visual Studio compile issues.
Change-Id: I6a5078b6bcdf4637e11c1cb9da1f74298e6fc26e
2016-09-23 11:55:26 -07:00
Jisi Liu
3bfc09d548 Merge pull request #2170 from pherl/3.1.x
Fix default instance destructor and memory leaks
2016-09-23 11:29:21 -07:00
Jisi Liu
f184cb6035 Fix default instance destructor 2016-09-23 11:17:00 -07:00
Jisi Liu
34996c31b7 Merge branch '3.1.x' of github.com:google/protobuf into 3.1.x 2016-09-23 11:14:37 -07:00
Joshua Haberman
a289d43608 Added C++ benchmark. (#1525) 2016-09-23 11:07:45 -07:00
Feng Xiao
d9ff3ef859 Merge pull request #2153 from haberman/generatechangelog
Added convenient script for generating changelog draft.
2016-09-23 10:49:13 -07:00
Bo Yang
8c88762e3e Update version number. 2016-09-22 19:24:19 -07:00
Bo Yang
94bbeb4681 Bump library version to 11 2016-09-22 18:10:00 -07:00