forked from protocolbuffers/protobuf
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Down-integrate from internal branch.
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
- Loading branch information
Showing
50 changed files
with
5,186 additions
and
241 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,34 @@ | ||
| # Only test one combination: "Visual Studio 12 + Win64 + Debug + DLL". We can | ||
| # test more combinations but AppVeyor just takes too long to finish (each | ||
| # combination takes ~15mins). | ||
| platform: | ||
| - Win64 | ||
|
|
||
| configuration: | ||
| - Debug | ||
|
|
||
| environment: | ||
| matrix: | ||
| - BUILD_DLL: ON | ||
|
|
||
| install: | ||
| - ps: Start-FileDownload https://googlemock.googlecode.com/files/gmock-1.7.0.zip | ||
| - 7z x gmock-1.7.0.zip | ||
| - rename gmock-1.7.0 gmock | ||
|
|
||
| before_build: | ||
| - if %platform%==Win32 set generator=Visual Studio 12 | ||
| - if %platform%==Win64 set generator=Visual Studio 12 Win64 | ||
| - if %platform%==Win32 set vcplatform=Win32 | ||
| - if %platform%==Win64 set vcplatform=x64 | ||
|
|
||
| build_script: | ||
| - mkdir build_msvc | ||
| - cd build_msvc | ||
| - cmake -G "%generator%" -DBUILD_SHARED_LIBS=%BUILD_DLL% ../cmake | ||
| - msbuild protobuf.sln /p:Platform=%vcplatform% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" | ||
| - cd %configuration% | ||
| - tests.exe | ||
|
|
||
| skip_commits: | ||
| message: /.*\[skip appveyor\].*/ | ||
| # Only test one combination: "Visual Studio 12 + Win64 + Debug + DLL". We can | ||
| # test more combinations but AppVeyor just takes too long to finish (each | ||
| # combination takes ~15mins). | ||
| platform: | ||
| - Win64 | ||
|
|
||
| configuration: | ||
| - Debug | ||
|
|
||
| environment: | ||
| matrix: | ||
| - BUILD_DLL: ON | ||
|
|
||
| install: | ||
| - ps: Start-FileDownload https://googlemock.googlecode.com/files/gmock-1.7.0.zip | ||
| - 7z x gmock-1.7.0.zip | ||
| - rename gmock-1.7.0 gmock | ||
|
|
||
| before_build: | ||
| - if %platform%==Win32 set generator=Visual Studio 12 | ||
| - if %platform%==Win64 set generator=Visual Studio 12 Win64 | ||
| - if %platform%==Win32 set vcplatform=Win32 | ||
| - if %platform%==Win64 set vcplatform=x64 | ||
|
|
||
| build_script: | ||
| - mkdir build_msvc | ||
| - cd build_msvc | ||
| - cmake -G "%generator%" -DBUILD_SHARED_LIBS=%BUILD_DLL% ../cmake | ||
| - msbuild protobuf.sln /p:Platform=%vcplatform% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" | ||
| - cd %configuration% | ||
| - tests.exe | ||
|
|
||
| skip_commits: | ||
| message: /.*\[skip appveyor\].*/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
python/google/protobuf/internal/message_set_extensions.proto
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // Protocol Buffers - Google's data interchange format | ||
| // Copyright 2008 Google Inc. All rights reserved. | ||
| // https://developers.google.com/protocol-buffers/ | ||
| // | ||
| // Redistribution and use in source and binary forms, with or without | ||
| // modification, are permitted provided that the following conditions are | ||
| // met: | ||
| // | ||
| // * Redistributions of source code must retain the above copyright | ||
| // notice, this list of conditions and the following disclaimer. | ||
| // * Redistributions in binary form must reproduce the above | ||
| // copyright notice, this list of conditions and the following disclaimer | ||
| // in the documentation and/or other materials provided with the | ||
| // distribution. | ||
| // * Neither the name of Google Inc. nor the names of its | ||
| // contributors may be used to endorse or promote products derived from | ||
| // this software without specific prior written permission. | ||
| // | ||
| // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| // This file contains messages that extend MessageSet. | ||
|
|
||
| syntax = "proto2"; | ||
| package google.protobuf.internal; | ||
|
|
||
|
|
||
| // A message with message_set_wire_format. | ||
| message TestMessageSet { | ||
| option message_set_wire_format = true; | ||
| extensions 4 to max; | ||
| } | ||
|
|
||
| message TestMessageSetExtension1 { | ||
| extend TestMessageSet { | ||
| optional TestMessageSetExtension1 message_set_extension = 98418603; | ||
| } | ||
| optional int32 i = 15; | ||
| } | ||
|
|
||
| message TestMessageSetExtension2 { | ||
| extend TestMessageSet { | ||
| optional TestMessageSetExtension2 message_set_extension = 98418634; | ||
| } | ||
| optional string str = 25; | ||
| } | ||
|
|
||
| // This message was used to generate | ||
| // //net/proto2/python/internal/testdata/message_set_message, but is commented | ||
| // out since it must not actually exist in code, to simulate an "unknown" | ||
| // extension. | ||
| // message TestMessageSetUnknownExtension { | ||
| // extend TestMessageSet { | ||
| // optional TestMessageSetUnknownExtension message_set_extension = 56141421; | ||
| // } | ||
| // optional int64 a = 1; | ||
| // } |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.