Imported Upstream version 1.24.2

diff --git a/BUILD b/BUILD
index 13ce1e9..182650c 100644 (file)
--- a/BUILD
+++ b/BUILD
@@ -81,7 +81,7 @@ g_stands_for = "ganges"
 
 core_version = "7.0.0"
 
-version = "1.24.1"
+version = "1.24.2"
 
 GPR_PUBLIC_HDRS = [
     "include/grpc/support/alloc.h",

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54dc212..ecd7c46 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@
 cmake_minimum_required(VERSION 3.5.1)
 
 set(PACKAGE_NAME      "grpc")
-set(PACKAGE_VERSION   "1.24.1")
+set(PACKAGE_VERSION   "1.24.2")
 set(PACKAGE_STRING    "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set(PACKAGE_TARNAME   "${PACKAGE_NAME}-${PACKAGE_VERSION}")
 set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")

diff --git a/Makefile b/Makefile
index 8de7287..ceb21b2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -461,8 +461,8 @@ Q = @
 endif
 
 CORE_VERSION = 8.0.0
-CPP_VERSION = 1.24.1
-CSHARP_VERSION = 2.24.1
+CPP_VERSION = 1.24.2
+CSHARP_VERSION = 2.24.2
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

diff --git a/build.yaml b/build.yaml
index b976be2..c114880 100644 (file)
--- a/build.yaml
+++ b/build.yaml
@@ -15,7 +15,7 @@ settings:
   core_version: 8.0.0
   csharp_major_version: 2
   g_stands_for: ganges
-  version: 1.24.1
+  version: 1.24.2
 filegroups:
 - name: alts_tsi
   headers:

diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 3fe0987..5845fd9 100644 (file)
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -23,7 +23,7 @@
 Pod::Spec.new do |s|
   s.name     = 'gRPC-C++'
   # TODO (mxyan): use version that match gRPC version when pod is stabilized
-  # version = '1.24.1'
+  # version = '1.24.2'
   version = '0.0.9'
   s.version  = version
   s.summary  = 'gRPC C++ library'
@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
   s.license  = 'Apache License, Version 2.0'
   s.authors  = { 'The gRPC contributors' => 'grpc-packages@google.com' }
 
-  grpc_version = '1.24.1'
+  grpc_version = '1.24.2'
 
   s.source = {
     :git => 'https://github.com/grpc/grpc.git',

diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 5dcd830..78811e7 100644 (file)
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -22,7 +22,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-Core'
-  version = '1.24.1'
+  version = '1.24.2'
   s.version  = version
   s.summary  = 'Core cross-platform gRPC library, written in C'
   s.homepage = 'https://grpc.io'

diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec
index 813e763..b5a5f69 100644 (file)
--- a/gRPC-ProtoRPC.podspec
+++ b/gRPC-ProtoRPC.podspec
@@ -21,7 +21,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-ProtoRPC'
-  version = '1.24.1'
+  version = '1.24.2'
   s.version  = version
   s.summary  = 'RPC library for Protocol Buffers, based on gRPC'
   s.homepage = 'https://grpc.io'

diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec
index f551407..13dbd06 100644 (file)
--- a/gRPC-RxLibrary.podspec
+++ b/gRPC-RxLibrary.podspec
@@ -21,7 +21,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-RxLibrary'
-  version = '1.24.1'
+  version = '1.24.2'
   s.version  = version
   s.summary  = 'Reactive Extensions library for iOS/OSX.'
   s.homepage = 'https://grpc.io'

diff --git a/gRPC.podspec b/gRPC.podspec
index 45464f6..3eb9d50 100644 (file)
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -20,7 +20,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC'
-  version = '1.24.1'
+  version = '1.24.2'
   s.version  = version
   s.summary  = 'gRPC client library for iOS/OSX'
   s.homepage = 'https://grpc.io'
@@ -117,11 +117,9 @@ Pod::Spec.new do |s|
                              'src/objective-c/GRPCClient/GRPCCall+Cronet.h',
                              'src/objective-c/GRPCClient/GRPCCall+OAuth2.h',
                              'src/objective-c/GRPCClient/GRPCCall+Tests.h',
-                             'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h',
-                             'src/objective-c/GRPCClient/internal_testing/*.h'
+                             'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h'
     ss.private_header_files = 'src/objective-c/GRPCClient/private/GRPCCore/*.h'
-    ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.{h,m}',
-                      'src/objective-c/GRPCClient/private/GRPCCore/*.{h,m}',
+    ss.source_files = 'src/objective-c/GRPCClient/private/GRPCCore/*.{h,m}',
                       'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h',
                       'src/objective-c/GRPCClient/GRPCCall+ChannelArg.m',
                       'src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.h',
@@ -170,4 +168,16 @@ Pod::Spec.new do |s|
     ss.tvos.deployment_target = '10.0'
     ss.watchos.deployment_target = '4.0'
   end
+
+  s.subspec 'InternalTesting' do |ss|
+    ss.dependency "#{s.name}/GRPCCore", version
+    ss.public_header_files = 'src/objective-c/GRPCClient/internal_testing/*.h'
+    ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.{h,m}'
+    ss.header_mappings_dir = 'src/objective-c/GRPCClient'
+
+    ss.ios.deployment_target = '7.0'
+    ss.osx.deployment_target = '10.9'
+    ss.tvos.deployment_target = '10.0'
+    ss.watchos.deployment_target = '4.0'
+  end
 end

diff --git a/package.xml b/package.xml
index ad9fa2b..935ecb6 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -13,8 +13,8 @@
  <date>2018-01-19</date>
  <time>16:06:07</time>
  <version>
-  <release>1.24.1</release>
-  <api>1.24.1</api>
+  <release>1.24.2</release>
+  <api>1.24.2</api>
  </version>
  <stability>
   <release>stable</release>

diff --git a/setup.py b/setup.py
index 7e65a8d..1c66899 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -29,6 +29,9 @@ import sysconfig
 import setuptools
 from setuptools.command import egg_info
 
+import subprocess
+from subprocess import PIPE
+
 # Redirect the manifest template from MANIFEST.in to PYTHON-MANIFEST.in.
 egg_info.manifest_maker.template = 'PYTHON-MANIFEST.in'
 
@@ -136,6 +139,17 @@ ENABLE_CYTHON_TRACING = os.environ.get(
 ENABLE_DOCUMENTATION_BUILD = os.environ.get(
     'GRPC_PYTHON_ENABLE_DOCUMENTATION_BUILD', False)
 
+def check_linker_need_libatomic():
+  """Test if linker on system needs libatomic."""
+  code_test = (b'#include <atomic>\n' +
+               b'int main() { return std::atomic<int64_t>{}; }')
+  cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
+                             stdin=PIPE,
+                             stdout=PIPE,
+                             stderr=PIPE)
+  cc_test.communicate(input=code_test)
+  return cc_test.returncode != 0
+
 # There are some situations (like on Windows) where CC, CFLAGS, and LDFLAGS are
 # entirely ignored/dropped/forgotten by distutils and its Cygwin/MinGW support.
 # We use these environment variables to thus get around that without locking
@@ -171,15 +185,17 @@ if EXTRA_ENV_LINK_ARGS is None:
   EXTRA_ENV_LINK_ARGS = ''
   if "linux" in sys.platform or "darwin" in sys.platform:
     EXTRA_ENV_LINK_ARGS += ' -lpthread'
+    if check_linker_need_libatomic():
+      EXTRA_ENV_LINK_ARGS += ' -latomic'
   elif "win32" in sys.platform and sys.version_info < (3, 5):
     msvcr = cygwinccompiler.get_msvcr()[0]
     # TODO(atash) sift through the GCC specs to see if libstdc++ can have any
     # influence on the linkage outcome on MinGW for non-C++ programs.
     EXTRA_ENV_LINK_ARGS += (
-        ' -static-libgcc -static-libstdc++ -mcrtdll={msvcr} '
-        '-static'.format(msvcr=msvcr))
+        ' -static-libgcc -static-libstdc++ -mcrtdll={msvcr}'
+        ' -static'.format(msvcr=msvcr))
   if "linux" in sys.platform:
-    EXTRA_ENV_LINK_ARGS += ' -Wl,-wrap,memcpy  -static-libgcc'
+    EXTRA_ENV_LINK_ARGS += ' -Wl,-wrap,memcpy -static-libgcc'
 
 EXTRA_COMPILE_ARGS = shlex.split(EXTRA_ENV_COMPILE_ARGS)
 EXTRA_LINK_ARGS = shlex.split(EXTRA_ENV_LINK_ARGS)

diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc
index 988d924..6a692d7 100644 (file)
--- a/src/cpp/common/version_cc.cc
+++ b/src/cpp/common/version_cc.cc
@@ -22,5 +22,5 @@
 #include <grpcpp/grpcpp.h>
 
 namespace grpc {
-grpc::string Version() { return "1.24.1"; }
+grpc::string Version() { return "1.24.2"; }
 }  // namespace grpc

diff --git a/src/csharp/Grpc.Core.Api/VersionInfo.cs b/src/csharp/Grpc.Core.Api/VersionInfo.cs
index 304a3a1..0e67c9d 100644 (file)
--- a/src/csharp/Grpc.Core.Api/VersionInfo.cs
+++ b/src/csharp/Grpc.Core.Api/VersionInfo.cs
@@ -33,11 +33,11 @@ namespace Grpc.Core
         /// <summary>
         /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
         /// </summary>
-        public const string CurrentAssemblyFileVersion = "2.24.1.0";
+        public const string CurrentAssemblyFileVersion = "2.24.2.0";
 
         /// <summary>
         /// Current version of gRPC C#
         /// </summary>
-        public const string CurrentVersion = "2.24.1";
+        public const string CurrentVersion = "2.24.2";
     }
 }

