From 2f71a8bee02b17d7b1211661bdcf7ed0e34bba90 Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Thu, 18 Aug 2016 11:03:37 +0900 Subject: [PATCH] Modifed build option based on naming rule Change-Id: I009ebbb953f4c5275ac62bfe7ab0734c11e7a77b Signed-off-by: Seonah Moon --- CMakeLists.txt | 12 ++++++------ include/mobileap_softap.h | 4 ++-- packaging/mobileap-agent.spec | 6 +++--- src/mobileap_main.c | 4 ++-- src/mobileap_network.c | 2 +- src/mobileap_notification.c | 4 ++-- src/mobileap_softap.c | 6 +++--- src/mobileap_wifi.c | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06bd2f4..8a75e46 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,18 +47,18 @@ IF("${ARCH}" STREQUAL "arm") ADD_DEFINITIONS("-DTARGET") MESSAGE("add -DTARGET") ENDIF("${ARCH}" STREQUAL "arm") -IF(TIZEN_TV) - ADD_DEFINITIONS(-DTIZEN_TV) -ENDIF(TIZEN_TV) +IF(TIZEN_PROFILE_TV) + ADD_DEFINITIONS(-DTIZEN_PROFILE_TV) +ENDIF(TIZEN_PROFILE_TV) ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DVENDOR=\"${APP_VENDOR}\"") ADD_DEFINITIONS("-DAPPNAME=\"${APP_NAME}\"") ADD_DEFINITIONS("-DAPP_DIR=\"${APP_DIR}\"") -IF(TIZEN_WLAN_BOARD_SPRD) - ADD_DEFINITIONS(-DTIZEN_WLAN_BOARD_SPRD) -ENDIF(TIZEN_WLAN_BOARD_SPRD) +IF(TIZEN_FEATURE_WLAN_BOARD_SPRD) + ADD_DEFINITIONS(-DTIZEN_FEATURE_WLAN_BOARD_SPRD) +ENDIF(TIZEN_FEATURE_WLAN_BOARD_SPRD) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed -pie") diff --git a/include/mobileap_softap.h b/include/mobileap_softap.h index d36551a..678eccb 100755 --- a/include/mobileap_softap.h +++ b/include/mobileap_softap.h @@ -116,7 +116,7 @@ #define HOSTAPD_WPS_DEVICE_TYPE "6-0050F204-1" #define HOSTPAD_WPS_CONFIG_METHODS "label virtual_display virtual_push_button keypad" -#ifndef TIZEN_WLAN_BOARD_SPRD +#ifndef TIZEN_FEATURE_WLAN_BOARD_SPRD #define HOSTAPD_CONF "interface=%s\n" \ "driver=nl80211\n" \ "ctrl_interface=%s\n" \ @@ -274,7 +274,7 @@ int _mh_core_enable_port_filtering(int enable); int _mh_core_add_port_filtering_rule(int port, const char *protocol, int allow); int _mh_core_add_custom_port_filtering_rule(int port1, int port2, const char *protocol, int allow); int _mh_core_set_vpn_passthrough_rule(int vpn_type, int enable); -#ifdef TIZEN_WLAN_BOARD_SPRD +#ifdef TIZEN_FEATURE_WLAN_BOARD_SPRD int _mh_core_push_wps_button(void); int _mh_core_set_wps_pin(const char *wps_pin); #endif diff --git a/packaging/mobileap-agent.spec b/packaging/mobileap-agent.spec index 7139118..16a36b8 100644 --- a/packaging/mobileap-agent.spec +++ b/packaging/mobileap-agent.spec @@ -1,6 +1,6 @@ Name: mobileap-agent Summary: Mobile AP daemon for setting tethering environments -Version: 1.0.69 +Version: 1.0.70 Release: 1 Group: System/Network License: Apache-2.0 @@ -49,10 +49,10 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" %cmake -DCMAKE_BUILD_TYPE="" \ %if "%{?profile}" == "tv" - -DTIZEN_TV=1 \ + -DTIZEN_PROFILE_TV=1 \ %endif %if "%{?tizen_target_name}" == "TM1" - -DTIZEN_WLAN_BOARD_SPRD=1 \ + -DTIZEN_FEATURE_WLAN_BOARD_SPRD=1 \ %endif . diff --git a/src/mobileap_main.c b/src/mobileap_main.c index 1781869..87b2bd1 100755 --- a/src/mobileap_main.c +++ b/src/mobileap_main.c @@ -401,7 +401,7 @@ gboolean tethering_push_wps_button(Tethering *obj, DBG("+"); -#ifdef TIZEN_WLAN_BOARD_SPRD +#ifdef TIZEN_FEATURE_WLAN_BOARD_SPRD ret = _mh_core_push_wps_button(); #else ret = MOBILE_AP_ERROR_NOT_PERMITTED; @@ -419,7 +419,7 @@ gboolean tethering_set_wps_pin(Tethering *obj, DBG("+"); -#ifdef TIZEN_WLAN_BOARD_SPRD +#ifdef TIZEN_FEATURE_WLAN_BOARD_SPRD ret = _mh_core_set_wps_pin(wps_pin); #else ret = MOBILE_AP_ERROR_NOT_PERMITTED; diff --git a/src/mobileap_network.c b/src/mobileap_network.c index 5e10a22..803d379 100644 --- a/src/mobileap_network.c +++ b/src/mobileap_network.c @@ -89,7 +89,7 @@ static mobile_ap_error_code_e __get_conn_error(int conn_error) err = MOBILE_AP_ERROR_ALREADY_ENABLED; break; -#ifndef TIZEN_TV +#ifndef TIZEN_PROFILE_TV case CONNECTION_ERROR_PERMISSION_DENIED: err = MOBILE_AP_ERROR_PERMISSION_DENIED; break; diff --git a/src/mobileap_notification.c b/src/mobileap_notification.c index 3094ec4..e546437 100644 --- a/src/mobileap_notification.c +++ b/src/mobileap_notification.c @@ -27,7 +27,7 @@ #include #include #include -#ifndef TIZEN_TV +#ifndef TIZEN_PROFILE_TV #include #endif @@ -316,7 +316,7 @@ int _create_connected_noti(mobile_ap_type_e type, int count) b = bundle_create(); bundle_add(b, "caller", "notification"); -#ifndef TIZEN_TV +#ifndef TIZEN_PROFILE_TV appsvc_set_pkgname(b, "ug-setting-mobileap-efl"); #endif diff --git a/src/mobileap_softap.c b/src/mobileap_softap.c index 870de39..448994a 100755 --- a/src/mobileap_softap.c +++ b/src/mobileap_softap.c @@ -235,7 +235,7 @@ static int __execute_hostapd(const mobile_ap_type_e type, const char *ssid, return MOBILE_AP_ERROR_NONE; } -#ifdef TIZEN_WLAN_BOARD_SPRD +#ifdef TIZEN_FEATURE_WLAN_BOARD_SPRD static int __execute_hostapd_wps(const mobile_ap_type_e type, const char *ssid, const char *passphrase, const char *mode, int channel, int hide_mode, int mac_filter, int max_sta) { @@ -961,7 +961,7 @@ int _mh_core_enable_softap(const mobile_ap_type_e type, const char *ssid, } if (security != NULL && !strcmp(security, "wps")) { -#ifdef TIZEN_WLAN_BOARD_SPRD +#ifdef TIZEN_FEATURE_WLAN_BOARD_SPRD ret_status = __execute_hostapd_wps(type, ssid, key, mode, channel, hide_mode, mac_filter, max_sta); @@ -1064,7 +1064,7 @@ int _mh_core_disable_softap(void) return ret_status; } -#ifdef TIZEN_WLAN_BOARD_SPRD +#ifdef TIZEN_FEATURE_WLAN_BOARD_SPRD int _mh_core_set_wps_pin(const char *wps_pin) { int ret = 0; diff --git a/src/mobileap_wifi.c b/src/mobileap_wifi.c index 7cca4db..47d867d 100755 --- a/src/mobileap_wifi.c +++ b/src/mobileap_wifi.c @@ -1471,7 +1471,7 @@ gboolean softap_set_wps_pin(Softap *obj, { mobile_ap_error_code_e ret = MOBILE_AP_ERROR_NONE; -#ifdef TIZEN_WLAN_BOARD_SPRD +#ifdef TIZEN_FEATURE_WLAN_BOARD_SPRD ret = _mh_core_set_wps_pin(wps_pin); #else ret = MOBILE_AP_ERROR_NOT_PERMITTED; @@ -1486,7 +1486,7 @@ gboolean softap_push_wps_button(Softap *obj, GDBusMethodInvocation *context) { mobile_ap_error_code_e ret = MOBILE_AP_ERROR_NONE; -#ifdef TIZEN_WLAN_BOARD_SPRD +#ifdef TIZEN_FEATURE_WLAN_BOARD_SPRD ret = _mh_core_push_wps_button(); #else ret = MOBILE_AP_ERROR_NOT_PERMITTED; -- 2.7.4