Commit Graph

65 Commits

Author SHA1 Message Date
Paul Yang
50aa4febaf Merge pull request #3375 from TeBoring/3.3.x
Merge 3.3.x into master
2017-07-19 06:58:05 -07:00
Bo Yang
6ec0b7e4d1 Merge 3.3.x into master 2017-07-18 11:06:16 -07:00
Daniel Taylor
4b5b1e6e3e Add note about includes to README
Ran into an issue today where a machine had the `protoc` compiler but not the include files. Took a while to sort out, and this added note to the README included in every zip should help.
2017-07-18 12:05:00 -04:00
Bo Yang
e7bcfc4241 Update version number to 3.3.2 2017-06-21 10:20:34 -07:00
Łukasz Strzałkowski
82e50ba5c3 Workaround the docker bug when compiling artifacts
This is a workaround (https://github.com/moby/moby/issues/10180#issuecomment-190429512) the docker issue (https://github.com/moby/moby/issues/10180) which breaks protoc-artifacts build process with following error

```Rpmdb checksum is invalid: dCDPT(pkg checksums): devtoolset-1.1-elfutils.x86_64 0:0.154-6.el6 - u

The command '/bin/sh -c yum clean all && yum install -y devtoolset-1.1                    devtoolset-1.1-libstdc++-devel                    devtoolset-1.1-libstdc++-devel.i686' returned a non-zero code: 1```

https://github.com/moby/moby/issues/10180#issuecomment-190429512
2017-05-11 14:04:34 -07:00
Feng Xiao
58538ea919 Update version number to 3.3.1 2017-05-08 16:02:08 -07:00
Feng Xiao
80f0c0ac40 Update version number and changelog for 3.3.0 2017-04-05 17:32:17 -07:00
Sebastian Schuberth
902af0816e Prefer the term "3-Clause BSD License" over "New BSD License"
The first is the newer name, which is also more telling.
2017-02-28 09:58:24 +01:00
Sebastian Schuberth
6395a1cbd9 Fix links to the New BSD License in meta-data
The "New BSD License" is the "3-Clause BSD License", but the links were
pointing to the "2-Clause BSD License".
2017-02-28 09:54:21 +01:00
Paul Yang
7f3e237071 Merge 3.2.x branch into master (#2648)
* Down-integrate internal changes to github.

* Update conformance test failure list.

* Explicitly import used class in nano test to avoid random test fail.

* Update _GNUC_VER to use the correct implementation of atomic operation
on Mac.

* maps_test.js: check whether Symbol is defined before using it (#2524)

Symbol is not yet available on older versions of Node.js and so this
test fails with them. This change just directly checks whether Symbol is
available before we try to use it.

* Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up

* Updated Makefile.am to fix out-of-tree builds

* Added Bazel genrule for generating well_known_types_embed.cc

In pull request #2517 I made this change for the CMake and autotools
builds but forgot to do it for the Bazel build.

* Update _GNUC_VER to use the correct implementation of atomic operation on Mac.

* Add new js file in extra dist.

* Bump version number to 3.2.0

* Fixed issue with autoloading - Invalid paths (#2538)

* PHP fix int64 decoding (#2516)

* fix int64 decoding

* fix int64 decoding + tests

* Fix int64 decoding on 32-bit machines.

* Fix warning in compiler/js/embed.cc

embed.cc: In function ‘std::string CEscape(const string&)’:
embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   for (int i = 0; i < str.size(); ++i) {
                                ^

* Fix include in auto-generated well_known_types_embed.cc

Restore include style fix (e3da722) that has been trampled by
auto-generation of well_known_types_embed.cc

* Fixed cross compilations with the Autotools build

Pull request #2517 caused cross compilations to start failing, because
the js_embed binary was being built to run on the target platform
instead of on the build machine. This change updates the Autotools build
to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for
the build machine and always use that when building js_embed.

* Minor fix for autocreated object repeated fields and maps.

- If setting/clearing a repeated field/map that was objects, check the class
  before checking the autocreator.
- Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated
  classes to ensure there is less chance of issues if someone does something
  really crazy threading wise.
- Some more tests for the internal AutocreatedArray/AutocreatedDictionary
  classes to ensure things are working as expected.
- Add Xcode 8.2 to the full_mac_build.sh supported list.

* Fix generation of extending nested messages in JavaScript (#2439)

* Fix generation of extending nested messages in JavaScript

* Added missing test8.proto to build

* Fix generated code when there is no namespace but there is enum definition.

* Decoding unknown field should succeed.

* Add embed.cc in src/Makefile.am to fix dist check.

* Fixed "make distcheck" for the Autotools build

To make the test pass I needed to fix out-of-tree builds and update
EXTRA_DIST and CLEANFILES.

* Remove redundent embed.cc from src/Makefile.am

* Update version number to 3.2.0-rc.1 (#2578)

* Change protoc-artifacts version to 3.2.0-rc.1

* Update version number to 3.2.0rc2

* Update change logs for 3.2.0 release.

* Update php README

* Update upb, fixes some bugs (including a hash table problem). (#2611)

* Update upb, fixes some bugs (including a hash table problem).

* Ruby: added a test for the previous hash table corruption.

Verified that this triggers the bug in the currently released
version.

* Ruby: bugfix for SEGV.

* Ruby: removed old code for dup'ing defs.

* Reverting deployment target to 7.0 (#2618)

The Protobuf library doesn’t require the 7.1 deployment target so
reverting it back to 7.0

* Fix typo that breaks builds on big-endian (#2632)

* Bump version number to 3.2.0
2017-01-31 09:17:32 -08:00
Feng Xiao
f933d10fbe Update version number.
[skip ci]

Change-Id: I1ba6f6372a08b5796570851336e1a548602f60da
2016-10-10 11:44:21 -07:00
Bo Yang
15f4db6cb1 Bump version number to 3.1.0-alpha-1. 2016-10-10 11:24:31 -07:00
Jisi Liu
6e11540b32 Bump version number to 3.0.2 2016-09-02 11:57:49 -07:00
Jisi Liu
6a59ac94e1 Fix the build-zip.sh to add .exe for win packages. 2016-07-29 11:44:05 -07:00
Jisi Liu
de30c56391 Merge pull request #1874 from pherl/buildzip
Change the build.zip.sh to support lite
2016-07-28 14:48:46 -07:00
Jisi Liu
e3fac65add Change the build.zip.sh to support lite 2016-07-28 14:24:05 -07:00
Jisi Liu
1b1a8f4017 Fix build protoc script for windows 2016-07-28 19:07:54 +00:00
Jisi Liu
7c9c314ca7 fix comments. 2016-07-26 16:51:30 -07:00
Jisi Liu
54feb9ac24 Fix the script comments. 2016-07-26 16:35:28 -07:00
Jisi Liu
b1aac0b4ed Make protoc-artifacts able to build plugin. 2016-07-26 16:34:30 -07:00
Jisi Liu
032fb914e2 Merge branch 'master' of github.com:google/protobuf into 3.0.0-GA 2016-07-26 12:29:03 -07:00
Feng Xiao
b553b87b26 Add a script to build protoc zip packages.
[ci skip]

Change-Id: Ia0e0bf3bb6bd24633dc8f294318bb20ac837f8b9
2016-07-25 15:01:38 -07:00
Jisi Liu
fb7a7c5f1f Bump version number for GA 2016-07-25 12:07:56 -07:00
Feng Xiao
9e3c98f17b Fix maven path.
Change-Id: I252d7a644a9e4064a9f1a816a2be3f25f37b4c43
2016-07-23 19:43:03 -07:00
Feng Xiao
fdd970e4ed Fix maven links.
[ci skip]

Change-Id: Ibefbdf441d932c5751235c635244450d7cbacc53
2016-07-22 16:24:52 -07:00
Feng Xiao
932f94e16e Update version number to 3.0.0-beta-4 2016-07-13 16:08:47 -07:00
Jisi Liu
cbb9183e89 Merge pull request #1559 from google/beta-3
Merge beta-3 release branch again.
2016-05-18 11:44:56 -07:00
Jisi Liu
fe06eb62c6 Fix protoc artifact pom version 2016-05-17 17:01:10 -07:00
Jisi Liu
ce7e502e4b Remove the instructions for pbconfig.h 2016-05-12 17:55:29 -07:00
Kun Zhang
04757db7a8 Fix the server id in example 2016-05-12 16:39:49 -07:00
Kun Zhang
28cb77f39e Fine-tune build scripts and better documentation.
"make google/protobuf/stubs/pbconfig.h" was added in hope of addressing
the issue that when you "make protoc" from a freshly checked out
project, pbconfig.h will be reported missing. However, the trick doesn't
seem to work. Instead, add instructions in the document to work the issue
around.

Also document why MSYS2 cannot be used for publishing protoc.
2016-05-11 16:18:26 -07:00
Jisi Liu
25dd69002f Fix protoc build artifact script.
pbconfig.h has gone. This commit removes the target.
2016-05-10 15:48:54 -07:00
Dongjoon Hyun
7b08d49e9d Fix typos in README.md/CHANGES.txt 2016-01-11 14:52:01 -08:00
Feng Xiao
aa7e17a6f6 Update version numbers.
Version number for beta languages is updated to v3.0.0-beta-2.
Version number for alpha languages is updated to v3.0.0-alpha-5.
2015-12-21 11:31:51 -08:00
Feng Xiao
ffe9215140 Update version number.
Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other
languages are updated to v3.0.0-alpha-4.
2015-08-26 15:11:43 -07:00
Bo Yang
e107e2d68e Update version number to 3.0.0-alpha-4 2015-05-29 11:00:57 -07:00
teboring
9839c0c2c9 Update version number to 3.0.0-alpha-3 2015-05-23 09:20:23 -07:00
Kun Zhang
2aaf5c603a Dockerfile for building protoc on Centos 6.6 2015-05-12 15:07:36 -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
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
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
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