Remove bt dependency in movable project

Change-Id: I9f25f3b719894c4aac034ce1db3e908f04f5ab82

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7510aaccc8045f6222b9d67567b3921dcac8daa..3ed9dfa265607218fb8f6e47e836dcfadc08445f 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,7 @@ OPTION(WITH_VINE_TEST "With vine command-line test tools" OFF)
 OPTION(ENABLE_INSTRUMENTATION_MODE "Enable instrumentation mode" OFF)
 OPTION(ENABLE_DATAPATH_PLUGIN_DEBUG "Enable debug mode for data path plugin" OFF)
 
+OPTION(BT_SUPPORT "Support Bluetooth" ON)
 OPTION(NAN_SUPPORT "Support NAN" OFF)
 
 INCLUDE(FindPkgConfig)
@@ -90,11 +91,13 @@ IF(TIZEN_OS)
     ADD_DEFINITIONS("-DTIZEN_OS -DUSE_DLOG")
 ENDIF(TIZEN_OS)
 
-SET(BT_SUPPORT OFF)
-IF(TIZEN_OS AND USE_EVENT_LOOP_EXTERNAL_GLIB)
-       ADD_DEFINITIONS("-DBT_SUPPORT")
-       SET(BT_SUPPORT ON)
-ENDIF(TIZEN_OS AND USE_EVENT_LOOP_EXTERNAL_GLIB)
+IF(BT_SUPPORT)
+       IF(TIZEN_OS AND USE_EVENT_LOOP_EXTERNAL_GLIB)
+               ADD_DEFINITIONS("-DBT_SUPPORT")
+       ELSE(TIZEN_OS AND USE_EVENT_LOOP_EXTERNAL_GLIB)
+               SET(BT_SUPPORT OFF)
+       ENDIF(TIZEN_OS AND USE_EVENT_LOOP_EXTERNAL_GLIB)
+ENDIF(BT_SUPPORT)
 
 IF(NAN_SUPPORT)
        IF(NOT TIZEN_OS OR NOT USE_EVENT_LOOP_EXTERNAL_GLIB)

diff --git a/packaging/capi-network-vine.spec b/packaging/capi-network-vine.spec
index d4a07db0b4ba32df489026a2e0873d8d77a18606..9e66ee225dcf3a4f24a9911a8f282ed87b151018 100755 (executable)
--- a/packaging/capi-network-vine.spec
+++ b/packaging/capi-network-vine.spec
@@ -3,7 +3,7 @@
 %bcond_without use_glib_event_loop
 Name:    capi-network-vine
 Summary: An service discovery framework
-Version: 1.3.4
+Version: 1.3.5
 Release: 0
 Group:   Network & Connectivity/API
 License: Apache-2.0
@@ -110,6 +110,9 @@ export FFLAGS+=" -fprofile-arcs -ftest-coverage"
 %else
         -DUSE_EVENT_LOOP_EXTERNAL_GLIB=OFF \
 %endif
+%if "%{mv_prj}" == "1"
+        -DBT_SUPPORT=OFF \
+%endif
 %if %{with lws_static}
         -DUSE_LIBWEBSOCKETS_STATIC=ON \
 %else

diff --git a/src/vine-disc.cpp b/src/vine-disc.cpp
index 7b0679df20dee950155dbec77a20d4b1cdc8e118..65b5c816cdefac7b5bc1c0ae245dec6ca05eb179 100755 (executable)
--- a/src/vine-disc.cpp
+++ b/src/vine-disc.cpp
@@ -33,9 +33,13 @@ static struct {
        [VINE_DISCOVERY_METHOD_DNS_SD] = {"DNS-SD", DNS_SD_PLUGIN_PATH},
 #ifdef BT_SUPPORT
        [VINE_DISCOVERY_METHOD_BLE] = {"BLE", BLE_PLUGIN_PATH},
+#else
+       [VINE_DISCOVERY_METHOD_BLE] = {"BLE", NULL},
 #endif
 #ifdef NAN_SUPPORT
        [VINE_DISCOVERY_METHOD_NAN] = {"NAN", NAN_PLUGIN_PATH},
+#else
+       [VINE_DISCOVERY_METHOD_NAN] = {"NAN", NULL},
 #endif
        {NULL, NULL},
 };
@@ -329,7 +333,12 @@ void __fd_removed_cb(int fd, void *user_data)
 
 static int __load_disc_plugins()
 {
-       for (int i = 0; __vine_disc_plugins_info[i].path; ++i) {
+       for (int i = 0; __vine_disc_plugins_info[i].name; ++i) {
+        if (__vine_disc_plugins_info[i].path == NULL) {
+                       VINE_LOGI("%s is not supported.", __vine_disc_plugins_info[i].name);
+                       continue;
+        }
+
                void *handle = dlopen(__vine_disc_plugins_info[i].path, RTLD_LAZY | RTLD_NODELETE);
                if (handle) {
                        __vine_disc_plugins[i].init =