diff --git a/src/csharp/build/dependencies.props b/src/csharp/build/dependencies.props
index ac572ca..905f7fe 100644 (file)
--- a/src/csharp/build/dependencies.props
+++ b/src/csharp/build/dependencies.props
@@ -1,7 +1,7 @@
 <!-- This file is generated -->
 <Project>
   <PropertyGroup>
-    <GrpcCsharpVersion>2.24.1</GrpcCsharpVersion>
+    <GrpcCsharpVersion>2.24.2</GrpcCsharpVersion>
     <GoogleProtobufVersion>3.8.0</GoogleProtobufVersion>
   </PropertyGroup>
 </Project>

diff --git a/src/csharp/build_unitypackage.bat b/src/csharp/build_unitypackage.bat
index 1166601..15c67bb 100644 (file)
--- a/src/csharp/build_unitypackage.bat
+++ b/src/csharp/build_unitypackage.bat
@@ -13,7 +13,7 @@
 @rem limitations under the License.
 
 @rem Current package versions
-set VERSION=2.24.1
+set VERSION=2.24.2
 
 @rem Adjust the location of nuget.exe
 set NUGET=C:\nuget\nuget.exe

diff --git a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
index c04b229..3538964 100644 (file)
--- a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
+++ b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
   # before them.
   s.name     = '!ProtoCompiler-gRPCCppPlugin'
