Rename the openssl framework to openssl_grpc to avoid conflict

pull/16660/head
Muxi Yan 6 years ago
parent f6e7b778c4
commit 37b9b9e8fd
  1. 3
      gRPC-Core.podspec
  2. 4
      src/objective-c/BoringSSL-GRPC.podspec
  3. 3
      templates/gRPC-Core.podspec.template
  4. 4
      templates/src/objective-c/BoringSSL-GRPC.podspec.template

@ -181,7 +181,7 @@ Pod::Spec.new do |s|
ss.header_mappings_dir = '.' ss.header_mappings_dir = '.'
ss.libraries = 'z' ss.libraries = 'z'
ss.dependency "#{s.name}/Interface", version ss.dependency "#{s.name}/Interface", version
ss.dependency 'BoringSSL-GRPC', '0.0.1' ss.dependency 'BoringSSL-GRPC', '0.0.2'
ss.dependency 'nanopb', '~> 0.3' ss.dependency 'nanopb', '~> 0.3'
ss.compiler_flags = '-DGRPC_SHADOW_BORINGSSL_SYMBOLS' ss.compiler_flags = '-DGRPC_SHADOW_BORINGSSL_SYMBOLS'
@ -1307,5 +1307,6 @@ Pod::Spec.new do |s|
s.prepare_command = <<-END_OF_COMMAND s.prepare_command = <<-END_OF_COMMAND
find src/core/ -type f ! -path '*.grpc_back' -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g' find src/core/ -type f ! -path '*.grpc_back' -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g'
find src/core/ -type f -path '*.grpc_back' -print0 | xargs -0 rm find src/core/ -type f -path '*.grpc_back' -print0 | xargs -0 rm
find src/core/ -type f -path '*.h' -or -path '*.cc' -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <openssl/;#include <openssl_grpc/;g'
END_OF_COMMAND END_OF_COMMAND
end end

@ -38,7 +38,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'BoringSSL-GRPC' s.name = 'BoringSSL-GRPC'
version = '0.0.1' version = '0.0.2'
s.version = version s.version = version
s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.' s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.'
# Adapted from the homepage: # Adapted from the homepage:
@ -81,7 +81,7 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '5.0' s.ios.deployment_target = '5.0'
s.osx.deployment_target = '10.7' s.osx.deployment_target = '10.7'
name = 'openssl' name = 'openssl_grpc'
# When creating a dynamic framework, name it openssl.framework instead of BoringSSL.framework. # When creating a dynamic framework, name it openssl.framework instead of BoringSSL.framework.
# This lets users write their includes like `#include <openssl/ssl.h>` as opposed to `#include # This lets users write their includes like `#include <openssl/ssl.h>` as opposed to `#include

@ -174,7 +174,7 @@
ss.header_mappings_dir = '.' ss.header_mappings_dir = '.'
ss.libraries = 'z' ss.libraries = 'z'
ss.dependency "#{s.name}/Interface", version ss.dependency "#{s.name}/Interface", version
ss.dependency 'BoringSSL-GRPC', '0.0.1' ss.dependency 'BoringSSL-GRPC', '0.0.2'
ss.dependency 'nanopb', '~> 0.3' ss.dependency 'nanopb', '~> 0.3'
ss.compiler_flags = '-DGRPC_SHADOW_BORINGSSL_SYMBOLS' ss.compiler_flags = '-DGRPC_SHADOW_BORINGSSL_SYMBOLS'
@ -223,5 +223,6 @@
s.prepare_command = <<-END_OF_COMMAND s.prepare_command = <<-END_OF_COMMAND
find src/core/ -type f ! -path '*.grpc_back' -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g' find src/core/ -type f ! -path '*.grpc_back' -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g'
find src/core/ -type f -path '*.grpc_back' -print0 | xargs -0 rm find src/core/ -type f -path '*.grpc_back' -print0 | xargs -0 rm
find src/core/ -type f -path '*.h' -or -path '*.cc' -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <openssl/;#include <openssl_grpc/;g'
END_OF_COMMAND END_OF_COMMAND
end end

@ -43,7 +43,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'BoringSSL-GRPC' s.name = 'BoringSSL-GRPC'
version = '0.0.1' version = '0.0.2'
s.version = version s.version = version
s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.' s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.'
# Adapted from the homepage: # Adapted from the homepage:
@ -86,7 +86,7 @@
s.ios.deployment_target = '5.0' s.ios.deployment_target = '5.0'
s.osx.deployment_target = '10.7' s.osx.deployment_target = '10.7'
name = 'openssl' name = 'openssl_grpc'
# When creating a dynamic framework, name it openssl.framework instead of BoringSSL.framework. # When creating a dynamic framework, name it openssl.framework instead of BoringSSL.framework.
# This lets users write their includes like `#include <openssl/ssl.h>` as opposed to `#include # This lets users write their includes like `#include <openssl/ssl.h>` as opposed to `#include

Loading…
Cancel
Save