Commit Graph

3198 Commits

Author SHA1 Message Date
Josh Haberman
24c5424be5 Added a bit more to README.md, and allowed custom PROTOC var in tests. 2016-02-19 11:46:03 -08:00
Josh Haberman
907ad4a004 Properly camelCase when translating to CommonJS. 2016-02-18 10:46:44 -08:00
Josh Haberman
29d58d3392 Removed unused directives from tests that aren't run under CommonJS. 2016-02-18 10:40:07 -08:00
Josh Haberman
c348af2fc0 Addressed more code review comments. 2016-02-18 10:30:21 -08:00
Josh Haberman
7726cd207c Integrate review comments. 2016-02-18 10:30:21 -08:00
Josh Haberman
5195b7f296 Greatly expanded README.md. 2016-02-18 10:30:21 -08:00
Josh Haberman
59ea5000bb Use "node" as binary instead of "nodejs".
"nodejs" does not exist on Travis, it appears.
2016-02-18 10:30:21 -08:00
Josh Haberman
35298f9779 Fixed definition of extensions, and added CommonJS tests to Travis. 2016-02-18 10:30:21 -08:00
Josh Haberman
77af5d04b1 Fixed nested message scopes for CommonJS. 2016-02-18 10:30:21 -08:00
Josh Haberman
d6a186a8f1 Added some documentation in comments. 2016-02-18 10:30:21 -08:00
Josh Haberman
9e60036c1b Moved CommonJS-specific files to commonjs/. 2016-02-18 10:30:21 -08:00
Josh Haberman
e9f31ee3d7 CommonJS tests are now passing. 2016-02-18 10:30:21 -08:00
Josh Haberman
55cc3aa987 WIP. 2016-02-18 10:30:21 -08:00
Joshua Haberman
c40f8c1f54 Merge pull request #1229 from keveman/unlimited_binary_proto
Added ALLOW_UNLIMITED_BINARY_PROTO macro and setting it when
2016-02-17 16:09:35 -08:00
Jan Tattermusch
61e8e2186f Merge pull request #1241 from jskeet/more-merge-wrapper-tests
Add more tests around merging wrappers
2016-02-17 16:07:50 -08:00
Joshua Haberman
d41db75dcb Merge pull request #260 from ejsd1989/issue-#242
Removes redundant null pointer checks checks
2016-02-16 16:47:46 -08:00
Joshua Haberman
8fc045d8d2 Merge pull request #1224 from google/rubysentinel
Removed 'optional' from proto3 syntax file.
2016-02-16 15:43:21 -08:00
Manjunath Kudlur
99a3e30bd7 Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it when
--allow_oversize_protos=true is passed to bazel build.
When this macro is set, SetTotalBytesLimit is called to remove
the 64MB limit on binary protos when during ParseFromString.
2016-02-16 15:17:10 -08:00
Thomas Van Lenten
7cf5b817cb Merge pull request #1247 from thomasvl/xctool_plain_output
Move the xctool use of -reporter into a common spot and always use "plain" to get more readable logs on travis.
2016-02-16 16:03:17 -05:00
Thomas Van Lenten
efca368939 Move the xctool use of -reporter into a common spot and always use "plain" to get more readable logs on travis. 2016-02-16 15:10:14 -05:00
Thomas Van Lenten
ee819ea724 Merge pull request #1245 from thomasvl/tweak_xctool_ios_run
Tweak the xctool run for iOS tests to try and sort out flake
2016-02-16 14:27:57 -05:00
Thomas Van Lenten
30e645b6b6 Tweak the xctool run for iOS tests to try and sort out flake
- Use the plain reporter for slightly more readable logs.
- Add -newSimulatorInstance to the run-tests to see if it helps with flake.
2016-02-16 11:16:42 -05:00
Thomas Van Lenten
7d1cc109cf Merge pull request #1244 from thomasvl/bump_xcode_version
Bump up travis to Xcode 7.2
2016-02-16 11:14:47 -05:00
Thomas Van Lenten
1324119a42 Bump up travis to Xcode 7.2
- Update simulator versions used.
- Mark the iOS tests as flaky while trying to dig out the root cause.
2016-02-16 09:19:50 -05:00
Jon Skeet
0262e04dbb Add more tests around merging wrappers
This was in an attempt to fix the wrapper handling corner case, but it's really fiddly.
2016-02-15 14:17:02 +00:00
Paul Yang
e35e24800f Merge pull request #1226 from jcanizales/patch-1
Include 'source' attribute in the podspec
2016-02-12 15:00:38 -08:00
Joshua Haberman
3ee2e20539 Merge pull request #1144 from dongjoon-hyun/remove_redundant_the
Remove redundant `the`.
2016-02-11 17:17:48 -08:00
Dongjoon Hyun
86325d7c95 Rewrap the line 2016-02-11 12:47:52 -08:00
Joshua Haberman
caf1fb7197 Merge pull request #997 from anderscarling/better_errors
ruby: Better exception text for common cases
2016-02-11 12:41:34 -08:00
Joshua Haberman
e088c2cf4b Merge pull request #1178 from lebauce/fix-readme-typos
Fix typos in README.md
2016-02-11 12:35:40 -08:00
Joshua Haberman
635ce854ed Merge pull request #1179 from ParthKolekar/python-examples-with
Updated python examples to use with.
2016-02-11 12:32:42 -08:00
Joshua Haberman
d2c7fe6bc5 Merge pull request #1194 from Photonios/master
Fixed unused parameters and extra ';'
2016-02-11 11:36:34 -08:00
Joshua Haberman
655a9d667f Merge pull request #1217 from jhump/jh/make-warning-useful
make 'no syntax' warning useful by showing which file
2016-02-11 10:43:47 -08:00
Jan Tattermusch
2d3f79f7d6 Merge pull request #1218 from jskeet/nuspec-dependencies
nuspec dependency fixes
2016-02-11 10:38:35 -08:00
Jorge Canizales
f492dd8aa4 Include 'source' attribute in the podspec
The new version of Cocoapods requires it even when using the podspec locally.
2016-02-10 19:19:17 -08:00
Joshua Haberman
028d59fccd Merge pull request #1225 from google/nmakedoc
Clarified that 'nmake' must be run before 'nmake check'.
2016-02-10 14:45:22 -08:00
Josh Haberman
fe96a215d9 Clarified that 'nmake' must be run before 'nmake check'. 2016-02-10 14:44:29 -08:00
Josh Haberman
69ac430c02 Removed 'optional' from proto3 syntax file. 2016-02-10 14:16:49 -08:00
Joshua Haberman
a924e0b858 Merge pull request #1185 from kkm000/icl-fix
Fix Intel compiler warnings in include files on Windows
2016-02-10 14:12:29 -08:00
Jan Tattermusch
18fba0f138 Merge pull request #1220 from jtattermusch/add_strong_name_key
Check in strong name key.
2016-02-10 10:06:26 -08:00
Jan Tattermusch
95c4100230 Add a link 2016-02-10 08:16:45 -08:00
Jan Tattermusch
d40e3a1623 Use checked-in key to build ReleaseSigned 2016-02-09 15:59:05 -08:00
Jan Tattermusch
82f210cbac add private key for strong name assemblies 2016-02-09 15:53:16 -08:00
Joshua Haberman
bc215089ca Merge pull request #1214 from haberman/binarygem
Added support for binary gems.
2016-02-08 15:29:11 -08:00
Jon Skeet
f1c5754f0f nuspec dependency fixes
Explicitly don't add any dependencies for "old" platforms, to avoid unnecessary
dependencies in those cases.

Fixes issue #1203.
2016-02-08 11:25:07 +00:00
Joshua Humphries
d740bc9bd1 make 'no syntax' warning useful by showing which file 2016-02-06 08:34:08 -05:00
Joshua Haberman
6efe3aaf3d Merge pull request #1 from nicolasnoble/bin-gems
Few fixes.
2016-02-05 17:10:04 -08:00
Nicolas "Pixel" Noble
bbb188acdd Actually enabling cross compilation. 2016-02-06 00:55:45 +01:00
Nicolas "Pixel" Noble
4e141bb3b8 Removing usage of git - not everyone grabs the gem using it. 2016-02-06 00:55:28 +01:00
Joshua Haberman
0906f5d18a Merge pull request #1205 from haberman/fixjstests
Enable JavaScript tests for binary parse/serialize.
2016-02-05 14:56:14 -08:00