-  v = '1.24.1'
+  v = '1.24.2'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates C++ files from .proto services.'
   s.description = <<-DESC

diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
index d90d111..6237d3f 100644 (file)
--- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
+++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
   # before them.
   s.name     = '!ProtoCompiler-gRPCPlugin'
-  v = '1.24.1'
+  v = '1.24.2'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
   s.description = <<-DESC

diff --git a/src/objective-c/GRPCClient/version.h b/src/objective-c/GRPCClient/version.h
index 332e8df..2567296 100644 (file)
--- a/src/objective-c/GRPCClient/version.h
+++ b/src/objective-c/GRPCClient/version.h
@@ -22,4 +22,4 @@
 // instead. This file can be regenerated from the template by running
 // `tools/buildgen/generate_projects.sh`.
 
-#define GRPC_OBJC_VERSION_STRING @"1.24.1"
+#define GRPC_OBJC_VERSION_STRING @"1.24.2"

diff --git a/src/objective-c/tests/Podfile b/src/objective-c/tests/Podfile
index c83e886..4d67752 100644 (file)
--- a/src/objective-c/tests/Podfile
+++ b/src/objective-c/tests/Podfile
@@ -13,10 +13,10 @@ def grpc_deps
   
   pod 'BoringSSL-GRPC',       :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c", :inhibit_warnings => true
   
