Merge pull request #33 from tarantool/static-build

Builtin mosquitto library

Author: dedok

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "third_party/mosquitto"]
 	path = third_party/mosquitto
 	url = https://github.com/eclipse/mosquitto
+	tag = v1.6.2

.travis.yml

@@ -15,7 +15,6 @@ env:
       - OS=fedora DIST=26
       - OS=fedora DIST=27
       - OS=ubuntu DIST=xenial
-      - OS=ubuntu DIST=artful
       - OS=ubuntu DIST=bionic
       - OS=ubuntu DIST=cosmic
       - OS=debian DIST=jessie

CMakeLists.txt

@@ -8,19 +8,20 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 find_package(Tarantool REQUIRED)
 include_directories(${TARANTOOL_INCLUDE_DIRS})
 
-find_package(Mosquitto REQUIRED)
-include_directories(${MOSQUITTO_INCLUDE_DIRS})
+if (NOT DEFINED STATIC_BUILD)
+	find_package(Mosquitto REQUIRED)
+	include_directories(${MOSQUITTO_INCLUDE_DIRS})
+	message(STATUS "libmosquitto: ${MOSQUITTO_INCLUDE_DIRS} ${MOSQUITTO_LIBRARIES}")
+endif()
 
 message(STATUS "tarantool: ${TARANTOOL_INCLUDE_DIRS}")
-message(STATUS "libmosquitto: ${MOSQUITTO_INCLUDE_DIRS} ${MOSQUITTO_LIBRARIES}")
 
 # Set CFLAGS
 set(MY_C_FLAGS "-Wall -Wextra -Werror -std=gnu11 -fno-strict-aliasing")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${MY_C_FLAGS}")
 
-include_directories(${TARANTOOL_INCLUDE_DIRS}
-                    ${MOSQUITTO_INCLUDE_DIRS})
+include_directories(${TARANTOOL_INCLUDE_DIRS})
 
 # Build module
 add_subdirectory(mqtt)

README.md

@@ -39,18 +39,19 @@ Key features:
 ## Prerequisites
 -------------------------------
 
-  Before reading any further, make sure you have an MQTT broker installed.
+  Before reading any further, make sure you have an MQTT broker installed or use static build by passing **STATIC_BUILD** flags to cmake.
 
 ### Building from source
 
