From af49c041a85bca48ab7e7341772fa47f0c2988f5 Mon Sep 17 00:00:00 2001 From: "min7.choi" Date: Thu, 26 Nov 2015 19:37:46 +0900 Subject: [PATCH] Modify download_set_network_type() Change-Id: Ia8b814af55fa6297b237c54247d64b0d2b04249b Signed-off-by: min7.choi --- .gbs.conf | 203 +++++++++++++++++++++++++ CMakeLists.txt | 2 +- build.sh | 3 +- build_mobile.sh | 2 + gbs.conf | 285 ----------------------------------- packaging/capi-web-url-download.spec | 1 + src/download-wrapping.c | 43 ++++++ 7 files changed, 252 insertions(+), 287 deletions(-) create mode 100755 .gbs.conf create mode 100755 build_mobile.sh delete mode 100644 gbs.conf diff --git a/.gbs.conf b/.gbs.conf new file mode 100755 index 0000000..6c0689c --- /dev/null +++ b/.gbs.conf @@ -0,0 +1,203 @@ +############################################### +# +# Tizen v3.0 for TV (arm-x11) +# +[obs.tizen] +url = https://api.tizen.org + +[profile.tztv_v3.0] +obs = obs.tizen +repos = repo.tv_arm-x11 +buildroot = ~/GBS-ROOT-3.0-TV + +[repo.tv_arm-x11] +url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/arm-x11/packages/ + +############################################### +# +# Tizen v3.0 for tv (emulator32-x11) +# +[obs.tizentv] +url = https://api.tizen.org + +[profile.tztv_v3.0_emulator] +obs = obs.tizentv +repos = repo.tztv_v3.0_emul +buildroot = ~/GBS-ROOT-3.0-TV-EMUL + +[repo.tztv_v3.0_emul] +url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/emulator32-x11/packages/ + +############################################### +# +# Tizen v3.0 for tv (arm64-x11) +# +[obs.tizentv] +url = https://api.tizen.org + +[profile.tztv_v3.0_arm64-x11] +obs = obs.tizentv +repos = repo.tztv_v3.0_arm64-x11 +buildroot = ~/GBS-ROOT-3.0-TV-arm64-x11 + +[repo.tztv_v3.0_arm64-x11] +url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/arm64-x11/packages/ + +############################################### +# +# Tizen v3.0 for tv (ia32-x11) +# +[obs.tizentv] +url = https://api.tizen.org + +[profile.tztv_v3.0_ia32-x11] +obs = obs.tizentv +repos = repo.tztv_v3.0_ia32-x11 +buildroot = ~/GBS-ROOT-3.0-TV-ia32-x11 + +[repo.tztv_v3.0_ia32-x11] +url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/ia32-x11/packages/ + +############################################### +# +# Tizen v3.0 for tv (x86_64-x11) +# +[obs.tizentv] +url = https://api.tizen.org + +[profile.tztv_v3.0_x86_64-x11] +obs = obs.tizentv +repos = repo.tztv_v3.0_x86_64-x11 +buildroot = ~/GBS-ROOT-3.0-TV-x86_64-x11 + +[repo.tztv_v3.0_x86_64-x11] +url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/x86_64-x11/packages/ + +############################################### +# +# Tizen v3.0 for TV (arm-wayland) +# +[obs.tizen] +url = https://api.tizen.org + +[profile.tztv_v3.0-wayland] +obs = obs.tizen +repos = repo.tv_arm-wayland +buildroot = ~/GBS-ROOT-3.0-TV-wayland + +[repo.tv_arm-wayland] +url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/arm-wayland/packages/ + +############################################### +# +# Tizen v3.0 for tv (emulator32-wayland) +# +[obs.tizentv] +url = https://api.tizen.org + +[profile.tztv_v3.0_emulator-wayland] +obs = obs.tizentv +repos = repo.tztv_v3.0_emul-wayland +buildroot = ~/GBS-ROOT-3.0-TV-EMUL-wayland + +[repo.tztv_v3.0_emul-wayland] +url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/emulator32-wayland/packages/ + +############################################### +# +# Tizen v3.0 for tv (arm64-wayland) +# +[obs.tizentv] +url = https://api.tizen.org + +[profile.tztv_v3.0_arm64-wayland] +obs = obs.tizentv +repos = repo.tztv_v3.0_arm64-wayland +buildroot = ~/GBS-ROOT-3.0-TV-arm64-wayland + +[repo.tztv_v3.0_arm64-wayland] +url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/arm64-wayland/packages/ + +############################################### +# +# Tizen v3.0 for mobile (arm64-wayland) +# +[obs.tizentv] +url = https://api.tizen.org + +[profile.tzmo_v3.0_arm64-wayland] +obs = obs.tizentv +repos = repo.tzmo_v3.0_arm64-wayland +buildroot = ~/GBS-ROOT-3.0-MOBILE-arm64-wayland + +[repo.tzmo_v3.0_arm64-wayland] +#url = http://download.tizen.org/snapshots/tizen/mobile/latest/repos/arm64-wayland/packages/ +url = http://10.252.81.117/snapshots/mobile/latest/repos/arm64-wayland/packages/ + +############################################### +# +# Tizen v3.0 for mobile (arm-wayland) +# +[obs.tizentv] +url = https://api.tizen.org + +[profile.tzmo_v3.0_arm-wayland] +obs = obs.tizentv +repos = repo.tzmo_v3.0_arm-wayland +buildroot = ~/GBS-ROOT-3.0-MOBILE-arm-wayland + +[repo.tzmo_v3.0_arm-wayland] +#url = http://download.tizen.org/snapshots/tizen/mobile/latest/repos/arm-wayland/packages/ +url = http://10.252.81.117/snapshots/mobile/latest/repos/arm-wayland/packages/ + +############################################### +# +# Tizen v3.0 for tv (ia32-wayland) +# +[obs.tizentv] +url = https://api.tizen.org + +[profile.tztv_v3.0_ia32-wayland] +obs = obs.tizentv +repos = repo.tztv_v3.0_ia32-wayland +buildroot = ~/GBS-ROOT-3.0-TV-ia32-wayland + +[repo.tztv_v3.0_ia32-wayland] +url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/ia32-wayland/packages/ + +############################################### +# +# Tizen v3.0 for tv (x86_64-wayland) +# +[obs.tizentv] +url = https://api.tizen.org + +[profile.tztv_v3.0_x86_64-wayland] +obs = obs.tizentv +repos = repo.tztv_v3.0_x86_64-wayland +buildroot = ~/GBS-ROOT-3.0-TV-x86_64-wayland + +[repo.tztv_v3.0_x86_64-wayland] +url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/x86_64-wayland/packages/ + +############################################### +# +# Tizen v3.0 for tv (HawkP) +# +[profile.tztv_v3.0_arm-wayland_h] +obs = obs.spin +repos = repo.spin.tizen-3.0-TV-target,repo.spin.devel-3.0-TV-target + +[obs.spin] +url = http://168.219.209.58:81 + +[repo.spin.tizen-3.0-TV-target] +url = http://165.213.149.200/download/snapshots/tizen/tv/latest/repos/arm-wayland/packages/ +user = blinkbot +passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ== + +[repo.spin.devel-3.0-TV-target] +url = http://165.213.149.200/download/snapshots/devel-3.0-tv/common/latest/repos/target/packages/ +user = blinkbot +passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ== + diff --git a/CMakeLists.txt b/CMakeLists.txt index 33db456..322d368 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ SET(INC_DIR include) SET(DOC_DIR doc) INCLUDE_DIRECTORIES(${INC_DIR}) -SET(requires "dlog capi-base-common capi-appfw-application download-provider-interface") +SET(requires "dlog capi-base-common capi-appfw-application download-provider-interface capi-system-info") MESSAGE(STATUS "PACKAGES : ${requires}") SET(pc_requires "capi-base-common capi-appfw-application") diff --git a/build.sh b/build.sh index 7c5ce45..7bc567e 100755 --- a/build.sh +++ b/build.sh @@ -1 +1,2 @@ -gbs -c gbs.conf build -P tzm -A aarch64 --include-all $@ +#gbs -c .gbs.conf build -P tztv_v3.0_arm-wayland -A armv7l --include-all $@ +gbs -c .gbs.conf build -P tztv_v3.0_arm-wayland_h -A armv7l --include-all $@ diff --git a/build_mobile.sh b/build_mobile.sh new file mode 100755 index 0000000..f9abe55 --- /dev/null +++ b/build_mobile.sh @@ -0,0 +1,2 @@ +#!/bin/bash +gbs -c .gbs.conf build -P profile.tzmo_v3.0_arm-wayland -A armv7l --include-all diff --git a/gbs.conf b/gbs.conf deleted file mode 100644 index 399db56..0000000 --- a/gbs.conf +++ /dev/null @@ -1,285 +0,0 @@ -############################################### -# -# Tizen v2.4 for mobile -# -[profile.tizenmb_v2.4] -obs = obs.tizenmb -# The order is IMPORTANT! -repos = repo.tizenmb_base_v2.4_obs -buildroot = ~/GBS-ROOT-2.4-DEV - -[repo.tizenmb_base_v2.4_obs] -url = http://168.219.209.55/download/snapshots/2.4-mobile/common/latest/repos/target/packages - -############################################### -# -# Tizen v2.4 for emulator(i586) -# -[profile.tizen_emulator_v2.4] -obs = obs.tizenmb -# The order is IMPORTANT! -repos = repo.tizen_emulator_base_v2.4_obs -buildroot = ~/GBS-ROOT-2.4-DEV - -[repo.tizen_emulator_base_v2.4_obs] -url = http://168.219.209.55/download/snapshots/2.4-mobile/common/latest/repos/emulator/packages - -############################################### -# -# Tizen v2.3 for mobile -# -[profile.tizenmb_v2.3] -obs = obs.tizenmb -# The order is IMPORTANT! -repos = repo.tizenmb_supplement_v2.3, repo.tizenmb_supplement_chromium_v2.3, repo.tizenmb_base_v2.3 -buildroot = ~/GBS-ROOT-2.3-DEV - -[repo.tizenmb_supplement_v2.3] -url = http://10.251.52.177/tizenrepo/eur-open/supplement_v2.3 - -[repo.tizenmb_base_v2.3] -url = http://10.251.52.177/tizenrepo/eur-open/PtnZ910FXX_20141020.002 - -# Supplementary repo for chromium -[repo.tizenmb_supplement_chromium_v2.3] -url = http://10.251.52.177/tizenrepo/eur-open/supplement_mobile_chromium_orange_v2.3_1 - -############################################### -# -# Tizen v2.1 for mobile -# -[profile.tizenmb_v2.1] -passwdx = -obs = obs.tizenmb -# The order is IMPORTANT! -repos = repo.tizenmb_supplement, repo.tizenmb_base -buildroot = ~/GBS-ROOT - -[obs.tizenmb] -url = http://slp-build.sec.samsung.net:81 - -# base repo -[repo.tizenmb_base] -url = http://10.251.52.177/tizenrepo/jpn-dcm/Redwood8974JPNDCM_20131218.006 - -# Supplementary repo for additional rpms packages required in gbs build -[repo.tizenmb_supplement] -url = http://10.251.52.177/tizenrepo/jpn-dcm/supplement - -############################################### -# -# Tizen v2.2.1 for tv (GolfP Platform Binary) -# -[profile.tztv_v2.2.1_golfp] -repos = repo.tztv_2.2.1_golfp_supplement, repo.tztv_2.2.1_golfp_product, repo.tztv_2.2.1_golfp_profile, repo.tztv_2.2.1_golfp_product_i586, repo.tztv_2.2.1_golfp_profile_i586, repo.tztv_2.2.1_golfp_base -buildroot = ~/GBS-TV-2.2.1-GOLFP - -[repo.tztv_2.2.1_golfp_product] -url = http://10.251.52.177/tizenrepo/tv_repo/snapshots/tztv-2.2.1/product/tztv-2.2.1_20140807.3/repos/product/armv7l/packages/ - -[repo.tztv_2.2.1_golfp_profile] -url = http://10.251.52.177/tizenrepo/tv_repo/snapshots/tztv-2.2.1/product/tztv-2.2.1_20140807.3/repos/profile/armv7l/packages/ - -[repo.tztv_2.2.1_golfp_product_i586] -url = http://10.251.52.177/tizenrepo/tv_repo/snapshots/tztv-2.2.1/product/tztv-2.2.1_20140807.3/repos/product/ia32/packages/ - -[repo.tztv_2.2.1_golfp_profile_i586] -url = http://10.251.52.177/tizenrepo/tv_repo/snapshots/tztv-2.2.1/product/tztv-2.2.1_20140807.3/repos/profile/ia32/packages/ - -[repo.tztv_2.2.1_golfp_base] -url = http://10.251.52.177/tizenrepo/tv_repo/tizen-rsa/tizen-2.2.1 - -# Supplementary repo for additional rpms packages required in gbs build -[repo.tztv_2.2.1_golfp_supplement] -url = http://10.251.52.177/tizenrepo/tv_repo/supplement_tv - -############################################### -# -# Tizen v2.2.1 for tv (Prehawk Platform Binary) -# -[profile.tztv_v2.2.1_prehawk] -repos = repo.tztv_2.2.1_prehawk_supplement, repo.tztv_2.2.1_prehawk_product, repo.tztv_2.2.1_prehawk_profile, repo.tztv_2.2.1_prehawk_base -buildroot = ~/GBS-TV-2.2.1-PREHAWK - -[repo.tztv_2.2.1_prehawk_product] -url = http://10.251.52.177/tizenrepo/tv_repo/Prehawk_atsc_20141018.5/repos/product/armv7l/packages/ - -[repo.tztv_2.2.1_prehawk_profile] -url = http://10.251.52.177/tizenrepo/tv_repo/Prehawk_atsc_20141018.5/repos/profile/armv7l/packages/ - -[repo.tztv_2.2.1_prehawk_base] -url = http://10.251.52.177/tizenrepo/tv_repo/tizen-2.2.1-vd-4.8_20140822.1 - -# Supplementary repo for additional rpms packages required in gbs build -[repo.tztv_2.2.1_prehawk_supplement] -# This supplement is temporary repository for capi-media-player package -# which added new API (player_get_content_video_size). -# If this package will be merged, I'll change this codes -url = http://10.251.52.177/tizenrepo/tv_repo/supplement_tv_prehawk_player - -############################################### -# -# Tizen v3.0 for TV (arm-x11) -# -[obs.tizen] -url = https://api.tizen.org - -[profile.tztv_v3.0] -obs = obs.tizen -repos = repo.tv_arm-x11 -buildroot = ~/GBS-ROOT-3.0-TV - -[repo.tv_arm-x11] -url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/arm-x11/packages/ -#url = http://download.tizen.org/snapshots/tizen/mobile/latest/repos/arm64-wayland/packages/ - -############################################### -# -# Tizen v3.0 for tv (emulator32-x11) -# -[obs.tizentv] -url = https://api.tizen.org - -[profile.tztv_v3.0_emulator] -obs = obs.tizentv -repos = repo.tztv_v3.0_emul -buildroot = ~/GBS-ROOT-3.0-TV-EMUL - -[repo.tztv_v3.0_emul] -url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/emulator32-x11/packages/ - -############################################### -# -# Tizen v3.0 for tv (arm64-x11) -# -[obs.tizentv] -url = https://api.tizen.org - -[profile.tztv_v3.0_arm64-x11] -obs = obs.tizentv -repos = repo.tztv_v3.0_arm64-x11 -buildroot = ~/GBS-ROOT-3.0-TV-arm64-x11 - -[repo.tztv_v3.0_arm64-x11] -url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/arm64-x11/packages/ - -############################################### -# -# Tizen v3.0 for tv (ia32-x11) -# -[obs.tizentv] -url = https://api.tizen.org - -[profile.tztv_v3.0_ia32-x11] -obs = obs.tizentv -repos = repo.tztv_v3.0_ia32-x11 -buildroot = ~/GBS-ROOT-3.0-TV-ia32-x11 - -[repo.tztv_v3.0_ia32-x11] -url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/ia32-x11/packages/ - -############################################### -# -# Tizen v3.0 for tv (x86_64-x11) -# -[obs.tizentv] -url = https://api.tizen.org - -[profile.tztv_v3.0_x86_64-x11] -obs = obs.tizentv -repos = repo.tztv_v3.0_x86_64-x11 -buildroot = ~/GBS-ROOT-3.0-TV-x86_64-x11 - -[repo.tztv_v3.0_x86_64-x11] -url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/x86_64-x11/packages/ - -############################################### -# -# Tizen v3.0 for TV (arm-wayland) -# -[obs.tizen] -url = https://api.tizen.org - -[profile.tztv_v3.0-wayland] -obs = obs.tizen -repos = repo.tv_arm-wayland -buildroot = ~/GBS-ROOT-3.0-TV-wayland - -[repo.tv_arm-wayland] -url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/arm-wayland/packages/ - -############################################### -# -# Tizen v3.0 for tv (emulator32-wayland) -# -[obs.tizentv] -url = https://api.tizen.org - -[profile.tztv_v3.0_emulator-wayland] -obs = obs.tizentv -repos = repo.tztv_v3.0_emul-wayland -buildroot = ~/GBS-ROOT-3.0-TV-EMUL-wayland - -[repo.tztv_v3.0_emul-wayland] -url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/emulator32-wayland/packages/ - -############################################### -# -# Tizen v3.0 for tv (arm64-wayland) -# -[obs.tizentv] -url = https://api.tizen.org - -[profile.tztv_v3.0_arm64-wayland] -obs = obs.tizentv -repos = repo.tztv_v3.0_arm64-wayland -buildroot = ~/GBS-ROOT-3.0-TV-arm64-wayland - -[repo.tztv_v3.0_arm64-wayland] -url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/arm64-wayland/packages/ -#url = http://download.tizen.org/snapshots/tizen/mobile/latest/repos/arm64-wayland/packages/ - -############################################### -# -# Tizen v3.0 for tv (ia32-wayland) -# -[obs.tizentv] -url = https://api.tizen.org - -[profile.tztv_v3.0_ia32-wayland] -obs = obs.tizentv -repos = repo.tztv_v3.0_ia32-wayland -buildroot = ~/GBS-ROOT-3.0-TV-ia32-wayland - -[repo.tztv_v3.0_ia32-wayland] -url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/ia32-wayland/packages/ - -############################################### -# -# Tizen v3.0 for tv (x86_64-wayland) -# -[obs.tizentv] -url = https://api.tizen.org - -[profile.tztv_v3.0_x86_64-wayland] -obs = obs.tizentv -repos = repo.tztv_v3.0_x86_64-wayland -buildroot = ~/GBS-ROOT-3.0-TV-x86_64-wayland - -[repo.tztv_v3.0_x86_64-wayland] -url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/x86_64-wayland/packages/ - -############################################### -# -# Tizen v3.0 for Mobile (arm64-wayland) -# -[obs.tizen] -url = https://api.tizen.org - -[profile.tzm] -obs = obs.tizen -repos = repo.arm64-wayland -buildroot = ~/GBS-ROOT-3.0-Mobile-wayland64 - -[repo.arm64-wayland] -url = http://download.tizen.org/snapshots/tizen/mobile/latest/repos/arm64-wayland/packages/ \ No newline at end of file diff --git a/packaging/capi-web-url-download.spec b/packaging/capi-web-url-download.spec index 0d67657..72da584 100755 --- a/packaging/capi-web-url-download.spec +++ b/packaging/capi-web-url-download.spec @@ -11,6 +11,7 @@ BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(download-provider-interface) +BuildRequires: pkgconfig(capi-system-info) BuildRequires: cmake %description diff --git a/src/download-wrapping.c b/src/download-wrapping.c index fcb4d33..0c9dfd8 100755 --- a/src/download-wrapping.c +++ b/src/download-wrapping.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -35,6 +36,10 @@ LOGI(format, ##ARG); \ #define TRACE_DEBUG_MSG(format, ARG...) ; #endif +#define TELEPHONY_FEATURE "tizen.org/feature/network.telephony" +#define WIFI_FEATURE "tizen.org/feature/network.wifi" +#define WIFI_DIRECT_FEATURE "tizen.org/feature/network.wifi.direct" + /////////////////////// APIs ///////////////////////////////// int download_create(int *download_id) @@ -91,6 +96,44 @@ int download_set_network_type(int download_id, download_network_type_e net_type) { TRACE_INFO(""); + + int bValue = 0; + int bIsTelephonyFeatureSupported =0; + int bIsWifiFeatureSupported = 0; + int bIsWifiDirectFeatureSupported = 0; + + bValue = system_info_get_platform_bool (TELEPHONY_FEATURE, &bIsTelephonyFeatureSupported); + bValue = system_info_get_platform_bool (WIFI_FEATURE, &bIsWifiFeatureSupported); + bValue = system_info_get_platform_bool (WIFI_DIRECT_FEATURE, &bIsWifiDirectFeatureSupported); + + switch (net_type) + { + case DOWNLOAD_NETWORK_DATA_NETWORK: + if ( !bIsTelephonyFeatureSupported ) + { + return DOWNLOAD_ERROR_NOT_SUPPORTED; + } + break; + case DOWNLOAD_NETWORK_WIFI: + if ( !bIsWifiFeatureSupported ) + { + return DOWNLOAD_ERROR_NOT_SUPPORTED; + } + break; + case DOWNLOAD_NETWORK_WIFI_DIRECT: + if ( !bIsWifiDirectFeatureSupported ) + { + return DOWNLOAD_ERROR_NOT_SUPPORTED; + } + break; + case DOWNLOAD_NETWORK_ALL: + if ( !bIsTelephonyFeatureSupported && !bIsWifiFeatureSupported && !bIsWifiDirectFeatureSupported ) + { + return DOWNLOAD_ERROR_NOT_SUPPORTED; + } + break; + } + ///////////////////////// return dp_interface_set_network_type(download_id, (int)net_type); } -- 2.7.4