diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/BUILD.template | 2 | ||||
-rw-r--r-- | templates/Makefile.template | 22 | ||||
-rw-r--r-- | templates/binding.gyp.template | 6 | ||||
-rw-r--r-- | templates/gRPC.podspec.template | 4 | ||||
-rw-r--r-- | templates/grpc.gemspec.template | 6 | ||||
-rw-r--r-- | templates/package.json.template | 5 | ||||
-rw-r--r-- | templates/src/python/grpcio/grpc/_cython/imports.generated.c.template | 9 | ||||
-rw-r--r-- | templates/src/python/grpcio/grpc/_cython/imports.generated.h.template | 8 | ||||
-rw-r--r-- | templates/src/ruby/lib/grpc/version.rb.template | 2 | ||||
-rw-r--r-- | templates/tools/dockerfile/test/sanity/Dockerfile.template | 1 | ||||
-rw-r--r-- | templates/tools/doxygen/Doxyfile.core.internal.template | 2 | ||||
-rw-r--r-- | templates/tools/doxygen/Doxyfile.core.template | 2 | ||||
-rw-r--r-- | templates/vsprojects/cpptest.props.template | 2 |
13 files changed, 43 insertions, 28 deletions
diff --git a/templates/BUILD.template b/templates/BUILD.template index 49703bb1f7..54dc697125 100644 --- a/templates/BUILD.template +++ b/templates/BUILD.template @@ -68,7 +68,7 @@ % endfor % for lib in libs: - % if lib.name in ("grpc"): + % if lib.name in ("grpc", "gpr"): ${objc_library(lib)} % endif % endfor diff --git a/templates/Makefile.template b/templates/Makefile.template index 9942514211..218f492837 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -551,26 +551,20 @@ # grpc .pc file PC_NAME = gRPC - PC_DESCRIPTION = High performance general RPC framework - PC_CFLAGS = -pthread - PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC) $(PC_REQUIRES_SECURE) -lpthread + PC_DESCRIPTION = high performance general RPC framework + PC_CFLAGS = + PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC) $(PC_REQUIRES_SECURE) PC_LIBS_PRIVATE = $(PC_LIBS_GRPC) $(PC_LIBS_SECURE) PC_LIB = -lgrpc - ifneq ($(SYSTEM),Darwin) - PC_LIBS_PRIVATE += -lrt - endif GRPC_PC_FILE := $(PC_TEMPLATE) - # gprc_unsecure .pc file + # grpc_unsecure .pc file PC_NAME = gRPC unsecure - PC_DESCRIPTION = High performance general RPC framework without SSL - PC_CFLAGS = -pthread - PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC) -lpthread + PC_DESCRIPTION = high performance general RPC framework without SSL + PC_CFLAGS = + PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC) PC_LIBS_PRIVATE = $(PC_LIBS_GRPC) PC_LIB = -lgrpc - ifneq ($(SYSTEM),Darwin) - PC_LIBS_PRIVATE += -lrt - endif GRPC_UNSECURE_PC_FILE := $(PC_TEMPLATE) # grpc_zookeeper .pc file @@ -1484,6 +1478,7 @@ % endif $(LIB${lib.name.upper()}_OBJS) \ % if lib.get('baselib', False): + $(LIBGPR_OBJS) \ $(ZLIB_MERGE_OBJS) \ % if lib.get('secure', 'check') == True: $(OPENSSL_MERGE_OBJS) \ @@ -1495,6 +1490,7 @@ $(Q) rm -f $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(Q) $(AR) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(LIB${lib.name.upper()}_OBJS) \ % if lib.get('baselib', False): + $(LIBGPR_OBJS) \ $(ZLIB_MERGE_OBJS) \ % if lib.get('secure', 'check') == True: $(OPENSSL_MERGE_OBJS) \ diff --git a/templates/binding.gyp.template b/templates/binding.gyp.template index 7cee562caa..3ffbc06643 100644 --- a/templates/binding.gyp.template +++ b/templates/binding.gyp.template @@ -57,7 +57,8 @@ 'UNICODE', '_UNICODE', 'NOMINMAX', - 'OPENSSL_NO_ASM' + 'OPENSSL_NO_ASM', + 'GPR_BACKWARDS_COMPATIBILITY_MODE' ], "msvs_settings": { 'VCCLCompilerTool': { @@ -80,7 +81,8 @@ # supports ALPN. The target is "[major].[minor].[patch]". We split by # periods and take the first field to get the major version. 'defines': [ - 'TSI_OPENSSL_ALPN_SUPPORT=<!(echo <(target) | cut -d. -f1)' + 'TSI_OPENSSL_ALPN_SUPPORT=<!(echo <(target) | cut -d. -f1)', + 'GPR_BACKWARDS_COMPATIBILITY_MODE' ], 'include_dirs': [ '<(node_root_dir)/deps/openssl/openssl/include', diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index 0d94130859..a9948a41df 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -39,7 +39,7 @@ def grpc_files(libs): out = [] for lib in libs: - if lib.name in ("grpc"): + if lib.name in ("grpc", "gpr"): out += lib.get('headers', []) out += lib.get('public_headers', []) out += lib.get('src', []) @@ -48,7 +48,7 @@ def grpc_private_headers(libs): out = [] for lib in libs: - if lib.name in ("grpc"): + if lib.name in ("grpc", "gpr"): out += lib.get('headers', []) return out %> diff --git a/templates/grpc.gemspec.template b/templates/grpc.gemspec.template index c4987a6725..701e1c7485 100644 --- a/templates/grpc.gemspec.template +++ b/templates/grpc.gemspec.template @@ -17,7 +17,7 @@ s.required_ruby_version = '>= 2.0.0' - s.files = %w( Makefile ) + s.files = %w( Makefile .yardopts ) s.files += %w( etc/roots.pem ) s.files += Dir.glob('src/ruby/bin/**/*') s.files += Dir.glob('src/ruby/ext/**/*') @@ -33,7 +33,7 @@ s.require_paths = %w( src/ruby/bin src/ruby/lib src/ruby/pb ) s.platform = Gem::Platform::RUBY - s.add_dependency 'google-protobuf', '~> 3.0.0alpha.1.1' + s.add_dependency 'google-protobuf', '~> 3.0.0.alpha.5.0.3' s.add_dependency 'googleauth', '~> 0.5.1' s.add_development_dependency 'bundler', '~> 1.9' @@ -41,7 +41,7 @@ s.add_development_dependency 'simplecov', '~> 0.9' s.add_development_dependency 'rake', '~> 10.4' s.add_development_dependency 'rake-compiler', '~> 0.9' - s.add_development_dependency 'rake-compiler-dock', '~> 0.5' + s.add_development_dependency 'rake-compiler-dock', '~> 0.5.1' s.add_development_dependency 'rspec', '~> 3.2' s.add_development_dependency 'rubocop', '~> 0.30.0' s.add_development_dependency 'signet', '~> 0.7.0' diff --git a/templates/package.json.template b/templates/package.json.template index ec444976ed..99e8287b35 100644 --- a/templates/package.json.template +++ b/templates/package.json.template @@ -25,13 +25,12 @@ "test": "./node_modules/.bin/mocha src/node/test && npm run-script lint", "gen_docs": "./node_modules/.bin/jsdoc -c src/node/jsdoc_conf.json", "coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha src/node/test", - "preinstall": "npm install node-pre-gyp", "install": "./node_modules/.bin/node-pre-gyp install --fallback-to-build" }, + "bundledDependencies": ["node-pre-gyp"], "dependencies": { "lodash": "^3.9.3", "nan": "^2.0.0", - "node-pre-gyp": "^0.6.19", "protobufjs": "^4.0.0" }, "devDependencies": { @@ -47,7 +46,7 @@ "poisson-process": "^0.2.1" }, "engines": { - "node": ">=0.10.13" + "node": ">=0.12.0" }, "binary": { "module_name": "grpc_node", diff --git a/templates/src/python/grpcio/grpc/_cython/imports.generated.c.template b/templates/src/python/grpcio/grpc/_cython/imports.generated.c.template index be33280c0c..62fe0947d2 100644 --- a/templates/src/python/grpcio/grpc/_cython/imports.generated.c.template +++ b/templates/src/python/grpcio/grpc/_cython/imports.generated.c.template @@ -43,10 +43,19 @@ ${api.name}_type ${api.name}_import; %endfor + #ifdef __cplusplus + extern "C" { + #endif /* __cpluslus */ + void pygrpc_load_imports(HMODULE library) { %for api in c_apis: ${api.name}_import = (${api.name}_type) GetProcAddress(library, "${api.name}"); %endfor } + #ifdef __cplusplus + } + #endif /* __cpluslus */ + #endif /* !GPR_WIN32 */ + diff --git a/templates/src/python/grpcio/grpc/_cython/imports.generated.h.template b/templates/src/python/grpcio/grpc/_cython/imports.generated.h.template index 6866a61cae..8e7c183180 100644 --- a/templates/src/python/grpcio/grpc/_cython/imports.generated.h.template +++ b/templates/src/python/grpcio/grpc/_cython/imports.generated.h.template @@ -52,8 +52,16 @@ #define ${api.name} ${api.name}_import %endfor + #ifdef __cplusplus + extern "C" { + #endif /* __cpluslus */ + void pygrpc_load_imports(HMODULE library); + #ifdef __cplusplus + } + #endif /* __cpluslus */ + #else /* !GPR_WIN32 */ #include <grpc/support/alloc.h> diff --git a/templates/src/ruby/lib/grpc/version.rb.template b/templates/src/ruby/lib/grpc/version.rb.template index a47d2d8548..6488614aed 100644 --- a/templates/src/ruby/lib/grpc/version.rb.template +++ b/templates/src/ruby/lib/grpc/version.rb.template @@ -31,5 +31,5 @@ # GRPC contains the General RPC module. module GRPC - VERSION = '${settings.ruby_version}' + VERSION = '${settings.ruby_version.ruby()}' end diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index bbdb848599..ad1d92e7cb 100644 --- a/templates/tools/dockerfile/test/sanity/Dockerfile.template +++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template @@ -41,6 +41,7 @@ # Docker "inception" # Note this is quite the ugly hack. # This makes sure that the docker binary we inject has its dependencies. + RUN apt-get install libsystemd-journal0 RUN curl https://get.docker.com/ | sh RUN apt-get remove --purge -y docker-engine diff --git a/templates/tools/doxygen/Doxyfile.core.internal.template b/templates/tools/doxygen/Doxyfile.core.internal.template index ac30e0afc2..05be9d81aa 100644 --- a/templates/tools/doxygen/Doxyfile.core.internal.template +++ b/templates/tools/doxygen/Doxyfile.core.internal.template @@ -1,4 +1,4 @@ %YAML 1.2 --- | <%namespace file="Doxyfile.include" import="gen_doxyfile"/>\ - ${gen_doxyfile(['grpc'], 'Core', libs, True)} + ${gen_doxyfile(['grpc', 'gpr'], 'Core', libs, True)} diff --git a/templates/tools/doxygen/Doxyfile.core.template b/templates/tools/doxygen/Doxyfile.core.template index 679069bddc..8004294ec1 100644 --- a/templates/tools/doxygen/Doxyfile.core.template +++ b/templates/tools/doxygen/Doxyfile.core.template @@ -1,4 +1,4 @@ %YAML 1.2 --- | <%namespace file="Doxyfile.include" import="gen_doxyfile"/>\ - ${gen_doxyfile(['grpc'], 'Core', libs, False)} + ${gen_doxyfile(['grpc', 'gpr'], 'Core', libs, False)} diff --git a/templates/vsprojects/cpptest.props.template b/templates/vsprojects/cpptest.props.template index 370b6e7e93..14169d6ddf 100644 --- a/templates/vsprojects/cpptest.props.template +++ b/templates/vsprojects/cpptest.props.template @@ -10,7 +10,7 @@ <WarningLevel>EnableAllWarnings</WarningLevel> </ClCompile> <Link> - <AdditionalDependencies>grpc++_test_util.lib;grpc_test_util.lib;gtestd.lib;gflags.lib;shlwapi.lib;grpc.lib;grpc++.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>grpc++_test_util.lib;grpc_test_util.lib;gpr_test_util.lib;gtestd.lib;gflags.lib;shlwapi.lib;gpr.lib;grpc.lib;grpc++.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>$(SolutionDir)\..\third_party\gtest\msvc\gtest\Debug;$(SolutionDir)\..\third_party\gflags\lib\Debug;$(SolutionDir)\..\Debug;$(SolutionDir)\..\packages\grpc.dependencies.openssl.${vspackages_dict['grpc.dependencies.openssl'].version}\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> |