Merge pull request #2 from merlimat/build-standalone-client

PIP-209: Build C++ client in standalone repo

Author: BewareMyPower

CMakeLists.txt

@@ -22,7 +22,14 @@ cmake_minimum_required(VERSION 3.4)
 project (pulsar-cpp)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules")
 
-execute_process(COMMAND ${CMAKE_SOURCE_DIR}/../src/gen-pulsar-version-macro.py OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PVM)
+execute_process(COMMAND cat ${CMAKE_SOURCE_DIR}/version.txt OUTPUT_STRIP_TRAILING_WHITESPACE
+            OUTPUT_VARIABLE PULSAR_CLIENT_VERSION)
+message(STATUS "Pulsar Client version: ${PULSAR_CLIENT_VERSION}")
+
+execute_process(COMMAND ${CMAKE_SOURCE_DIR}/build-support/gen-pulsar-version-macro.py OUTPUT_STRIP_TRAILING_WHITESPACE
+        OUTPUT_VARIABLE PULSAR_CLIENT_VERSION_MACRO)
+message(STATUS "Pulsar Client version macro: ${PULSAR_CLIENT_VERSION_MACRO}")
+
 set(PVM_COMMENT "This is generated from Version.h.in by CMAKE. DO NOT EDIT DIRECTLY")
 configure_file(templates/Version.h.in include/pulsar/Version.h @ONLY)
 
@@ -221,7 +228,7 @@ else()
         find_library(LIB_SNAPPY NAMES snappy libsnappy)
     endif ()
 
-    find_package(CURL REQUIRED)
+        find_package(CURL REQUIRED)
     if (${CMAKE_VERSION} VERSION_GREATER "3.12")
         set(COMMON_LIBS ${COMMON_LIBS} CURL::libcurl)
     endif ()

build-support/gen-pulsar-version-macro.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+#
+
+import re, sys, os
+
+dirname = os.path.abspath(os.path.dirname(sys.argv[0]))
+version_file = os.path.join(dirname, "..", "version.txt")
+version = open(version_file).read()
+m = re.search(r'^(\d+)\.(\d+)\.(\d+)', version)
+
+version_macro = 0
+for i in range(3):
+    version_macro += int(m.group(3 - i)) * (1000 ** i)
+print(version_macro)

lib/CMakeLists.txt

@@ -19,9 +19,6 @@
 
 file(GLOB PULSAR_SOURCES *.cc *.h lz4/*.cc lz4/*.h checksum/*.cc checksum/*.h stats/*.cc stats/*.h c/*.cc c/*.h auth/*.cc auth/*.h auth/athenz/*.cc auth/athenz/*.h)
 
-execute_process(COMMAND ${CMAKE_SOURCE_DIR}/../src/get-project-version.py OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PV)
-set (CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -D_PULSAR_VERSION_INTERNAL_=\\\"${PV}\\\"")
-
 if (NOT PROTOC_PATH)
     set(PROTOC_PATH protoc)
 endif()
@@ -36,9 +33,9 @@ set(PROTO_SOURCES ${LIB_AUTOGEN_DIR}/PulsarApi.pb.cc ${LIB_AUTOGEN_DIR}/PulsarAp
 set(PULSAR_SOURCES ${PULSAR_SOURCES} ${PROTO_SOURCES})
 ADD_CUSTOM_COMMAND(
          OUTPUT ${PROTO_SOURCES}
-         COMMAND ${PROTOC_PATH} -I ../../pulsar-common/src/main/proto ../../pulsar-common/src/main/proto/PulsarApi.proto --cpp_out=${LIB_AUTOGEN_DIR}
+         COMMAND ${PROTOC_PATH} -I ../proto ../proto/PulsarApi.proto --cpp_out=${LIB_AUTOGEN_DIR}
          DEPENDS
-         ../../pulsar-common/src/main/proto/PulsarApi.proto
+         ../proto/PulsarApi.proto
          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(LIBRARY_VERSION $ENV{PULSAR_LIBRARY_VERSION})

lib/Commands.cc

@@ -18,7 +18,7 @@
  */
 #include "Commands.h"
 #include "MessageImpl.h"
-#include "VersionInternal.h"
+#include "pulsar/Version.h"
 #include "pulsar/MessageBuilder.h"
 #include "LogUtils.h"
 #include "PulsarApi.pb.h"
@@ -217,7 +217,7 @@ SharedBuffer Commands::newConnect(const AuthenticationPtr& authentication, const
     BaseCommand cmd;
     cmd.set_type(BaseCommand::CONNECT);
     CommandConnect* connect = cmd.mutable_connect();
-    connect->set_client_version(_PULSAR_VERSION_INTERNAL_);
+    connect->set_client_version(PULSAR_VERSION_STR);
     connect->set_auth_method_name(authentication->getAuthMethodName());
     connect->set_protocol_version(ProtocolVersion_MAX);
 
@@ -245,7 +245,7 @@ SharedBuffer Commands::newAuthResponse(const AuthenticationPtr& authentication,
     BaseCommand cmd;
     cmd.set_type(BaseCommand::AUTH_RESPONSE);
     CommandAuthResponse* authResponse = cmd.mutable_authresponse();
-    authResponse->set_client_version(_PULSAR_VERSION_INTERNAL_);
+    authResponse->set_client_version(PULSAR_VERSION_STR);
 
     AuthData* authData = authResponse->mutable_response();
     authData->set_auth_method_name(authentication->getAuthMethodName());

lib/HTTPLookupService.cc

@@ -157,7 +157,7 @@ Result HTTPLookupService::sendHTTPRequest(std::string completeUrl, std::string &
     while (++reqCount <= MAX_HTTP_REDIRECTS) {
         CURL *handle;
         CURLcode res;
-        std::string version = std::string("Pulsar-CPP-v") + _PULSAR_VERSION_INTERNAL_;
+        std::string version = std::string("Pulsar-CPP-v") + PULSAR_VERSION_STR;
         handle = curl_easy_init();
 
         if (!handle) {

lib/HTTPLookupService.h

@@ -22,7 +22,7 @@
 #include <lib/LookupService.h>
 #include <lib/ClientImpl.h>
 #include <lib/Url.h>
-#include <lib/VersionInternal.h>
+#include <pulsar/Version.h>
 #include <lib/ServiceNameResolver.h>
 
 namespace pulsar {