Commit Graph

1382 Commits

Author SHA1 Message Date
Brian Duff
ec2f244554 Fix bug with large extension field numbers.
Previously, extensions with field numbers greater than 268435455 would
result in a compile time error in generated code that looks something
like this:

Foo.java:3178: error: integer number too large: 3346754610
                3346754610);

This is because we were trying to represent the tag number (an
unsigned int) using a java int constant, but java int constants are
signed, and can't exceed Integer.MAX_VALUE.

Fixed by declaring it as a long instead, and casting it down to an
int in the implementation. This is safe, because the tag value always
fits in 32 bis.

Change-Id: If2017bacb4e20af667eaeaf9b65ddc2c30a7709f
2015-04-28 11:42:01 -07:00
Jisi Liu
fe7b5667eb Merge pull request #287 from zhangkun83/protoc-artifacts-fixup
A few fix-ups for protoc-artifacts
2015-04-21 10:50:48 -07:00
Feng Xiao
ba05454041 Merge pull request #290 from xfxyjwf/wkt
Include all well-known type protos.
2015-04-20 13:53:44 -07:00
Feng Xiao
ca9d1a053a Include all well-known type protos.
Change-Id: I122f1cee71a8a739ea603e52582cb0fa9698f0ed
2015-04-20 11:30:31 -07:00
Kun Zhang
90a7ed6fcc A few fix-ups.
1. make google/protobuf/stubs/pbconfig.h before making protoc, otherwise it
won't build a freshly checked-out code.
2. Document the build environments that have been tested to work.
3. Add support for MINGW64
2015-04-16 17:56:12 -07:00
Josh Haberman
4e63b52088 Factored conformance tests so they can run in-process.
This is necessary for testing on iOS.

Change-Id: I54ec1e3aa2e9fbfff9a6cd6580920a6a62069b63
2015-04-15 14:56:05 -07:00
Joshua Haberman
8fe135d212 Merge pull request #284 from cfallin/issue-283
Fix for issue 283: JSON handler cleanup typo causing segfault.
2015-04-13 15:28:44 -07:00
Chris Fallin
14fd96224c Bump gem version to release bugfix. 2015-04-13 14:04:12 -07:00
Chris Fallin
e9abbd23fb Fixed issue #283: crash in JSON handler cleanup.
Includes repro test case from @wfarr.
2015-04-13 14:02:43 -07:00
Joshua Haberman
be89e626a6 Merge pull request #276 from tamird/drop-apputils-dependency
Migrate Python tests to stdlib unittest, drop apputils dependency.
2015-04-11 14:14:29 -07:00
Tamir Duberstein
9f42f5f4a4 [PYTHON] Drop dependency on 'google.apputils'.
Use stdlib's 'unittest' instead.
2015-04-10 19:43:51 -04:00
Tamir Duberstein
dab96f19ee [PYTHON] Remove awkward duplicate tests
We already run all tests with and without `--cpp_implementation`
2015-04-10 19:43:50 -04:00
Tamir Duberstein
d632bc76f1 [PYTHON] README: explain homebrew shenanigans 2015-04-10 15:42:23 -04:00
Tamir Duberstein
a46a2e9422 [PYTHON] Remove unnecessary include_dir 2015-04-10 15:15:53 -04:00
Tamir Duberstein
ef1b747a42 [PYTHON] Clarify API version comment 2015-04-10 09:46:21 -04:00
Joshua Haberman
6003aa1e70 Merge pull request #278 from haberman/python-travis
Added Python to Travis build and clarified setup instructions.
2015-04-09 18:18:27 -07:00
Josh Haberman
2f56bf9819 Export LD_LIBRARY_PATH. 2015-04-09 17:12:00 -07:00
Josh Haberman
0f2e72668d Fix for current directory in Travis tests. 2015-04-09 17:05:38 -07:00
Josh Haberman
2bd813b1b5 Added Python to Travis build and clarified setup instructions. 2015-04-09 16:41:58 -07:00
Jisi Liu
f0b510ac22 Merge pull request #271 from zhangkun83/protoc-artifact-maven
Process to deploy artifacts for multiple platforms into a single release.
2015-04-09 10:36:14 -07:00
Joshua Haberman
8750f72533 Merge pull request #275 from tamird/remove-useless-file
Remove useless file that doesn't load
2015-04-08 16:02:40 -07:00
Tamir Duberstein
8ede2817a0 Remove useless file that doesn't load
This file was broken in ada6556.
2015-04-08 18:33:04 -04:00
Feng Xiao
f8808fb608 Merge gerrit/master and github/master. 2015-04-08 14:03:17 -07:00
Josh Haberman
35a1cc7a7c Added first version of conformance tests.
Change-Id: Ib75664194491643f8e4f1503a2ed942a2d1e1655
2015-04-08 13:14:10 -07:00
Kun Zhang
1c12612bad Strip Mac artifacts 2015-04-08 10:39:21 -07:00
Kun Zhang
62903ec075 Make the osx binary compatible with 10.7 and later 2015-04-08 00:14:36 -07:00
Kun Zhang
5c265faedb Fix osx dependency check. otool prints the file name in the first line. Should skip it 2015-04-07 21:06:37 -07:00
Kun Zhang
6f2bc19bb3 Add cross-compilation for Windows on Linux using MinGW. Check library dependencies of artifact 2015-04-07 20:43:20 -07:00
Kun Zhang
c679236366 List the platforms that we currently support. Document staging.repository. 2015-04-07 17:18:46 -07:00
Kun Zhang
c5a2a7c3db Process to deploy artifacts for multiple platforms into a single
release.

