From 149c1fc67fdc1bb281e6f5f19879d580dfa3e3e3 Mon Sep 17 00:00:00 2001 From: Tae-Young Chung Date: Tue, 26 Apr 2016 17:44:16 +0900 Subject: [PATCH] Change directory path 1. Replace the hard-coded path with tizen-platform-config 2. Change testsuite directory Change-Id: I9ece671963f31b4037fc90f843cc955fc2e90324 Signed-off-by: Tae-Young Chung --- mv_common/src/EngineConfig.cpp | 10 ++++++++-- packaging/capi-media-vision.spec | 18 ++++++++++-------- test/CMakeLists.txt | 2 +- test/testsuites/CMakeLists.txt | 4 +--- test/testsuites/barcode/CMakeLists.txt | 2 +- test/testsuites/face/CMakeLists.txt | 2 +- test/testsuites/image/CMakeLists.txt | 2 +- test/testsuites/surveillance/CMakeLists.txt | 2 +- 8 files changed, 24 insertions(+), 18 deletions(-) diff --git a/mv_common/src/EngineConfig.cpp b/mv_common/src/EngineConfig.cpp index 38e545f..7e92ac8 100644 --- a/mv_common/src/EngineConfig.cpp +++ b/mv_common/src/EngineConfig.cpp @@ -20,6 +20,8 @@ #include +#define MV_ENGINE_CONFIG_FILE_NAME "media-vision-config.json" + /** * @file EngineConfig.cpp * @brief Engine Configuration class methods implementation. @@ -28,8 +30,7 @@ namespace MediaVision { namespace Common { -std::string EngineConfig::DefConfigFilePath = - std::string("/usr/share/config/capi-media-vision/media-vision-config.json"); +std::string EngineConfig::DefConfigFilePath; std::map EngineConfig::DefDblDict; std::map EngineConfig::DefIntDict; @@ -38,6 +39,11 @@ std::map EngineConfig::DefStrDict; EngineConfig::EngineConfig() { + DefConfigFilePath = MV_CONFIG_PATH; + DefConfigFilePath += MV_ENGINE_CONFIG_FILE_NAME; + + LOGE("Default Engine config file location is %s", DefConfigFilePath.c_str()); + // Force load default attributes from configuration file cacheDictionaries(false); diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec index 2bec228..8fdb487 100644 --- a/packaging/capi-media-vision.spec +++ b/packaging/capi-media-vision.spec @@ -1,6 +1,6 @@ Name: capi-media-vision Summary: Media Vision library for Tizen Native API -Version: 0.3.14 +Version: 0.3.15 Release: 0 Group: Multimedia/Framework License: Apache-2.0 and BSD-2.0 @@ -25,6 +25,7 @@ BuildRequires: libavutil-devel BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-base-1.0) BuildRequires: pkgconfig(gstreamer-app-1.0) +BuildRequires: pkgconfig(libtzplatform-config) %description Media Vision library for Tizen Native API. Includes barcode detecting, barcode generating, face and image modules. @@ -57,17 +58,19 @@ export CFLAGS="$CFLAGS -DENABLE_NEON" export CXXFLAGS="$CXXFLAGS -DENABLE_NEON" %endif +export CFLAGS+=" -DMV_CONFIG_PATH=\\\"%{TZ_SYS_RO_SHARE}/config/%{name}/\\\"" +export CXXFLAGS+=" -DMV_CONFIG_PATH=\\\"%{TZ_SYS_RO_SHARE}/config/%{name}/\\\"" MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DTZ_SYS_BIN=%TZ_SYS_BIN make %{?jobs:-j%jobs} %install rm -rf %{buildroot} -mkdir -p %{buildroot}/usr/share/license/ -mkdir -p %{buildroot}/usr/share/config/%{name} -cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name} -cp media-vision-config.json %{buildroot}/usr/share/config/%{name}/ +mkdir -p %{buildroot}%{_datadir}/license/ +mkdir -p %{buildroot}%{_datadir}/config/%{name} +cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name} +cp media-vision-config.json %{buildroot}%{_datadir}/config/%{name}/ %make_install @@ -82,8 +85,7 @@ cp media-vision-config.json %{buildroot}/usr/share/config/%{name}/ %{_libdir}/libmv*.so %files devel -#%{_datadir}/config/%{name}/media-vision-config.json %{_includedir}/media/*.h %{_libdir}/pkgconfig/*.pc %{_libdir}/lib%{name}.so -/opt/usr/devel/media/testsuites/* +%TZ_SYS_BIN/* diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b61a2b3..8637790 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -SET(testbin_dir /opt/usr/devel/media/) +SET(testbin_dir ${TZ_SYS_BIN}) ADD_SUBDIRECTORY(${PROJECT_SOURCE_DIR}/test/testsuites) diff --git a/test/testsuites/CMakeLists.txt b/test/testsuites/CMakeLists.txt index fdb2d20..47e03fd 100644 --- a/test/testsuites/CMakeLists.txt +++ b/test/testsuites/CMakeLists.txt @@ -1,8 +1,6 @@ project(mv_testsuites) cmake_minimum_required(VERSION 2.6) -set(testsuites_dir "${testbin_dir}/testsuites") - SET(INC_IMAGE_HELPER "${PROJECT_SOURCE_DIR}/common/image_helper/include") SET(INC_VIDEO_HELPER "${PROJECT_SOURCE_DIR}/common/video_helper") SET(INC_TS_COMMON "${PROJECT_SOURCE_DIR}/common/testsuite_common") @@ -11,4 +9,4 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/common) add_subdirectory(${PROJECT_SOURCE_DIR}/barcode) add_subdirectory(${PROJECT_SOURCE_DIR}/face) add_subdirectory(${PROJECT_SOURCE_DIR}/image) -add_subdirectory(${PROJECT_SOURCE_DIR}/surveillance) \ No newline at end of file +add_subdirectory(${PROJECT_SOURCE_DIR}/surveillance) diff --git a/test/testsuites/barcode/CMakeLists.txt b/test/testsuites/barcode/CMakeLists.txt index 880da5e..b46aea2 100644 --- a/test/testsuites/barcode/CMakeLists.txt +++ b/test/testsuites/barcode/CMakeLists.txt @@ -24,4 +24,4 @@ add_executable(${PROJECT_NAME} ${MV_TEST_SUITE_SRC_LIST} ${MV_TEST_SUITE_INC_LIS target_link_libraries(${PROJECT_NAME} capi-media-vision dlog avcodec avformat avutil swscale mv_image_helper) -install(TARGETS ${PROJECT_NAME} DESTINATION ${testsuites_dir}) +install(TARGETS ${PROJECT_NAME} DESTINATION ${testbin_dir}) diff --git a/test/testsuites/face/CMakeLists.txt b/test/testsuites/face/CMakeLists.txt index aed6de7..91398aa 100644 --- a/test/testsuites/face/CMakeLists.txt +++ b/test/testsuites/face/CMakeLists.txt @@ -31,4 +31,4 @@ target_link_libraries(${PROJECT_NAME} capi-media-vision mv_video_helper mv_testsuite_common) -install(TARGETS ${PROJECT_NAME} DESTINATION ${testsuites_dir}) +install(TARGETS ${PROJECT_NAME} DESTINATION ${testbin_dir}) diff --git a/test/testsuites/image/CMakeLists.txt b/test/testsuites/image/CMakeLists.txt index 6c66495..9e5f5b0 100644 --- a/test/testsuites/image/CMakeLists.txt +++ b/test/testsuites/image/CMakeLists.txt @@ -38,4 +38,4 @@ target_link_libraries(${PROJECT_NAME} capi-media-vision mv_video_helper mv_testsuite_common) -install(TARGETS ${PROJECT_NAME} DESTINATION ${testsuites_dir}) +install(TARGETS ${PROJECT_NAME} DESTINATION ${testbin_dir}) diff --git a/test/testsuites/surveillance/CMakeLists.txt b/test/testsuites/surveillance/CMakeLists.txt index 80ac1ac..49840f3 100644 --- a/test/testsuites/surveillance/CMakeLists.txt +++ b/test/testsuites/surveillance/CMakeLists.txt @@ -28,4 +28,4 @@ target_link_libraries(${PROJECT_NAME} capi-media-vision mv_testsuite_common mv_image_helper) -install(TARGETS ${PROJECT_NAME} DESTINATION ${testsuites_dir}) +install(TARGETS ${PROJECT_NAME} DESTINATION ${testbin_dir}) -- 2.7.4