Merge pull request #7231 from protocolbuffers/3.11.x-202002181624
Merge branch 3.11.x to master
This commit is contained in:
commit
1370c7303a
20
CHANGES.txt
20
CHANGES.txt
@ -1,3 +1,23 @@
|
||||
2020-02-14 version 3.11.4 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
|
||||
|
||||
C#
|
||||
* Fix latest ArgumentException for C# extensions (#7188)
|
||||
* Enforce recursion depth checking for unknown fields (#7210)
|
||||
|
||||
Ruby
|
||||
* Fix wrappers with a zero value (#7195)
|
||||
* Fix JSON serialization of 0/empty-valued wrapper types (#7198)
|
||||
|
||||
2020-01-31 version 3.11.3 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
|
||||
|
||||
C++
|
||||
* Add OUT and OPTIONAL to windows portability files (#7087)
|
||||
|
||||
PHP
|
||||
* Refactored ulong to zend_ulong for php7.4 compatibility (#7147)
|
||||
* Call register_class before getClass from desc to fix segfault (#7077)
|
||||
|
||||
|
||||
2019-12-10 version 3.11.2 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
|
||||
|
||||
PHP
|
||||
|
@ -1,6 +1,6 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'Protobuf-C++'
|
||||
s.version = '3.11.2'
|
||||
s.version = '3.11.4'
|
||||
s.summary = 'Protocol Buffers v3 runtime library for C++.'
|
||||
s.homepage = 'https://github.com/google/protobuf'
|
||||
s.license = '3-Clause BSD License'
|
||||
|
@ -5,7 +5,7 @@
|
||||
# dependent projects use the :git notation to refer to the library.
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'Protobuf'
|
||||
s.version = '3.11.2'
|
||||
s.version = '3.11.4'
|
||||
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
|
||||
s.homepage = 'https://github.com/protocolbuffers/protobuf'
|
||||
s.license = '3-Clause BSD License'
|
||||
|
@ -17,7 +17,7 @@ AC_PREREQ(2.59)
|
||||
# In the SVN trunk, the version should always be the next anticipated release
|
||||
# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
|
||||
# the size of one file name in the dist tarfile over the 99-char limit.)
|
||||
AC_INIT([Protocol Buffers],[3.11.2],[protobuf@googlegroups.com],[protobuf])
|
||||
AC_INIT([Protocol Buffers],[3.11.4],[protobuf@googlegroups.com],[protobuf])
|
||||
|
||||
AM_MAINTAINER_MODE([enable])
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
<title>Google Protocol Buffers tools</title>
|
||||
<summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
|
||||
<description>See project site for more info.</description>
|
||||
<version>3.11.2</version>
|
||||
<version>3.11.4</version>
|
||||
<authors>Google Inc.</authors>
|
||||
<owners>protobuf-packages</owners>
|
||||
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>
|
||||
@ -20,7 +20,6 @@
|
||||
<file src="protoc\windows_x64\protoc.exe" target="tools\windows_x64\protoc.exe"/>
|
||||
<file src="protoc\linux_x86\protoc" target="tools\linux_x86\protoc"/>
|
||||
<file src="protoc\linux_x64\protoc" target="tools\linux_x64\protoc"/>
|
||||
<file src="protoc\macosx_x86\protoc" target="tools\macosx_x86\protoc"/>
|
||||
<file src="protoc\macosx_x64\protoc" target="tools\macosx_x64\protoc"/>
|
||||
<file src="..\src\google\protobuf\any.proto" target="tools\google\protobuf"/>
|
||||
<file src="..\src\google\protobuf\api.proto" target="tools\google\protobuf"/>
|
||||
|
@ -19,7 +19,6 @@ VERSION_NUMBER=$1
|
||||
declare -a FILE_NAMES=( \
|
||||
windows_x86 windows-x86_32.exe \
|
||||
windows_x64 windows-x86_64.exe \
|
||||
macosx_x86 osx-x86_32.exe \
|
||||
macosx_x64 osx-x86_64.exe \
|
||||
linux_x86 linux-x86_32.exe \
|
||||
linux_x64 linux-x86_64.exe \
|
||||
|
@ -4,7 +4,7 @@
|
||||
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
|
||||
<Copyright>Copyright 2015, Google Inc.</Copyright>
|
||||
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
|
||||
<VersionPrefix>3.11.2</VersionPrefix>
|
||||
<VersionPrefix>3.11.4</VersionPrefix>
|
||||
<LangVersion>6</LangVersion>
|
||||
<Authors>Google Inc.</Authors>
|
||||
<TargetFrameworks>netstandard1.0;netstandard2.0;net45</TargetFrameworks>
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-bom</artifactId>
|
||||
<version>3.11.2</version>
|
||||
<version>3.11.4</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>Protocol Buffers [BOM]</name>
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-parent</artifactId>
|
||||
<version>3.11.2</version>
|
||||
<version>3.11.4</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-parent</artifactId>
|
||||
<version>3.11.2</version>
|
||||
<version>3.11.4</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>protobuf-javalite</artifactId>
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-parent</artifactId>
|
||||
<version>3.11.2</version>
|
||||
<version>3.11.4</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>Protocol Buffers [Parent]</name>
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-parent</artifactId>
|
||||
<version>3.11.2</version>
|
||||
<version>3.11.4</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>protobuf-java-util</artifactId>
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "google-protobuf",
|
||||
"version": "3.11.2",
|
||||
"version": "3.11.4",
|
||||
"description": "Protocol Buffers for JavaScript",
|
||||
"main": "google-protobuf.js",
|
||||
"files": [
|
||||
|
11
kokoro/macos/php7.4_mac/build.sh
Executable file
11
kokoro/macos/php7.4_mac/build.sh
Executable file
@ -0,0 +1,11 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Build file to set up and run tests
|
||||
|
||||
# Change to repo root
|
||||
cd $(dirname $0)/../../..
|
||||
|
||||
# Prepare worker environment to run tests
|
||||
source kokoro/macos/prepare_build_macos_rc
|
||||
|
||||
./tests.sh php7.4_mac
|
5
kokoro/macos/php7.4_mac/continuous.cfg
Normal file
5
kokoro/macos/php7.4_mac/continuous.cfg
Normal file
@ -0,0 +1,5 @@
|
||||
# Config file for running tests in Kokoro
|
||||
|
||||
# Location of the build script in repository
|
||||
build_file: "protobuf/kokoro/macos/php7.4_mac/build.sh"
|
||||
timeout_mins: 1440
|
5
kokoro/macos/php7.4_mac/presubmit.cfg
Normal file
5
kokoro/macos/php7.4_mac/presubmit.cfg
Normal file
@ -0,0 +1,5 @@
|
||||
# Config file for running tests in Kokoro
|
||||
|
||||
# Location of the build script in repository
|
||||
build_file: "protobuf/kokoro/macos/php7.4_mac/build.sh"
|
||||
timeout_mins: 1440
|
@ -43,9 +43,7 @@ mkdir -p protoc/linux_x64
|
||||
cp ${INPUT_ARTIFACTS_DIR}/protoc-artifacts/target/linux/x86_32/protoc.exe protoc/linux_x86/protoc
|
||||
cp ${INPUT_ARTIFACTS_DIR}/protoc-artifacts/target/linux/x86_64/protoc.exe protoc/linux_x64/protoc
|
||||
|
||||
mkdir -p protoc/macosx_x86
|
||||
mkdir -p protoc/macosx_x64
|
||||
cp ${INPUT_ARTIFACTS_DIR}/build32/src/protoc protoc/macosx_x86/protoc
|
||||
cp ${INPUT_ARTIFACTS_DIR}/build64/src/protoc protoc/macosx_x64/protoc
|
||||
|
||||
# Install nuget (will also install mono)
|
||||
|
@ -6,14 +6,6 @@ CXXFLAGS_COMMON="-std=c++14 -DNDEBUG -mmacosx-version-min=10.9"
|
||||
cd github/protobuf
|
||||
./autogen.sh
|
||||
|
||||
mkdir build32 && cd build32
|
||||
export CXXFLAGS="$CXXFLAGS_COMMON -m32"
|
||||
../configure --disable-shared
|
||||
make -j4
|
||||
file src/protoc
|
||||
otool -L src/protoc | grep dylib
|
||||
cd ..
|
||||
|
||||
mkdir build64 && cd build64
|
||||
export CXXFLAGS="$CXXFLAGS_COMMON -m64"
|
||||
../configure --disable-shared
|
||||
|
@ -132,6 +132,7 @@ static void descriptor_init_c_instance(Descriptor *desc TSRMLS_DC) {
|
||||
PHP_METHOD(Descriptor, getClass) {
|
||||
Descriptor* desc = UNBOX(Descriptor, getThis());
|
||||
DescriptorInternal* intern = desc->intern;
|
||||
register_class(intern, false TSRMLS_CC);
|
||||
#if PHP_MAJOR_VERSION < 7
|
||||
const char* classname = intern->klass->name;
|
||||
#else
|
||||
|
@ -10,11 +10,11 @@
|
||||
<email>protobuf-opensource@google.com</email>
|
||||
<active>yes</active>
|
||||
</lead>
|
||||
<date>2019-12-10</date>
|
||||
<time>11:22:54</time>
|
||||
<date>2020-02-12</date>
|
||||
<time>12:46:57</time>
|
||||
<version>
|
||||
<release>3.11.2</release>
|
||||
<api>3.11.2</api>
|
||||
<release>3.11.4</release>
|
||||
<api>3.11.4</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
@ -501,5 +501,33 @@ G A release.
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.11.3</release>
|
||||
<api>3.11.3</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2020-01-28</date>
|
||||
<time>10:20:43</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.11.4</release>
|
||||
<api>3.11.4</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2020-02-12</date>
|
||||
<time>12:46:57</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
</changelog>
|
||||
</package>
|
||||
|
@ -37,7 +37,7 @@
|
||||
#include "upb.h"
|
||||
|
||||
#define PHP_PROTOBUF_EXTNAME "protobuf"
|
||||
#define PHP_PROTOBUF_VERSION "3.11.2"
|
||||
#define PHP_PROTOBUF_VERSION "3.11.4"
|
||||
|
||||
#define MAX_LENGTH_OF_INT64 20
|
||||
#define SIZEOF_INT64 8
|
||||
@ -292,7 +292,7 @@
|
||||
|
||||
#define PHP_PROTO_HASH_OF(array) Z_ARRVAL_P(&array)
|
||||
|
||||
static inline int php_proto_zend_hash_index_update_zval(HashTable* ht, ulong h,
|
||||
static inline int php_proto_zend_hash_index_update_zval(HashTable* ht, zend_ulong h,
|
||||
zval* pData) {
|
||||
void* result = NULL;
|
||||
result = zend_hash_index_update(ht, h, pData);
|
||||
@ -308,7 +308,7 @@ static inline int php_proto_zend_hash_update(HashTable* ht, const char* key,
|
||||
return result != NULL ? SUCCESS : FAILURE;
|
||||
}
|
||||
|
||||
static inline int php_proto_zend_hash_index_update_mem(HashTable* ht, ulong h,
|
||||
static inline int php_proto_zend_hash_index_update_mem(HashTable* ht, zend_ulong h,
|
||||
void* pData, uint nDataSize,
|
||||
void** pDest) {
|
||||
void* result = NULL;
|
||||
@ -337,7 +337,7 @@ static inline int php_proto_zend_hash_update_mem(HashTable* ht, const char* key,
|
||||
}
|
||||
|
||||
static inline int php_proto_zend_hash_index_find_zval(const HashTable* ht,
|
||||
ulong h, void** pDest) {
|
||||
zend_ulong h, void** pDest) {
|
||||
zval* result = zend_hash_index_find(ht, h);
|
||||
if (pDest != NULL) *pDest = result;
|
||||
return result != NULL ? SUCCESS : FAILURE;
|
||||
@ -351,7 +351,7 @@ static inline int php_proto_zend_hash_find(const HashTable* ht, const char* key,
|
||||
}
|
||||
|
||||
static inline int php_proto_zend_hash_index_find_mem(const HashTable* ht,
|
||||
ulong h, void** pDest) {
|
||||
zend_ulong h, void** pDest) {
|
||||
void* result = NULL;
|
||||
result = zend_hash_index_find_ptr(ht, h);
|
||||
if (pDest != NULL) *pDest = result;
|
||||
|
@ -11,6 +11,8 @@ use Google\Protobuf\Internal\MapField;
|
||||
use Descriptors\TestDescriptorsEnum;
|
||||
use Descriptors\TestDescriptorsMessage;
|
||||
use Descriptors\TestDescriptorsMessage\Sub;
|
||||
use Foo\TestMessage;
|
||||
use Bar\TestInclude;
|
||||
|
||||
class DescriptorsTest extends TestBase
|
||||
{
|
||||
@ -89,6 +91,17 @@ class DescriptorsTest extends TestBase
|
||||
$this->assertSame(1, $desc->getOneofDeclCount());
|
||||
}
|
||||
|
||||
public function testDescriptorForIncludedMessage()
|
||||
{
|
||||
$pool = DescriptorPool::getGeneratedPool();
|
||||
$class = get_class(new TestMessage());
|
||||
$this->assertSame('Foo\TestMessage', $class);
|
||||
$desc = $pool->getDescriptorByClassName($class);
|
||||
$fielddesc = $desc->getField(17);
|
||||
$subdesc = $fielddesc->getMessageType();
|
||||
$this->assertSame('Bar\TestInclude', $subdesc->getClass());
|
||||
}
|
||||
|
||||
#########################################################
|
||||
# Test enum descriptor.
|
||||
#########################################################
|
||||
|
@ -13,10 +13,9 @@ Example:
|
||||
This script will download pre-built protoc or protoc plugin binaries from maven
|
||||
repository and create .zip packages suitable to be included in the github
|
||||
release page. If the target is protoc, well-known type .proto files will also be
|
||||
included. Each invocation will create 9 zip packages:
|
||||
included. Each invocation will create 8 zip packages:
|
||||
dist/<TARGET>-<VERSION_NUMBER>-win32.zip
|
||||
dist/<TARGET>-<VERSION_NUMBER>-win64.zip
|
||||
dist/<TARGET>-<VERSION_NUMBER>-osx-x86_32.zip
|
||||
dist/<TARGET>-<VERSION_NUMBER>-osx-x86_64.zip
|
||||
dist/<TARGET>-<VERSION_NUMBER>-linux-x86_32.zip
|
||||
dist/<TARGET>-<VERSION_NUMBER>-linux-x86_64.zip
|
||||
@ -34,7 +33,6 @@ VERSION_NUMBER=$2
|
||||
declare -a FILE_NAMES=( \
|
||||
win32.zip windows-x86_32.exe \
|
||||
win64.zip windows-x86_64.exe \
|
||||
osx-x86_32.zip osx-x86_32.exe \
|
||||
osx-x86_64.zip osx-x86_64.exe \
|
||||
linux-x86_32.zip linux-x86_32.exe \
|
||||
linux-x86_64.zip linux-x86_64.exe \
|
||||
@ -100,7 +98,7 @@ for((i=0;i<${#FILE_NAMES[@]};i+=2));do
|
||||
BINARY="$TARGET"
|
||||
fi
|
||||
BINARY_NAME=${FILE_NAMES[$(($i+1))]}
|
||||
BINARY_URL=http://repo1.maven.org/maven2/com/google/protobuf/$TARGET/${VERSION_NUMBER}/$TARGET-${VERSION_NUMBER}-${BINARY_NAME}
|
||||
BINARY_URL=https://repo1.maven.org/maven2/com/google/protobuf/$TARGET/${VERSION_NUMBER}/$TARGET-${VERSION_NUMBER}-${BINARY_NAME}
|
||||
if ! wget ${BINARY_URL} -O ${DIR}/bin/$BINARY &> /dev/null; then
|
||||
echo "[ERROR] Failed to download ${BINARY_URL}" >&2
|
||||
echo "[ERROR] Skipped $TARGET-${VERSION_NAME}-${ZIP_NAME}" >&2
|
||||
|
@ -8,7 +8,7 @@
|
||||
</parent>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protoc</artifactId>
|
||||
<version>3.11.2</version>
|
||||
<version>3.11.4</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>Protobuf Compiler</name>
|
||||
<description>
|
||||
@ -70,11 +70,6 @@
|
||||
<classifier>osx-x86_64</classifier>
|
||||
<type>exe</type>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<file>${basedir}/target/osx/x86_32/protoc.exe</file>
|
||||
<classifier>osx-x86_32</classifier>
|
||||
<type>exe</type>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<file>${basedir}/target/linux/aarch_64/protoc.exe</file>
|
||||
<classifier>linux-aarch_64</classifier>
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
# Copyright 2007 Google Inc. All Rights Reserved.
|
||||
|
||||
__version__ = '3.11.2'
|
||||
__version__ = '3.11.4'
|
||||
|
||||
if __name__ != '__main__':
|
||||
try:
|
||||
|
@ -1,6 +1,6 @@
|
||||
Gem::Specification.new do |s|
|
||||
s.name = "google-protobuf"
|
||||
s.version = "3.11.2"
|
||||
s.version = "3.11.4"
|
||||
git_tag = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag
|
||||
s.licenses = ["BSD-3-Clause"]
|
||||
s.summary = "Protocol Buffers"
|
||||
|
@ -18,7 +18,7 @@ else
|
||||
PTHREAD_DEF =
|
||||
endif
|
||||
|
||||
PROTOBUF_VERSION = 22:2:0
|
||||
PROTOBUF_VERSION = 22:4:0
|
||||
|
||||
if GCC
|
||||
# Turn on all warnings except for sign comparison (we ignore sign comparison
|
||||
|
@ -13,7 +13,7 @@
|
||||
#error incompatible with your Protocol Buffer headers. Please update
|
||||
#error your headers.
|
||||
#endif
|
||||
#if 3011002 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#if 3011004 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#error This file was generated by an older version of protoc which is
|
||||
#error incompatible with your Protocol Buffer headers. Please
|
||||
#error regenerate this file with a newer version of protoc.
|
||||
|
@ -13,7 +13,7 @@
|
||||
#error incompatible with your Protocol Buffer headers. Please update
|
||||
#error your headers.
|
||||
#endif
|
||||
#if 3011002 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#if 3011004 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#error This file was generated by an older version of protoc which is
|
||||
#error incompatible with your Protocol Buffer headers. Please
|
||||
#error regenerate this file with a newer version of protoc.
|
||||
|
@ -13,7 +13,7 @@
|
||||
#error incompatible with your Protocol Buffer headers. Please update
|
||||
#error your headers.
|
||||
#endif
|
||||
#if 3011002 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#if 3011004 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#error This file was generated by an older version of protoc which is
|
||||
#error incompatible with your Protocol Buffer headers. Please
|
||||
#error regenerate this file with a newer version of protoc.
|
||||
|
@ -13,7 +13,7 @@
|
||||
#error incompatible with your Protocol Buffer headers. Please update
|
||||
#error your headers.
|
||||
#endif
|
||||
#if 3011002 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#if 3011004 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#error This file was generated by an older version of protoc which is
|
||||
#error incompatible with your Protocol Buffer headers. Please
|
||||
#error regenerate this file with a newer version of protoc.
|
||||
|
@ -13,7 +13,7 @@
|
||||
#error incompatible with your Protocol Buffer headers. Please update
|
||||
#error your headers.
|
||||
#endif
|
||||
#if 3011002 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#if 3011004 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#error This file was generated by an older version of protoc which is
|
||||
#error incompatible with your Protocol Buffer headers. Please
|
||||
#error regenerate this file with a newer version of protoc.
|
||||
|
@ -13,7 +13,7 @@
|
||||
#error incompatible with your Protocol Buffer headers. Please update
|
||||
#error your headers.
|
||||
#endif
|
||||
#if 3011002 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#if 3011004 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#error This file was generated by an older version of protoc which is
|
||||
#error incompatible with your Protocol Buffer headers. Please
|
||||
#error regenerate this file with a newer version of protoc.
|
||||
|
@ -13,7 +13,7 @@
|
||||
#error incompatible with your Protocol Buffer headers. Please update
|
||||
#error your headers.
|
||||
#endif
|
||||
#if 3011002 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#if 3011004 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#error This file was generated by an older version of protoc which is
|
||||
#error incompatible with your Protocol Buffer headers. Please
|
||||
#error regenerate this file with a newer version of protoc.
|
||||
|
@ -297,7 +297,7 @@
|
||||
|
||||
// Shared google3/opensource definitions. //////////////////////////////////////
|
||||
|
||||
#define PROTOBUF_VERSION 3011002
|
||||
#define PROTOBUF_VERSION 3011004
|
||||
#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3011000
|
||||
#define PROTOBUF_MIN_PROTOC_VERSION 3011000
|
||||
#define PROTOBUF_VERSION_SUFFIX ""
|
||||
|
@ -13,7 +13,7 @@
|
||||
#error incompatible with your Protocol Buffer headers. Please update
|
||||
#error your headers.
|
||||
#endif
|
||||
#if 3011002 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#if 3011004 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#error This file was generated by an older version of protoc which is
|
||||
#error incompatible with your Protocol Buffer headers. Please
|
||||
#error regenerate this file with a newer version of protoc.
|
||||
|
@ -13,7 +13,7 @@
|
||||
#error incompatible with your Protocol Buffer headers. Please update
|
||||
#error your headers.
|
||||
#endif
|
||||
#if 3011002 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#if 3011004 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#error This file was generated by an older version of protoc which is
|
||||
#error incompatible with your Protocol Buffer headers. Please
|
||||
#error regenerate this file with a newer version of protoc.
|
||||
|
@ -81,7 +81,7 @@ namespace internal {
|
||||
|
||||
// The current version, represented as a single integer to make comparison
|
||||
// easier: major * 10^6 + minor * 10^3 + micro
|
||||
#define GOOGLE_PROTOBUF_VERSION 3011002
|
||||
#define GOOGLE_PROTOBUF_VERSION 3011004
|
||||
|
||||
// A suffix string for alpha, beta or rc releases. Empty for stable releases.
|
||||
#define GOOGLE_PROTOBUF_VERSION_SUFFIX ""
|
||||
|
@ -13,7 +13,7 @@
|
||||
#error incompatible with your Protocol Buffer headers. Please update
|
||||
#error your headers.
|
||||
#endif
|
||||
#if 3011002 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#if 3011004 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#error This file was generated by an older version of protoc which is
|
||||
#error incompatible with your Protocol Buffer headers. Please
|
||||
#error regenerate this file with a newer version of protoc.
|
||||
|
@ -13,7 +13,7 @@
|
||||
#error incompatible with your Protocol Buffer headers. Please update
|
||||
#error your headers.
|
||||
#endif
|
||||
#if 3011002 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#if 3011004 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#error This file was generated by an older version of protoc which is
|
||||
#error incompatible with your Protocol Buffer headers. Please
|
||||
#error regenerate this file with a newer version of protoc.
|
||||
|
@ -13,7 +13,7 @@
|
||||
#error incompatible with your Protocol Buffer headers. Please update
|
||||
#error your headers.
|
||||
#endif
|
||||
#if 3011002 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#if 3011004 < PROTOBUF_MIN_PROTOC_VERSION
|
||||
#error This file was generated by an older version of protoc which is
|
||||
#error incompatible with your Protocol Buffer headers. Please
|
||||
#error regenerate this file with a newer version of protoc.
|
||||
|
24
tests.sh
24
tests.sh
@ -705,6 +705,30 @@ build_php7.0_mac() {
|
||||
popd
|
||||
}
|
||||
|
||||
build_php7.4_mac() {
|
||||
generate_php_test_proto
|
||||
# Install PHP
|
||||
curl -s https://php-osx.liip.ch/install.sh | bash -s 7.4
|
||||
PHP_FOLDER=`find /usr/local -type d -name "php7-7.4*"` # The folder name may change upon time
|
||||
export PATH="$PHP_FOLDER/bin:$PATH"
|
||||
|
||||
# Install phpunit
|
||||
curl https://phar.phpunit.de/phpunit-8.phar -L -o phpunit.phar
|
||||
chmod +x phpunit.phar
|
||||
sudo mv phpunit.phar /usr/local/bin/phpunit
|
||||
|
||||
# Install valgrind
|
||||
echo "#! /bin/bash" > valgrind
|
||||
chmod ug+x valgrind
|
||||
sudo mv valgrind /usr/local/bin/valgrind
|
||||
|
||||
# Test
|
||||
cd php/tests && /bin/bash ./test.sh && cd ../..
|
||||
pushd conformance
|
||||
make test_php_c
|
||||
popd
|
||||
}
|
||||
|
||||
build_php_compatibility() {
|
||||
internal_build_cpp
|
||||
php/tests/compatibility_test.sh $LAST_RELEASED
|
||||
|
Loading…
Reference in New Issue
Block a user