- Do not close the staging repository automatically
- Added staging.repository property
- Updated README with instructions for deployment
- Fix building 32-bit Mac artifact
2015-04-06 17:36:33 -07:00
Feng Xiao
4990875f00 Merge pull request #264 from tamird/getbytes
perf: String#getBytes(Charset) vs getBytes(String)
2015-04-02 15:47:16 -07:00
Tamir Duberstein
654bd3171f Clean up imports 2015-04-02 15:13:15 -07:00
Tamir Duberstein
badef1fc19 Move UTF_8 to Internal 2015-04-02 15:06:32 -07:00
Tamir Duberstein
2820e86aab Skip 3-byte test in CI 2015-04-02 15:06:02 -07:00
Tamir Duberstein
9a2f1f64eb Run java{,nano} tests in CI 2015-04-02 15:06:02 -07:00
Tamir Duberstein
210de285d7 DRY: Use Charset statics to eliminate exceptions 2015-04-02 15:06:00 -07:00
Viktor Szathmáry
e84893f676 perf: String#getBytes(Charset) vs getBytes(String) 2015-04-02 14:48:43 -07:00
Tamir Duberstein
7139d1eff7 Whitespace 2015-04-02 14:48:43 -07:00
Jisi Liu
8d9e51cf4e Merge pull request #269 from zhangkun83/protoc-artifact-maven
Better support for cross-compilation
2015-04-02 14:36:06 -07:00
Kun Zhang
b00a5d7ee0 Document more about cross-compilation; Post-build check for the actual arch of the artifact 2015-04-02 13:14:29 -07:00
Jisi Liu
53df3201a3 Merge pull request #268 from zhangkun83/protoc-artifact-maven
Build scripts to publish precompiled protoc binaries (Maven-based)
2015-04-02 10:53:21 -07:00
Kun Zhang
0556bf4302 Fix typo in README 2015-04-02 10:25:13 -07:00
Kun Zhang
9a8bae72ab Guard cd path with quotes 2015-04-02 10:25:02 -07:00
Kun Zhang
87b85019e6 Make it work on Mac 2015-04-01 18:03:23 -07:00
Kun Zhang
74c4b648cb Make cross-compilation possible 2015-04-01 16:32:21 -07:00
Kun Zhang
c8eda8e9d8 Run make protoc(.exe) instead of just make, because the latter fails on Cygwin with mingw gcc; build-protoc.sh works under Cygwin; build-protoc.sh will use the --host parameter consistent with what os-maven-plugin has detected 2015-04-01 16:23:15 -07:00
Kun Zhang
e499956536 Update README.md 2015-04-01 12:06:24 -07:00
Kun Zhang
18f02bc1cd Move signing and uploading to the release profile 2015-04-01 11:53:03 -07:00
Kun Zhang
ae9177d645 Switch from Gradle to Maven. 2015-03-31 18:26:28 -07:00
Kun Zhang
e2f858574b Make clean before making 2015-03-31 16:59:33 -07:00