-Clone the repository with submodules, bootstrap, and build the client:
+Clone the repository with submodules and build the client:
 
 ```bash
 $ git clone https://github.com/tarantool/mqtt.git
 $ cd mqtt
 $ git submodule update --init --recursive
-$ ./bootstrap.sh
-$ make -C build
+$ mkdir build && cd build
+$ cmake ..
+$ make -j
 ```
 
 [Back to content](#content)

bootstrap.sh

@@ -1,16 +1,34 @@
 # driver
 
-add_library(driver SHARED driver.c)
+# we don't need to build documentation for mosquitto
+option(DOCUMENTATION "Build documentation?" OFF)
+
+option(WITH_STATIC_LIBRARIES "Build static versions of the libmosquitto/pp libraries?" OFF)
+
+if( STATIC_BUILD )
+	set(WITH_STATIC_LIBRARIES ON)
+	set(OPENSSL_USE_STATIC_LIBS ON)
+endif()
 
 set(LDFLAGS_EX "")
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
   set(LDFLAGS_EX ${LDFLAGS_EX} "-undefined dynamic_lookup")
 endif()
 
-message(STATUS ${MOSQUITTO_LIBRARIES})
+add_library(driver SHARED driver.c)
 
-target_link_libraries(driver ${MOSQUITTO_LIBRARIES} ${LDFLAGS_EX} -rdynamic)
-set_target_properties(driver PROPERTIES PREFIX "" OUTPUT_NAME "driver")
+if( DEFINED STATIC_BUILD )
+	unset(CMAKE_C_FLAGS)
+	add_subdirectory(../third_party/mosquitto ../third_party/mosquitto/build)
+	if( STATIC_BUILD )
+		target_link_libraries(driver libmosquitto_static ${LDFLAGS_EX})
+	else()
+		target_link_libraries(driver libmosquitto ${LDFLAGS_EX} -rdynamic)
+	endif()
+else()
+	target_link_libraries(driver ${MOSQUITTO_LIBRARIES} ${LDFLAGS_EX})
+endif()
+set_target_properties(driver PROPERTIES PREFIX "" OUTPUT_NAME driver)
 
-install(TARGETS driver LIBRARY DESTINATION ${TARANTOOL_INSTALL_LIBDIR}/mqtt)
+install(TARGETS driver DESTINATION ${TARANTOOL_INSTALL_LIBDIR}/mqtt)
 install(FILES init.lua DESTINATION ${TARANTOOL_INSTALL_LUADIR}/mqtt)

mqtt/CMakeLists.txt

@@ -0,0 +1,30 @@
+package = "mqtt"
+version = "1.2.1-2"
+source = {
+    url = "git://github.com/tarantool/mqtt.git",
+    tag = "1.2.1"
+}
+description = {
+    summary = "Mqtt connector for Tarantool",
+    homepage = "https://github.com/tarantool/mqtt",
+    license = "BSD"
+}
+dependencies = {
+    "lua >= 5.1"
+}
+build = {
+    type = "cmake";
+    variables = {
+        CMAKE_BUILD_TYPE="RelWithDebInfo";
+        TARANTOOL_INSTALL_LIBDIR="$(LIBDIR)";
+        TARANTOOL_INSTALL_LUADIR="$(LUADIR)";
+        STATIC_BUILD="$(STATIC_BUILD)";
+    };
+    platforms = {
+        macosx = {
+            variables = {
+                OPENSSL_ROOT_DIR="/usr/local/opt/openssl";
+            };
+        };
+    };
+}

rockspecs/mqtt-1.2.1-2.rockspec

@@ -0,0 +1,31 @@
+package = "mqtt"
+version = "1.4.0-2"
+source = {
+    url = "git://github.com/tarantool/mqtt.git",
+    tag = "1.4.0"
+}
+description = {
+    summary = "Mqtt connector for Tarantool",
+    homepage = "https://github.com/tarantool/mqtt",
+    license = "BSD"
+}
+dependencies = {
+    "lua >= 5.1"
+}
+build = {
+    type = "cmake";
+    variables = {
+        CMAKE_BUILD_TYPE="RelWithDebInfo";
+        TARANTOOL_INSTALL_LIBDIR="$(LIBDIR)";
+        TARANTOOL_INSTALL_LUADIR="$(LUADIR)";
+        STATIC_BUILD="$(STATIC_BUILD)";
+        OPENSSL_ROOT_DIR="/usr/local/opt/openssl";
+    };
+    platforms = {
+        macosx = {
+            variables = {
+                OPENSSL_ROOT_DIR="/usr/local/opt/openssl";
+            };
+        };
+    };
+}

rockspecs/mqtt-1.4.0-2.rockspec

@@ -0,0 +1,30 @@
+package = "mqtt"
+version = "scm-2"
+source = {
+    url = "git://github.com/tarantool/mqtt.git",
+    tag = "master"
+}
+description = {
+    summary = "Mqtt connector for Tarantool",
+    homepage = "https://github.com/tarantool/mqtt",
+    license = "BSD"
+}
+dependencies = {
+    "lua >= 5.1"
+}
+build = {
+    type = "cmake";
+    variables = {
+        CMAKE_BUILD_TYPE="RelWithDebInfo";
+        TARANTOOL_INSTALL_LIBDIR="$(LIBDIR)";
+        TARANTOOL_INSTALL_LUADIR="$(LUADIR)";
+        STATIC_BUILD="$(STATIC_BUILD)";
+    };
+    platforms = {
+        macosx = {
+            variables = {
+                OPENSSL_ROOT_DIR="/usr/local/opt/openssl";
+            };
+        };
+    };
+}