Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 3.0.0-GA into master #1893

Merged
merged 28 commits into from
Jul 29, 2016
Merged

Merge 3.0.0-GA into master #1893

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
fb7a7c5
Bump version number for GA
liujisi Jul 25, 2016
a17367f
Define intX as standard exact-width integer types.
xfxyjwf Jul 25, 2016
5a6c921
Make jruby still depend on beta-4
liujisi Jul 25, 2016
0973822
remove extra zeros.
liujisi Jul 25, 2016
b3b07cd
Merge branch 'master' into 3.0.0-GA
haberman Jul 26, 2016
f11a4f1
Merge pull request #1841 from pherl/3.0.0-GA
liujisi Jul 26, 2016
43b36dd
Fixed Makefile.am for Ruby file rename.
haberman Jul 26, 2016
234ec01
Merge pull request #1847 from haberman/GAfixes
haberman Jul 26, 2016
12581b4
Fixes traivs cpp build.
xfxyjwf Jul 26, 2016
b6b521b
Merge pull request #1851 from xfxyjwf/cint
xfxyjwf Jul 26, 2016
032fb91
Merge branch 'master' of github.com:google/protobuf into 3.0.0-GA
liujisi Jul 26, 2016
b1aac0b
Make protoc-artifacts able to build plugin.
liujisi Jul 26, 2016
54feb9a
Fix the script comments.
liujisi Jul 26, 2016
0750797
Merge remote-tracking branch 'origin/3.0.0-GA' into 3.0.0-GA
liujisi Jul 26, 2016
7c9c314
fix comments.
liujisi Jul 26, 2016
7ba044a
Merge pull request #1853 from pherl/3.0.0-GA
liujisi Jul 26, 2016
e0d817e
Change log for 3.0 GA release.
liujisi Jul 27, 2016
e8ae137
Merge pull request #1864 from pherl/galogs
liujisi Jul 27, 2016
1b1a8f4
Fix build protoc script for windows
liujisi Jul 28, 2016
2662fd3
Merge pull request #1871 from pherl/fixwin
liujisi Jul 28, 2016
e3fac65
Change the build.zip.sh to support lite
liujisi Jul 28, 2016
de30c56
Merge pull request #1874 from pherl/buildzip
liujisi Jul 28, 2016
6a59ac9
Fix the build-zip.sh to add .exe for win packages.
liujisi Jul 29, 2016
7e93458
Merge pull request #1888 from pherl/fixbuildzip
liujisi Jul 29, 2016
811674f
add setup.cfg for building wheels
liujisi Jul 29, 2016
f3449e5
Merge pull request #1891 from pherl/python
liujisi Jul 29, 2016
baa4023
Run Java compatibility tests on Travis.
xfxyjwf Jul 29, 2016
c479042
Merge pull request #1892 from xfxyjwf/compatibility_tests
liujisi Jul 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix the script comments.
  • Loading branch information
@liujisi
liujisi committed Jul 26, 2016
commit 54feb9ac24b472333f44908939819d675b8e453d
4 changes: 2 additions & 2 deletions protoc-artifacts/build-protoc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# Builds protoc executable into target/protoc.exe; optionally build protoc
# plugins into target/protoc-gen-*.exe
# To be run from Maven.
# Usage: build-protoc.sh <OS> <ARCH> [target]
# Usage: build-protoc.sh <OS> <ARCH> <TARGET>
# <OS> and <ARCH> are ${os.detected.name} and ${os.detected.arch} from os-maven-plugin
# target can be "protoc" (by default) or protoc-gen-javalite
# <TARGET> can be "protoc" or protoc-gen-javalite
OS=$1
ARCH=$2
MAKE_TARGET=$3
Expand Down