Added version macros (#31033)

BUILD

@@ -363,6 +363,7 @@ GRPCXX_PUBLIC_HDRS = [
     "include/grpcpp/server_builder.h",
     "include/grpcpp/server_context.h",
     "include/grpcpp/server_posix.h",
+    "include/grpcpp/version_info.h",
     "include/grpcpp/support/async_stream.h",
     "include/grpcpp/support/async_unary_call.h",
     "include/grpcpp/support/byte_buffer.h",

CMakeLists.txt

@@ -3483,6 +3483,7 @@ foreach(_hdr
   include/grpcpp/support/sync_stream.h
   include/grpcpp/support/time.h
   include/grpcpp/support/validate_service_config.h
+  include/grpcpp/version_info.h
   include/grpcpp/xds_server_builder.h
 )
   string(REPLACE "include/" "" _path ${_hdr})
@@ -4155,6 +4156,7 @@ foreach(_hdr
   include/grpcpp/support/sync_stream.h
   include/grpcpp/support/time.h
   include/grpcpp/support/validate_service_config.h
+  include/grpcpp/version_info.h
 )
   string(REPLACE "include/" "" _path ${_hdr})
   get_filename_component(_path ${_path} PATH)

build_autogenerated.yaml

@@ -2866,6 +2866,7 @@ libs:
   - include/grpcpp/support/sync_stream.h
   - include/grpcpp/support/time.h
   - include/grpcpp/support/validate_service_config.h
+  - include/grpcpp/version_info.h
   - include/grpcpp/xds_server_builder.h
   headers:
   - src/core/ext/transport/binder/client/binder_connector.h
@@ -3281,6 +3282,7 @@ libs:
   - include/grpcpp/support/sync_stream.h
   - include/grpcpp/support/time.h
   - include/grpcpp/support/validate_service_config.h
+  - include/grpcpp/version_info.h
   headers:
   - src/cpp/client/create_channel_internal.h
   - src/cpp/common/channel_filter.h

gRPC-C++.podspec

@@ -194,6 +194,7 @@ Pod::Spec.new do |s|
                       'include/grpcpp/support/sync_stream.h',
                       'include/grpcpp/support/time.h',
                       'include/grpcpp/support/validate_service_config.h',
+                      'include/grpcpp/version_info.h',
                       'include/grpcpp/xds_server_builder.h'
   end
 

include/grpcpp/grpcpp.h

@@ -58,6 +58,7 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 #include <grpcpp/server_posix.h>
+#include <grpcpp/version_info.h>
 // IWYU pragma: end_exports
 
 namespace grpc {

include/grpcpp/version_info.h

@@ -0,0 +1,27 @@
+// Copyright 2022 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.
+
+/* This file is autogenerated from:
+   templates/include/grpcpp/version_info.h.template */
+
+#ifndef GRPCPP_VERSION_INFO_H
+#define GRPCPP_VERSION_INFO_H
+
+#define GRPC_CPP_VERSION_MAJOR 1
+#define GRPC_CPP_VERSION_MINOR 51
+#define GRPC_CPP_VERSION_PATCH 0
+#define GRPC_CPP_VERSION_TAG "dev"
+#define GRPC_CPP_VERSION_STRING "1.51.0-dev"
+
+#endif  // GRPCPP_VERSION_INFO_H

src/cpp/common/version_cc.cc

@@ -16,14 +16,11 @@
  *
  */
 
-/* This file is autogenerated from:
-   templates/src/cpp/common/version_cc.cc.template */
-
 #include <string>
 
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/config.h>
 
 namespace grpc {
-std::string Version() { return "1.51.0-dev"; }
+std::string Version() { return GRPC_CPP_VERSION_STRING; }
 }  // namespace grpc

templates/include/grpcpp/version_info.h.template

@@ -0,0 +1,29 @@
+%YAML 1.2
+--- |
+  // Copyright 2022 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.
+
+  /* This file is autogenerated from:
+     templates/include/grpcpp/version_info.h.template */
+
+  #ifndef GRPCPP_VERSION_INFO_H
+  #define GRPCPP_VERSION_INFO_H
+
+  #define GRPC_CPP_VERSION_MAJOR ${settings.cpp_version.major}
+  #define GRPC_CPP_VERSION_MINOR ${settings.cpp_version.minor}
+  #define GRPC_CPP_VERSION_PATCH ${settings.cpp_version.patch}
+  #define GRPC_CPP_VERSION_TAG "${settings.cpp_version.tag or ''}"
+  #define GRPC_CPP_VERSION_STRING "${settings.cpp_version}"
+
+  #endif  // GRPCPP_VERSION_INFO_H

templates/src/cpp/common/version_cc.cc.template

@@ -1,31 +0,0 @@
-%YAML 1.2
---- |
-  /*
-   *
-   * Copyright 2016 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.
-   *
-   */
-
-  /* This file is autogenerated from:
-     templates/src/cpp/common/version_cc.cc.template */
-
-  #include <string>
-  
-  #include <grpcpp/grpcpp.h>
-  #include <grpcpp/support/config.h>
-
-  namespace grpc {
-  std::string Version() { return "${settings.cpp_version}"; }
-  }  // namespace grpc

tools/doxygen/Doxyfile.c++

@@ -1059,6 +1059,7 @@ include/grpcpp/support/stub_options.h \
 include/grpcpp/support/sync_stream.h \
 include/grpcpp/support/time.h \
 include/grpcpp/support/validate_service_config.h \
+include/grpcpp/version_info.h \
 include/grpcpp/xds_server_builder.h
 
 # This tag can be used to specify the character encoding of the source files

tools/doxygen/Doxyfile.c++.internal

@@ -1059,6 +1059,7 @@ include/grpcpp/support/stub_options.h \
 include/grpcpp/support/sync_stream.h \
 include/grpcpp/support/time.h \
 include/grpcpp/support/validate_service_config.h \
+include/grpcpp/version_info.h \
 include/grpcpp/xds_server_builder.h \
 src/core/ext/filters/census/grpc_context.cc \
 src/core/ext/filters/channel_idle/channel_idle_filter.cc \