Merge pull request #16372 from mehrdada/remove-proto-js_embed-hack

Remove protobuf js_embed hack
pull/16378/head
Mehrdad Afshari 6 years ago committed by GitHub
commit 0a1d0d25a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 328
      tools/distrib/python/grpcio_tools/grpc_tools/protobuf_generated_well_known_types_embed.cc
  2. 24
      tools/distrib/python/grpcio_tools/setup.py

@ -1,328 +0,0 @@
// Copyright 2017 gRPC authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// HACK: Embed the generated well_known_types_js.cc to make
// grpc-tools python package compilation easy.
#include <google/protobuf/compiler/js/well_known_types_embed.h>
struct FileToc well_known_types_js[] = {
{"any.js",
"// Protocol Buffers - Google's data interchange format\n"
"// Copyright 2008 Google Inc. All rights reserved.\n"
"// https://developers.google.com/protocol-buffers/\n"
"//\n"
"// Redistribution and use in source and binary forms, with or without\n"
"// modification, are permitted provided that the following conditions are\n"
"// met:\n"
"//\n"
"// * Redistributions of source code must retain the above copyright\n"
"// notice, this list of conditions and the following disclaimer.\n"
"// * Redistributions in binary form must reproduce the above\n"
"// copyright notice, this list of conditions and the following disclaimer\n"
"// in the documentation and/or other materials provided with the\n"
"// distribution.\n"
"// * Neither the name of Google Inc. nor the names of its\n"
"// contributors may be used to endorse or promote products derived from\n"
"// this software without specific prior written permission.\n"
"//\n"
"// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n"
"// \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n"
"// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n"
"// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n"
"// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n"
"// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n"
"// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n"
"// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n"
"// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n"
"// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n"
"// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
"\n"
"/* This code will be inserted into generated code for\n"
" * google/protobuf/any.proto. */\n"
"\n"
"/**\n"
" * Returns the type name contained in this instance, if any.\n"
" * @return {string|undefined}\n"
" */\n"
"proto.google.protobuf.Any.prototype.getTypeName = function() {\n"
" return this.getTypeUrl().split('/').pop();\n"
"};\n"
"\n"
"\n"
"/**\n"
" * Packs the given message instance into this Any.\n"
" * @param {!Uint8Array} serialized The serialized data to pack.\n"
" * @param {string} name The type name of this message object.\n"
" * @param {string=} opt_typeUrlPrefix the type URL prefix.\n"
" */\n"
"proto.google.protobuf.Any.prototype.pack = function(serialized, name,\n"
" opt_typeUrlPrefix) {\n"
" if (!opt_typeUrlPrefix) {\n"
" opt_typeUrlPrefix = 'type.googleapis.com/';\n"
" }\n"
"\n"
" if (opt_typeUrlPrefix.substr(-1) != '/') {\n"
" this.setTypeUrl(opt_typeUrlPrefix + '/' + name);\n"
" } else {\n"
" this.setTypeUrl(opt_typeUrlPrefix + name);\n"
" }\n"
"\n"
" this.setValue(serialized);\n"
"};\n"
"\n"
"\n"
"/**\n"
" * @template T\n"
" * Unpacks this Any into the given message object.\n"
" * @param {function(Uint8Array):T} deserialize Function that will deserialize\n"
" * the binary data properly.\n"
" * @param {string} name The expected type name of this message object.\n"
" * @return {?T} If the name matched the expected name, returns the deserialized\n"
" * object, otherwise returns undefined.\n"
" */\n"
"proto.google.protobuf.Any.prototype.unpack = function(deserialize, name) {\n"
" if (this.getTypeName() == name) {\n"
" return deserialize(this.getValue_asU8());\n"
" } else {\n"
" return null;\n"
" }\n"
"};\n"
},
{"struct.js",
"// Protocol Buffers - Google's data interchange format\n"
"// Copyright 2008 Google Inc. All rights reserved.\n"
"// https://developers.google.com/protocol-buffers/\n"
"//\n"
"// Redistribution and use in source and binary forms, with or without\n"
"// modification, are permitted provided that the following conditions are\n"
"// met:\n"
"//\n"
"// * Redistributions of source code must retain the above copyright\n"
"// notice, this list of conditions and the following disclaimer.\n"
"// * Redistributions in binary form must reproduce the above\n"
"// copyright notice, this list of conditions and the following disclaimer\n"
"// in the documentation and/or other materials provided with the\n"
"// distribution.\n"
"// * Neither the name of Google Inc. nor the names of its\n"
"// contributors may be used to endorse or promote products derived from\n"
"// this software without specific prior written permission.\n"
"//\n"
"// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n"
"// \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n"
"// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n"
"// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n"
"// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n"
"// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n"
"// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n"
"// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n"
"// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n"
"// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n"
"// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
"\n"
"/* This code will be inserted into generated code for\n"
" * google/protobuf/struct.proto. */\n"
"\n"
"/**\n"
" * Typedef representing plain JavaScript values that can go into a\n"
" * Struct.\n"
" * @typedef {null|number|string|boolean|Array|Object}\n"
" */\n"
"proto.google.protobuf.JavaScriptValue;\n"
"\n"
"\n"
"/**\n"
" * Converts this Value object to a plain JavaScript value.\n"
" * @return {?proto.google.protobuf.JavaScriptValue} a plain JavaScript\n"
" * value representing this Struct.\n"
" */\n"
"proto.google.protobuf.Value.prototype.toJavaScript = function() {\n"
" var kindCase = proto.google.protobuf.Value.KindCase;\n"
" switch (this.getKindCase()) {\n"
" case kindCase.NULL_VALUE:\n"
" return null;\n"
" case kindCase.NUMBER_VALUE:\n"
" return this.getNumberValue();\n"
" case kindCase.STRING_VALUE:\n"
" return this.getStringValue();\n"
" case kindCase.BOOL_VALUE:\n"
" return this.getBoolValue();\n"
" case kindCase.STRUCT_VALUE:\n"
" return this.getStructValue().toJavaScript();\n"
" case kindCase.LIST_VALUE:\n"
" return this.getListValue().toJavaScript();\n"
" default:\n"
" throw new Error('Unexpected struct type');\n"
" }\n"
"};\n"
"\n"
"\n"
"/**\n"
" * Converts this JavaScript value to a new Value proto.\n"
" * @param {!proto.google.protobuf.JavaScriptValue} value The value to\n"
" * convert.\n"
" * @return {!proto.google.protobuf.Value} The newly constructed value.\n"
" */\n"
"proto.google.protobuf.Value.fromJavaScript = function(value) {\n"
" var ret = new proto.google.protobuf.Value();\n"
" switch (goog.typeOf(value)) {\n"
" case 'string':\n"
" ret.setStringValue(/** @type {string} */ (value));\n"
" break;\n"
" case 'number':\n"
" ret.setNumberValue(/** @type {number} */ (value));\n"
" break;\n"
" case 'boolean':\n"
" ret.setBoolValue(/** @type {boolean} */ (value));\n"
" break;\n"
" case 'null':\n"
" ret.setNullValue(proto.google.protobuf.NullValue.NULL_VALUE);\n"
" break;\n"
" case 'array':\n"
" ret.setListValue(proto.google.protobuf.ListValue.fromJavaScript(\n"
" /** @type{!Array} */ (value)));\n"
" break;\n"
" case 'object':\n"
" ret.setStructValue(proto.google.protobuf.Struct.fromJavaScript(\n"
" /** @type{!Object} */ (value)));\n"
" break;\n"
" default:\n"
" throw new Error('Unexpected struct type.');\n"
" }\n"
"\n"
" return ret;\n"
"};\n"
"\n"
"\n"
"/**\n"
" * Converts this ListValue object to a plain JavaScript array.\n"
" * @return {!Array} a plain JavaScript array representing this List.\n"
" */\n"
"proto.google.protobuf.ListValue.prototype.toJavaScript = function() {\n"
" var ret = [];\n"
" var values = this.getValuesList();\n"
"\n"
" for (var i = 0; i < values.length; i++) {\n"
" ret[i] = values[i].toJavaScript();\n"
" }\n"
"\n"
" return ret;\n"
"};\n"
"\n"
"\n"
"/**\n"
" * Constructs a ListValue protobuf from this plain JavaScript array.\n"
" * @param {!Array} array a plain JavaScript array\n"
" * @return {proto.google.protobuf.ListValue} a new ListValue object\n"
" */\n"
"proto.google.protobuf.ListValue.fromJavaScript = function(array) {\n"
" var ret = new proto.google.protobuf.ListValue();\n"
"\n"
" for (var i = 0; i < array.length; i++) {\n"
" ret.addValues(proto.google.protobuf.Value.fromJavaScript(array[i]));\n"
" }\n"
"\n"
" return ret;\n"
"};\n"
"\n"
"\n"
"/**\n"
" * Converts this Struct object to a plain JavaScript object.\n"
" * @return {!Object<string, !proto.google.protobuf.JavaScriptValue>} a plain\n"
" * JavaScript object representing this Struct.\n"
" */\n"
"proto.google.protobuf.Struct.prototype.toJavaScript = function() {\n"
" var ret = {};\n"
"\n"
" this.getFieldsMap().forEach(function(value, key) {\n"
" ret[key] = value.toJavaScript();\n"
" });\n"
"\n"
" return ret;\n"
"};\n"
"\n"
"\n"
"/**\n"
" * Constructs a Struct protobuf from this plain JavaScript object.\n"
" * @param {!Object} obj a plain JavaScript object\n"
" * @return {proto.google.protobuf.Struct} a new Struct object\n"
" */\n"
"proto.google.protobuf.Struct.fromJavaScript = function(obj) {\n"
" var ret = new proto.google.protobuf.Struct();\n"
" var map = ret.getFieldsMap();\n"
"\n"
" for (var property in obj) {\n"
" var val = obj[property];\n"
" map.set(property, proto.google.protobuf.Value.fromJavaScript(val));\n"
" }\n"
"\n"
" return ret;\n"
"};\n"
},
{"timestamp.js",
"// Protocol Buffers - Google's data interchange format\n"
"// Copyright 2008 Google Inc. All rights reserved.\n"
"// https://developers.google.com/protocol-buffers/\n"
"//\n"
"// Redistribution and use in source and binary forms, with or without\n"
"// modification, are permitted provided that the following conditions are\n"
"// met:\n"
"//\n"
"// * Redistributions of source code must retain the above copyright\n"
"// notice, this list of conditions and the following disclaimer.\n"
"// * Redistributions in binary form must reproduce the above\n"
"// copyright notice, this list of conditions and the following disclaimer\n"
"// in the documentation and/or other materials provided with the\n"
"// distribution.\n"
"// * Neither the name of Google Inc. nor the names of its\n"
"// contributors may be used to endorse or promote products derived from\n"
"// this software without specific prior written permission.\n"
"//\n"
"// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n"
"// \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n"
"// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n"
"// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n"
"// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n"
"// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n"
"// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n"
"// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n"
"// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n"
"// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n"
"// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
"\n"
"/* This code will be inserted into generated code for\n"
" * google/protobuf/timestamp.proto. */\n"
"\n"
"/**\n"
" * Returns a JavaScript 'Date' object corresponding to this Timestamp.\n"
" * @return {!Date}\n"
" */\n"
"proto.google.protobuf.Timestamp.prototype.toDate = function() {\n"
" var seconds = this.getSeconds();\n"
" var nanos = this.getNanos();\n"
"\n"
" return new Date((seconds * 1000) + (nanos / 1000000));\n"
"};\n"
"\n"
"\n"
"/**\n"
" * Sets the value of this Timestamp object to be the given Date.\n"
" * @param {!Date} value The value to set.\n"
" */\n"
"proto.google.protobuf.Timestamp.prototype.fromDate = function(value) {\n"
" var millis = value.getTime();\n"
" this.setSeconds(Math.floor(value.getTime() / 1000));\n"
" this.setNanos(value.getMilliseconds() * 1000000);\n"
"};\n"
},
{NULL, NULL} // Terminate the list.
};

@ -160,29 +160,7 @@ def extension_modules():
plugin_sources += [
os.path.join('grpc_tools', 'main.cc'),
os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc')
]
#HACK: Substitute the embed.cc, which is a JS to C++
# preprocessor with the generated code.
# The generated code should not be material
# to the parts of protoc we use (it affects
# the JavaScript code generator, supposedly),
# but we need to be cautious about it.
cc_files_clone = list(CC_FILES)
embed_cc_file = os.path.normpath('google/protobuf/compiler/js/embed.cc')
well_known_types_file = os.path.normpath(
'google/protobuf/compiler/js/well_known_types_embed.cc')
if embed_cc_file in cc_files_clone:
cc_files_clone.remove(embed_cc_file)
if well_known_types_file in cc_files_clone:
cc_files_clone.remove(well_known_types_file)
plugin_sources += [
os.path.join('grpc_tools',
'protobuf_generated_well_known_types_embed.cc')
]
plugin_sources += [
os.path.join(CC_INCLUDE, cc_file) for cc_file in cc_files_clone
]
] + [os.path.join(CC_INCLUDE, cc_file) for cc_file in CC_FILES]
plugin_ext = extension.Extension(
name='grpc_tools._protoc_compiler',

Loading…
Cancel
Save