Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

Commit

Permalink
Merge pull request #20 from tamird/3.1
Browse files Browse the repository at this point in the history 
Update to v3.1.0
  • Loading branch information
@tamird
tamird committed Nov 3, 2016
2 parents 951f3e6 + adf4bfe commit 070b646
Show file tree
Hide file tree
Showing 253 changed files with 13,581 additions and 6,527 deletions.
1 change: 1 addition & 0 deletions cmd/protoc/php_generator.cc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../internal/src/google/protobuf/compiler/php/php_generator.cc
6 changes: 3 additions & 3 deletions config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
#define PACKAGE_NAME "Protocol Buffers"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "Protocol Buffers 3.0.0"
#define PACKAGE_STRING "Protocol Buffers 3.1.0"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "protobuf"
Expand All @@ -105,7 +105,7 @@
#define PACKAGE_URL ""

/* Define to the version of this package. */
#define PACKAGE_VERSION "3.0.0"
#define PACKAGE_VERSION "3.1.0"

/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
Expand Down Expand Up @@ -137,7 +137,7 @@


/* Version number of package */
#define VERSION "3.0.0"
#define VERSION "3.1.0"

/* Define to 1 if on MINIX. */
/* #undef _MINIX */
Expand Down
2 changes: 1 addition & 1 deletion import.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -eu
rm -rf internal/*
find . -type l -not -path './.git/*' | xargs rm

curl -sL https://github.com/google/protobuf/releases/download/v3.0.0/protobuf-cpp-3.0.0.tar.gz | tar vzxf - -C internal/ --strip-components=1
curl -sL https://github.com/google/protobuf/releases/download/v3.1.0/protobuf-cpp-3.1.0.tar.gz | tar vzxf - -C internal/ --strip-components=1

cd internal
./configure
Expand Down
100 changes: 100 additions & 0 deletions internal/CHANGES.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,103 @@
2016-09-23 version 3.1.0 (C++/Java/Python/PHP/Ruby/Objective-C/C#/JavaScript/Lite)
General
* Proto3 support in PHP (alpha).
* Various bug fixes.

C++
* Added MessageLite::ByteSizeLong() that’s equivalent to
MessageLite::ByteSize() but returns the value in size_t. Useful to check
whether a message is over the 2G size limit that protobuf can support.
* Moved default_instances to global variables. This allows default_instance
addresses to be known at compile time.
* Adding missing generic gcc 64-bit atomicops.
* Restore New*Callback into google::protobuf namespace since these are used
by the service stubs code
* JSON support.
* Fixed some conformance issues.
* Fixed a JSON serialization bug for bytes fields.

Java
* Fixed a bug in TextFormat that doesn’t accept empty repeated fields (i.e.,
“field: [ ]”).
* JSON support
* Fixed JsonFormat to do correct snake_case-to-camelCase conversion for
non-style-conforming field names.
* Fixed JsonFormat to parse empty Any message correctly.
* Added an option to JsonFormat.Parser to ignore unknown fields.
* Experimental API
* Added UnsafeByteOperations.unsafeWrap(byte[]) to wrap a byte array into
ByteString without copy.

Python
* JSON support
* Fixed some conformance issues.

PHP (Alpha)
* We have added the proto3 support for PHP via both a pure PHP package and a
native c extension. The pure PHP package is intended to provide usability
to wider range of PHP platforms, while the c extension is intended to
provide higher performance. Both implementations provide the same runtime
APIs and share the same generated code. Users don’t need to re-generate
code for the same proto definition when they want to switch the
implementation later. The pure PHP package is included in the php/src
directory, and the c extension is included in the php/ext directory.

Both implementations provide idiomatic PHP APIs:
* All messages and enums are defined as PHP classes.
* All message fields can only be accessed via getter/setter.
* Both repeated field elements and map elements are stored in containers
that act like a normal PHP array.

Unlike several existing third-party PHP implementations for protobuf, our
implementations are built on a "strongly-typed" philosophy: message fields
and array/map containers will throw exceptions eagerly when values of the
incorrect type (not including those that can be type converted, e.g.,
double <-> integer <-> numeric string) are inserted.

Currently, pure PHP runtime supports php5.5, 5.6 and 7 on linux. C
extension runtime supports php5.5 and 5.6 on linux.

See php/README.md for more details about installment. See
https://developers.google.com/protocol-buffers/docs/phptutorial for more
details about APIs.

Objective-C
* Helpers are now provided for working the the Any well known type (see
GPBWellKnownTypes.h for the api additions).
* Some improvements in startup code (especially when extensions aren’t used).

Javascript
* Fixed missing import of jspb.Map
* Fixed valueWriterFn variable name

Ruby
* Fixed hash computation for JRuby's RubyMessage
* Make sure map parsing frames are GC-rooted.
* Added API support for well-known types.

C#
* Removed check on dependency in the C# reflection API.

2016-09-06 version 3.0.2 (C++/Java/Python/Ruby/Objective-C/C#/JavaScript/Lite)
General
* Various bug fixes.

Objective C
* Fix for oneofs in proto3 syntax files where fields were set to the zero
value.
* Fix for embedded null character in strings.
* CocoaDocs support

Ruby
* Fixed memory corruption bug in parsing that could occur under GC pressure.

Javascript
* jspb.Map is now properly exported to CommonJS modules.

C#
* Removed legacy_enum_values flag.


2016-07-27 version 3.0.0 (C++/Java/Python/Ruby/Objective-C/C#/JavaScript/Lite)
General
* This log only contains changes since the beta-4 release. Summarized change
Expand Down
94 changes: 80 additions & 14 deletions internal/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = x86_64-apple-darwin15.6.0
host_triplet = x86_64-apple-darwin15.6.0
target_triplet = x86_64-apple-darwin15.6.0
build_triplet = x86_64-apple-darwin16.1.0
host_triplet = x86_64-apple-darwin16.1.0
target_triplet = x86_64-apple-darwin16.1.0
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
Expand Down Expand Up @@ -280,17 +280,17 @@ NMEDIT = nmedit
OBJC = gcc
OBJCDEPMODE = depmode=gcc3
OBJCFLAGS = -g -O2
OBJDUMP = false
OBJDUMP = objdump
OBJEXT = o
OTOOL = otool
OTOOL64 = :
PACKAGE = protobuf
PACKAGE_BUGREPORT = protobuf@googlegroups.com
PACKAGE_NAME = Protocol Buffers
PACKAGE_STRING = Protocol Buffers 3.0.0
PACKAGE_STRING = Protocol Buffers 3.1.0
PACKAGE_TARNAME = protobuf
PACKAGE_URL =
PACKAGE_VERSION = 3.0.0
PACKAGE_VERSION = 3.1.0
PATH_SEPARATOR = :
POW_LIB =
PROTOBUF_OPT_FLAG = -O2
Expand All @@ -303,7 +303,7 @@ SED = /usr/bin/sed
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
VERSION = 3.0.0
VERSION = 3.1.0
abs_builddir = /Users/tamird/src/go/src/github.com/cockroachdb/c-protobuf/internal
abs_srcdir = /Users/tamird/src/go/src/github.com/cockroachdb/c-protobuf/internal
abs_top_builddir = /Users/tamird/src/go/src/github.com/cockroachdb/c-protobuf/internal
Expand All @@ -320,21 +320,21 @@ am__quote =
am__tar = tar --format=ustar -chf - "$$tardir"
am__untar = tar -xf -
bindir = ${exec_prefix}/bin
build = x86_64-apple-darwin15.6.0
build = x86_64-apple-darwin16.1.0
build_alias =
build_cpu = x86_64
build_os = darwin15.6.0
build_os = darwin16.1.0
build_vendor = apple
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
host = x86_64-apple-darwin15.6.0
host = x86_64-apple-darwin16.1.0
host_alias =
host_cpu = x86_64
host_os = darwin15.6.0
host_os = darwin16.1.0
host_vendor = apple
htmldir = ${docdir}
includedir = ${prefix}/include
Expand All @@ -356,10 +356,10 @@ sharedstatedir = ${prefix}/com
srcdir = .
subdirs = gmock
sysconfdir = ${prefix}/etc
target = x86_64-apple-darwin15.6.0
target = x86_64-apple-darwin16.1.0
target_alias =
target_cpu = x86_64
target_os = darwin15.6.0
target_os = darwin16.1.0
target_vendor = apple
top_build_prefix =
top_builddir = .
Expand Down Expand Up @@ -861,6 +861,7 @@ objectivec_EXTRA_DIST = \
objectivec/Tests/GPBTestUtilities.h \
objectivec/Tests/GPBTestUtilities.m \
objectivec/Tests/GPBUnittestProtos.m \
objectivec/Tests/GPBUnittestProtos2.m \
objectivec/Tests/GPBUnknownFieldSetTest.m \
objectivec/Tests/GPBUtilitiesTests.m \
objectivec/Tests/GPBWellKnownTypesTest.m \
Expand All @@ -882,6 +883,13 @@ objectivec_EXTRA_DIST = \
objectivec/Tests/text_format_map_unittest_data.txt \
objectivec/Tests/text_format_unittest_data.txt \
objectivec/Tests/unittest_cycle.proto \
objectivec/Tests/unittest_extension_chain_a.proto \
objectivec/Tests/unittest_extension_chain_b.proto \
objectivec/Tests/unittest_extension_chain_c.proto \
objectivec/Tests/unittest_extension_chain_d.proto \
objectivec/Tests/unittest_extension_chain_e.proto \
objectivec/Tests/unittest_extension_chain_f.proto \
objectivec/Tests/unittest_extension_chain_g.proto \
objectivec/Tests/unittest_objc.proto \
objectivec/Tests/unittest_objc_startup.proto \
objectivec/Tests/unittest_runtime_proto2.proto \
Expand All @@ -890,6 +898,57 @@ objectivec_EXTRA_DIST = \
objectivec/Tests/UnitTests-Info.plist \
Protobuf.podspec

php_EXTRA_DIST = \
php/src/phpdoc.dist.xml \
php/src/Google/Protobuf/Internal/DescriptorPool.php \
php/src/Google/Protobuf/Internal/OneofField.php \
php/src/Google/Protobuf/Internal/MapEntry.php \
php/src/Google/Protobuf/Internal/Type.php \
php/src/Google/Protobuf/Internal/InputStream.php \
php/src/Google/Protobuf/Internal/OutputStream.php \
php/src/Google/Protobuf/Internal/MessageBuilderContext.php \
php/src/Google/Protobuf/Internal/MapField.php \
php/src/Google/Protobuf/Internal/RepeatedField.php \
php/src/Google/Protobuf/Internal/Message.php \
php/src/Google/Protobuf/Internal/GPBWire.php \
php/src/Google/Protobuf/Internal/GPBType.php \
php/src/Google/Protobuf/Internal/GPBLabel.php \
php/src/Google/Protobuf/Internal/EnumBuilderContext.php \
php/src/Google/Protobuf/Internal/GPBUtil.php \
php/src/Google/Protobuf/descriptor_internal.pb.php \
php/src/Google/Protobuf/descriptor.php \
php/tests/encode_decode_test.php \
php/tests/test.sh \
php/tests/generated_class_test.php \
php/tests/array_test.php \
php/tests/php_implementation_test.php \
php/tests/test_include.proto \
php/tests/test_include.pb.php \
php/tests/map_field_test.php \
php/tests/test_base.php \
php/tests/test_util.php \
php/tests/test.proto \
php/tests/test.pb.php \
php/tests/memory_leak_test.php \
php/README.md \
php/ext/google/protobuf/utf8.h \
php/ext/google/protobuf/message.c \
php/ext/google/protobuf/utf8.c \
php/ext/google/protobuf/package.xml \
php/ext/google/protobuf/upb.h \
php/ext/google/protobuf/array.c \
php/ext/google/protobuf/encode_decode.c \
php/ext/google/protobuf/protobuf.h \
php/ext/google/protobuf/type_check.c \
php/ext/google/protobuf/def.c \
php/ext/google/protobuf/storage.c \
php/ext/google/protobuf/map.c \
php/ext/google/protobuf/config.m4 \
php/ext/google/protobuf/upb.c \
php/ext/google/protobuf/protobuf.c \
phpunit.xml \
composer.json

python_EXTRA_DIST = \
python/MANIFEST.in \
python/google/__init__.py \
Expand Down Expand Up @@ -936,6 +995,7 @@ python_EXTRA_DIST = \
python/google/protobuf/internal/symbol_database_test.py \
python/google/protobuf/internal/test_bad_identifiers.proto \
python/google/protobuf/internal/test_util.py \
python/google/protobuf/internal/testing_refleaks.py \
python/google/protobuf/internal/text_encoding_test.py \
python/google/protobuf/internal/text_format_test.py \
python/google/protobuf/internal/type_checkers.py \
Expand Down Expand Up @@ -967,6 +1027,8 @@ python_EXTRA_DIST = \
python/google/protobuf/pyext/map_container.h \
python/google/protobuf/pyext/message.cc \
python/google/protobuf/pyext/message.h \
python/google/protobuf/pyext/message_factory.cc \
python/google/protobuf/pyext/message_factory.h \
python/google/protobuf/pyext/message_module.cc \
python/google/protobuf/pyext/proto2_api_test.proto \
python/google/protobuf/pyext/python.proto \
Expand All @@ -983,6 +1045,7 @@ python_EXTRA_DIST = \
python/google/protobuf/text_encoding.py \
python/google/protobuf/text_format.py \
python/mox.py \
python/setup.cfg \
python/setup.py \
python/stubout.py \
python/tox.ini \
Expand All @@ -1008,6 +1071,7 @@ ruby_EXTRA_DIST = \
ruby/google-protobuf.gemspec \
ruby/lib/google/protobuf/message_exts.rb \
ruby/lib/google/protobuf/repeated_field.rb \
ruby/lib/google/protobuf/well_known_types.rb \
ruby/lib/google/protobuf.rb \
ruby/pom.xml \
ruby/src/main/java/com/google/protobuf/jruby/RubyBuilder.java \
Expand All @@ -1034,6 +1098,7 @@ ruby_EXTRA_DIST = \
ruby/tests/generated_code.proto \
ruby/tests/test_import.proto \
ruby/tests/generated_code_test.rb \
ruby/tests/well_known_types_test.rb \
ruby/travis-test.sh

js_EXTRA_DIST = \
Expand Down Expand Up @@ -1065,6 +1130,7 @@ js_EXTRA_DIST = \
js/gulpfile.js \
js/jasmine.json \
js/map.js \
js/maps_test.js \
js/message.js \
js/message_test.js \
js/node_loader.js \
Expand All @@ -1080,7 +1146,7 @@ js_EXTRA_DIST = \
js/testbinary.proto \
js/testempty.proto

all_EXTRA_DIST = $(csharp_EXTRA_DIST) $(java_EXTRA_DIST) $(javanano_EXTRA_DIST) $(objectivec_EXTRA_DIST) $(python_EXTRA_DIST) $(ruby_EXTRA_DIST) $(js_EXTRA_DIST)
all_EXTRA_DIST = $(csharp_EXTRA_DIST) $(java_EXTRA_DIST) $(javanano_EXTRA_DIST) $(objectivec_EXTRA_DIST) $(php_EXTRA_DIST) $(python_EXTRA_DIST) $(ruby_EXTRA_DIST) $(js_EXTRA_DIST)
EXTRA_DIST = $(all_EXTRA_DIST) \
autogen.sh \
generate_descriptor_proto.sh \
Expand Down
Loading

0 comments on commit 070b646

Please sign in to comment.