-  pod 'gRPC',           :path => GRPC_LOCAL_SRC
-  pod 'gRPC-Core',      :path => GRPC_LOCAL_SRC
-  pod 'gRPC-RxLibrary', :path => GRPC_LOCAL_SRC
-  pod 'gRPC-ProtoRPC',  :path => GRPC_LOCAL_SRC, :inhibit_warnings => true
+  pod 'gRPC/InternalTesting',           :path => GRPC_LOCAL_SRC
+  pod 'gRPC-Core',                      :path => GRPC_LOCAL_SRC
+  pod 'gRPC-RxLibrary',                 :path => GRPC_LOCAL_SRC
+  pod 'gRPC-ProtoRPC',                  :path => GRPC_LOCAL_SRC, :inhibit_warnings => true
   pod 'RemoteTest', :path => "RemoteTestClient", :inhibit_warnings => true
 end
 

diff --git a/src/objective-c/tests/version.h b/src/objective-c/tests/version.h
index 2cc7025..db16988 100644 (file)
--- a/src/objective-c/tests/version.h
+++ b/src/objective-c/tests/version.h
@@ -22,5 +22,5 @@
 // instead. This file can be regenerated from the template by running
 // `tools/buildgen/generate_projects.sh`.
 
-#define GRPC_OBJC_VERSION_STRING @"1.24.1"
+#define GRPC_OBJC_VERSION_STRING @"1.24.2"
 #define GRPC_C_VERSION_STRING @"8.0.0"

diff --git a/src/php/composer.json b/src/php/composer.json
index 7054b84..737028c 100644 (file)
--- a/src/php/composer.json
+++ b/src/php/composer.json
@@ -2,7 +2,7 @@
   "name": "grpc/grpc-dev",
   "description": "gRPC library for PHP - for Developement use only",
   "license": "Apache-2.0",
