From 1b6e36c043bc2b8b08faf33944f8b4212f51c46e Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Fri, 11 Nov 2016 14:21:58 +0900 Subject: [PATCH] Remove dead and dangerous code - This is for Tizen 4.0 - For 4.0 Configurability & Building-Blocks, we need to remove profile build dependencies and this is the first step for it. There will be other commits following this soon. TIZEN_MOBILE/TIZEN_WEARABLE are useless: connection$ grep -r "TIZEN_MOBILE" * CMakeLists.txt:IF(TIZEN_MOBILE) CMakeLists.txt: ADD_DEFINITIONS(-DTIZEN_MOBILE) CMakeLists.txt:ENDIF(TIZEN_MOBILE) packaging/capi-network-connection.spec: -DTIZEN_MOBILE=1 \ Binary file packaging/.capi-network-connection.spec.swp matches connection$ grep -r "TIZEN_WEARABLE" * CMakeLists.txt:IF(TIZEN_WEARABLE) CMakeLists.txt: ADD_DEFINITIONS(-DTIZEN_WEARABLE) CMakeLists.txt:ENDIF(TIZEN_WEARABLE) packaging/capi-network-connection.spec: -DTIZEN_WEARABLE=1 \ Binary file packaging/.capi-network-connection.spec.swp matches connection$ Change-Id: I658208e213db777011f7e1f19b78bd1bf529b277 Signed-off-by: MyungJoo Ham --- CMakeLists.txt | 6 ------ packaging/capi-network-connection.spec | 8 -------- 2 files changed, 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c6b06c..1fc7890 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,12 +17,6 @@ SET(pc_dependents "capi-base-common") IF(TIZEN_DUALSIM_ENABLE) ADD_DEFINITIONS(-DTIZEN_DUALSIM_ENABLE) ENDIF(TIZEN_DUALSIM_ENABLE) -IF(TIZEN_WEARABLE) - ADD_DEFINITIONS(-DTIZEN_WEARABLE) -ENDIF(TIZEN_WEARABLE) -IF(TIZEN_MOBILE) - ADD_DEFINITIONS(-DTIZEN_MOBILE) -ENDIF(TIZEN_MOBILE) IF(TIZEN_TV) ADD_DEFINITIONS(-DTIZEN_TV) ENDIF(TIZEN_TV) diff --git a/packaging/capi-network-connection.spec b/packaging/capi-network-connection.spec index 5951134..c5ba36d 100755 --- a/packaging/capi-network-connection.spec +++ b/packaging/capi-network-connection.spec @@ -38,17 +38,9 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \ %if 0%{?model_build_feature_network_dsds} == 1 -DTIZEN_DUALSIM_ENABLE=1 \ %endif -%if "%{profile}" == "wearable" - -DTIZEN_WEARABLE=1 \ -%else -%if "%{profile}" == "mobile" - -DTIZEN_MOBILE=1 \ -%else %if "%{profile}" == "tv" -DTIZEN_TV=1 \ %endif -%endif -%endif . make %{?_smp_mflags} -- 2.7.4