-  "version": "1.24.1",
+  "version": "1.24.2",
   "require": {
     "php": ">=5.5.0",
     "google/protobuf": "^v3.3.0"

diff --git a/src/php/ext/grpc/version.h b/src/php/ext/grpc/version.h
index 70709f5..a58e5a2 100644 (file)
--- a/src/php/ext/grpc/version.h
+++ b/src/php/ext/grpc/version.h
@@ -20,6 +20,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define PHP_GRPC_VERSION "1.24.1"
+#define PHP_GRPC_VERSION "1.24.2"
 
 #endif /* VERSION_H */

diff --git a/src/python/grpcio/grpc/_grpcio_metadata.py b/src/python/grpcio/grpc/_grpcio_metadata.py
index 3157f10..6380948 100644 (file)
--- a/src/python/grpcio/grpc/_grpcio_metadata.py
+++ b/src/python/grpcio/grpc/_grpcio_metadata.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!!
 
-__version__ = """1.24.1"""
+__version__ = """1.24.2"""

diff --git a/src/python/grpcio/grpc_version.py b/src/python/grpcio/grpc_version.py
index 37985cb..e72c465 100644 (file)
--- a/src/python/grpcio/grpc_version.py
+++ b/src/python/grpcio/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
 
-VERSION = '1.24.1'
+VERSION = '1.24.2'

diff --git a/src/python/grpcio_channelz/grpc_version.py b/src/python/grpcio_channelz/grpc_version.py
index 7deadf6..c2945d4 100644 (file)
--- a/src/python/grpcio_channelz/grpc_version.py
+++ b/src/python/grpcio_channelz/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/grpc_version.py.template`!!!
 
-VERSION = '1.24.1'
+VERSION = '1.24.2'

diff --git a/src/python/grpcio_health_checking/grpc_version.py b/src/python/grpcio_health_checking/grpc_version.py
index 643458e..e105ce5 100644 (file)
--- a/src/python/grpcio_health_checking/grpc_version.py
+++ b/src/python/grpcio_health_checking/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!
 
-VERSION = '1.24.1'
+VERSION = '1.24.2'

diff --git a/src/python/grpcio_reflection/grpc_version.py b/src/python/grpcio_reflection/grpc_version.py
index 1b1a63e..880ddbf 100644 (file)
--- a/src/python/grpcio_reflection/grpc_version.py
+++ b/src/python/grpcio_reflection/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!
 
-VERSION = '1.24.1'
+VERSION = '1.24.2'

diff --git a/src/python/grpcio_status/grpc_version.py b/src/python/grpcio_status/grpc_version.py
index d3c180c..809dcfa 100644 (file)
--- a/src/python/grpcio_status/grpc_version.py
+++ b/src/python/grpcio_status/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_status/grpc_version.py.template`!!!
 
-VERSION = '1.24.1'
+VERSION = '1.24.2'

diff --git a/src/python/grpcio_testing/grpc_version.py b/src/python/grpcio_testing/grpc_version.py
index b60937c..d88211f 100644 (file)
--- a/src/python/grpcio_testing/grpc_version.py
+++ b/src/python/grpcio_testing/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!!
 
-VERSION = '1.24.1'
+VERSION = '1.24.2'

diff --git a/src/python/grpcio_tests/grpc_version.py b/src/python/grpcio_tests/grpc_version.py
index 78f083c..be0ae55 100644 (file)
--- a/src/python/grpcio_tests/grpc_version.py
+++ b/src/python/grpcio_tests/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!
 
-VERSION = '1.24.1'
+VERSION = '1.24.2'

diff --git a/src/ruby/lib/grpc/version.rb b/src/ruby/lib/grpc/version.rb
index af90e61..b1760a0 100644 (file)
--- a/src/ruby/lib/grpc/version.rb
+++ b/src/ruby/lib/grpc/version.rb
@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.24.1'
+  VERSION = '1.24.2'
 end

diff --git a/src/ruby/tools/version.rb b/src/ruby/tools/version.rb
index 49d4c59..863aa76 100644 (file)
--- a/src/ruby/tools/version.rb
+++ b/src/ruby/tools/version.rb
@@ -14,6 +14,6 @@
 
 module GRPC
   module Tools
-    VERSION = '1.24.1'
+    VERSION = '1.24.2'
   end
 end

diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template
index e8afdb1..6420045 100644 (file)
--- a/templates/gRPC.podspec.template
+++ b/templates/gRPC.podspec.template
@@ -119,11 +119,9 @@
                                'src/objective-c/GRPCClient/GRPCCall+Cronet.h',
                                'src/objective-c/GRPCClient/GRPCCall+OAuth2.h',
                                'src/objective-c/GRPCClient/GRPCCall+Tests.h',
-                               'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h',
-                               'src/objective-c/GRPCClient/internal_testing/*.h'
+                               'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h'
       ss.private_header_files = 'src/objective-c/GRPCClient/private/GRPCCore/*.h'
-      ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.{h,m}',
-                        'src/objective-c/GRPCClient/private/GRPCCore/*.{h,m}',
+      ss.source_files = 'src/objective-c/GRPCClient/private/GRPCCore/*.{h,m}',
                         'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h',
                         'src/objective-c/GRPCClient/GRPCCall+ChannelArg.m',
                         'src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.h',
@@ -172,4 +170,16 @@
       ss.tvos.deployment_target = '10.0'
       ss.watchos.deployment_target = '4.0'
     end
+
+    s.subspec 'InternalTesting' do |ss|
+      ss.dependency "#{s.name}/GRPCCore", version
+      ss.public_header_files = 'src/objective-c/GRPCClient/internal_testing/*.h'
+      ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.{h,m}'
+      ss.header_mappings_dir = 'src/objective-c/GRPCClient'
+
+      ss.ios.deployment_target = '7.0'
+      ss.osx.deployment_target = '10.9'
+      ss.tvos.deployment_target = '10.0'
+      ss.watchos.deployment_target = '4.0'
+    end
   end

diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py
index 377502e..f478434 100644 (file)
--- a/tools/distrib/python/grpcio_tools/grpc_version.py
+++ b/tools/distrib/python/grpcio_tools/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION = '1.24.1'
+VERSION = '1.24.2'

diff --git a/tools/distrib/python/grpcio_tools/setup.py b/tools/distrib/python/grpcio_tools/setup.py
index e83e08b..7325e4b 100644 (file)
--- a/tools/distrib/python/grpcio_tools/setup.py
+++ b/tools/distrib/python/grpcio_tools/setup.py
@@ -29,6 +29,9 @@ import sysconfig
 import setuptools
 from setuptools.command import build_ext
 
+import subprocess
+from subprocess import PIPE
+
 # TODO(atash) add flag to disable Cython use
 
 _PACKAGE_PATH = os.path.realpath(os.path.dirname(__file__))
@@ -62,6 +65,20 @@ PY3 = sys.version_info.major == 3
 # to have been generated by building first *with* Cython support.
 BUILD_WITH_CYTHON = os.environ.get('GRPC_PYTHON_BUILD_WITH_CYTHON', False)
 
+
+def check_linker_need_libatomic():
+    """Test if linker on system needs libatomic."""
+    code_test = (b'#include <atomic>\n' +
+                 b'int main() { return std::atomic<int64_t>{}; }')
+    cc_test = subprocess.Popen(
+        ['cc', '-x', 'c++', '-std=c++11', '-'],
+        stdin=PIPE,
+        stdout=PIPE,
+        stderr=PIPE)
+    cc_test.communicate(input=code_test)
+    return cc_test.returncode != 0
+
+
 # There are some situations (like on Windows) where CC, CFLAGS, and LDFLAGS are
 # entirely ignored/dropped/forgotten by distutils and its Cygwin/MinGW support.
 # We use these environment variables to thus get around that without locking
@@ -93,6 +110,8 @@ if EXTRA_ENV_LINK_ARGS is None:
     EXTRA_ENV_LINK_ARGS = ''
     if "linux" in sys.platform or "darwin" in sys.platform:
         EXTRA_ENV_LINK_ARGS += ' -lpthread'
+        if check_linker_need_libatomic():
+            EXTRA_ENV_LINK_ARGS += ' -latomic'
     elif "win32" in sys.platform and sys.version_info < (3, 5):
         msvcr = cygwinccompiler.get_msvcr()[0]
         # TODO(atash) sift through the GCC specs to see if libstdc++ can have any

diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index a203a2a..63d6a1b 100644 (file)
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.24.1
+PROJECT_NUMBER         = 1.24.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index e8b4f1a..dfd6c03 100644 (file)
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.24.1
+PROJECT_NUMBER         = 1.24.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a