From: Lukasz Oleksak Date: Thu, 20 Feb 2020 15:17:12 +0000 (+0100) Subject: Package name changed to org.tizen.accessibility-setting-profile_common X-Git-Tag: submit/tizen/20200225.022728^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=427ef7e51764ee5ddad75edf77a24a78eebd78d8;p=profile%2Fcommon%2Fapps%2Fnative%2Faccessibility-setting.git Package name changed to org.tizen.accessibility-setting-profile_common [Issue] Mobile profile image happened to use mobile accessibility-setting and got a crash because the package name is same. [Solution] Change package name to org.tizen.accessibility-setting-profile_common from org.tizen.accessibility-setting to distinguish package name. Change-Id: I26bc2f0d66173f4311d7ab38f43a1660f9195a2f --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 74bf51f..967b35b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ENABLE_TESTING() -PROJECT(accessibility-setting CXX) +PROJECT(accessibility-setting-profile_common CXX) option(TESTS "enable/disable accessibility setting tests" ON) diff --git a/org.tizen.accessibility-setting-profile_common-tests.manifest b/org.tizen.accessibility-setting-profile_common-tests.manifest new file mode 100644 index 0000000..9c82c66 --- /dev/null +++ b/org.tizen.accessibility-setting-profile_common-tests.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/org.tizen.accessibility-setting-profile_common.manifest b/org.tizen.accessibility-setting-profile_common.manifest new file mode 100644 index 0000000..97e8c31 --- /dev/null +++ b/org.tizen.accessibility-setting-profile_common.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/org.tizen.accessibility-setting-profile_common.xml b/org.tizen.accessibility-setting-profile_common.xml new file mode 100644 index 0000000..7134944 --- /dev/null +++ b/org.tizen.accessibility-setting-profile_common.xml @@ -0,0 +1,12 @@ + + + + Accessibility Setting App + + + + + + http://tizen.org/privilege/systemsettings.admin + + diff --git a/org.tizen.accessibility-setting-tests.manifest b/org.tizen.accessibility-setting-tests.manifest deleted file mode 100644 index 9c82c66..0000000 --- a/org.tizen.accessibility-setting-tests.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/org.tizen.accessibility-setting.manifest b/org.tizen.accessibility-setting.manifest deleted file mode 100644 index 97e8c31..0000000 --- a/org.tizen.accessibility-setting.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/org.tizen.accessibility-setting.xml b/org.tizen.accessibility-setting.xml deleted file mode 100644 index ccfda92..0000000 --- a/org.tizen.accessibility-setting.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Accessibility Setting App - - - - - - http://tizen.org/privilege/systemsettings.admin - - diff --git a/packaging/org.tizen.accessibility-setting-profile_common.spec b/packaging/org.tizen.accessibility-setting-profile_common.spec new file mode 100644 index 0000000..a9bdf40 --- /dev/null +++ b/packaging/org.tizen.accessibility-setting-profile_common.spec @@ -0,0 +1,105 @@ +%bcond_without tests + +Name: org.tizen.accessibility-setting-profile_common +Summary: Accessibility Setting Application +Version: 0.0.1 +Release: 1 +Group: UI Framework +License: Apache-2.0 +Source0: %{name}-%{version}.tar.gz + +BuildRequires: gettext-tools +BuildRequires: pkgconfig(elementary) +BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(vconf) +BuildRequires: cmake +BuildRequires: pkgconfig(libtzplatform-config) +BuildRequires: pkgconfig(appcore-efl) +BuildRequires: pkgconfig(appcore-common) +BuildRequires: pkgconfig(efl-extension) +BuildRequires: pkgconfig(capi-appfw-application) +BuildRequires: pkgconfig(capi-appfw-event) +BuildRequires: pkgconfig(capi-appfw-preference) +BuildRequires: pkgconfig(tts) +BuildRequires: pkgconfig(tts-setting) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(capi-system-info) +BuildRequires: pkgconfig(capi-system-system-settings) +BuildRequires: pkgconfig(tts-setting) +BuildRequires: pkgconfig(notification) +BuildRequires: edje-tools +BuildRequires: gtest-devel + +Provides: %{name} = %{version} + +%description +Accessibility setting application. + +%prep +%setup -q +%define _pkg_dir %{TZ_SYS_RO_APP}/%{name} + +%build + +%define DataDir %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:/usr/share} +%define AppDir %{TZ_SYS_RO_APP}/%{name} + +%define TestsName %{name}-tests +%define TestsAppDir %{TZ_SYS_RO_APP}/%{TestsName} + + +rm -rf CMakeFiles CMakeCache.txt && cmake . -DCMAKE_INSTALL_PREFIX=%{_pkg_dir} \ + -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \ + -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES \ + -DCMAKE_TESTS_INSTALL_PREFIX="%{TestsAppDir}" \ +%if !%{with tests} + -DTESTS=OFF \ +%endif + + +make %{?jobs:-j%jobs} + +export CTEST_OUTPUT_ON_FAILURE=1 +make test + +%install +%make_install + +mkdir -p %{buildroot}/%{_datadir}/license +cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}/%{_datadir}/license/%{name} + +%post +%{AppDir}/scripts/setVconfKeys.sh + +%files +%defattr(-,root,root,-) +%{_pkg_dir}/bin/* +%{_pkg_dir}/res/* +%{TZ_SYS_RO_PACKAGES}/%{name}.xml +%{_datadir}/license/%{name} +%manifest %{name}.manifest +%license LICENSE +%{AppDir}/scripts/setVconfKeys.sh + + +%if %{with tests} +%package tests +Summary: Accessibility setting - tests +Requires: %{name} = %{version} + +%description tests +Accessibility setting tests + +%post tests +%{TestsAppDir}/scripts/VConf_init.sh +tpk-backend -y %{TestsName} --preload + +%files tests +%manifest %{TestsName}.manifest +%{TestsAppDir}/no-ui-scenarios/* +%license LICENSE +%{DataDir}/packages/%{TestsName}.xml +#%{TestsAppDir}/bin/accessibility-setting-tests +%{TestsAppDir}/scripts/VConf_init.sh +#%{TestsAppDir}/lib/libaccessibility-setting-shared.so +%endif diff --git a/packaging/org.tizen.accessibility-setting.spec b/packaging/org.tizen.accessibility-setting.spec deleted file mode 100644 index 8d1a329..0000000 --- a/packaging/org.tizen.accessibility-setting.spec +++ /dev/null @@ -1,103 +0,0 @@ -%bcond_without tests - -Name: org.tizen.accessibility-setting -Summary: Accessibility Setting Application -Version: 0.0.1 -Release: 1 -Group: UI Framework -License: Apache-2.0 -Source0: %{name}-%{version}.tar.gz - -BuildRequires: gettext-tools -BuildRequires: pkgconfig(elementary) -BuildRequires: pkgconfig(dlog) -BuildRequires: pkgconfig(vconf) -BuildRequires: cmake -BuildRequires: pkgconfig(libtzplatform-config) -BuildRequires: pkgconfig(appcore-efl) -BuildRequires: pkgconfig(appcore-common) -BuildRequires: pkgconfig(efl-extension) -BuildRequires: pkgconfig(capi-appfw-application) -BuildRequires: pkgconfig(capi-appfw-event) -BuildRequires: pkgconfig(capi-appfw-preference) -BuildRequires: pkgconfig(tts) -BuildRequires: pkgconfig(tts-setting) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(capi-system-info) -BuildRequires: pkgconfig(capi-system-system-settings) -BuildRequires: pkgconfig(tts-setting) -BuildRequires: pkgconfig(notification) -BuildRequires: edje-tools -BuildRequires: gtest-devel - -%description -Accessibility setting application. - -%prep -%setup -q -%define _pkg_dir %{TZ_SYS_RO_APP}/%{name} - -%build - -%define DataDir %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:/usr/share} -%define AppDir %{TZ_SYS_RO_APP}/%{name} - -%define TestsName %{name}-tests -%define TestsAppDir %{TZ_SYS_RO_APP}/%{TestsName} - - -rm -rf CMakeFiles CMakeCache.txt && cmake . -DCMAKE_INSTALL_PREFIX=%{_pkg_dir} \ - -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \ - -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES \ - -DCMAKE_TESTS_INSTALL_PREFIX="%{TestsAppDir}" \ -%if !%{with tests} - -DTESTS=OFF \ -%endif - - -make %{?jobs:-j%jobs} - -export CTEST_OUTPUT_ON_FAILURE=1 -make test - -%install -%make_install - -mkdir -p %{buildroot}/%{_datadir}/license -cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}/%{_datadir}/license/%{name} - -%post -%{AppDir}/scripts/setVconfKeys.sh - -%files -%defattr(-,root,root,-) -%{_pkg_dir}/bin/* -%{_pkg_dir}/res/* -%{TZ_SYS_RO_PACKAGES}/%{name}.xml -%{_datadir}/license/%{name} -%manifest %{name}.manifest -%license LICENSE -%{AppDir}/scripts/setVconfKeys.sh - - -%if %{with tests} -%package tests -Summary: Accessibility setting - tests -Requires: %{name} = %{version} - -%description tests -Accessibility setting tests - -%post tests -%{TestsAppDir}/scripts/VConf_init.sh -tpk-backend -y %{TestsName} --preload - -%files tests -%manifest %{TestsName}.manifest -%{TestsAppDir}/no-ui-scenarios/* -%license LICENSE -%{DataDir}/packages/%{TestsName}.xml -#%{TestsAppDir}/bin/accessibility-setting-tests -%{TestsAppDir}/scripts/VConf_init.sh -#%{TestsAppDir}/lib/libaccessibility-setting-shared.so -%endif diff --git a/project-tool b/project-tool index 8356207..f75139d 100755 --- a/project-tool +++ b/project-tool @@ -2,8 +2,8 @@ TEXT_ERROR='\033[0;31mError: \033[0m' TEXT_INFO='\033[0;32mInfo: \033[0m' -ACCESSIBILITY_SETTING_NAME="org.tizen.accessibility-setting" -ACCESSIBILITY_SETTING_TESTS_NAME="org.tizen.accessibility-setting-tests" +ACCESSIBILITY_SETTING_NAME="org.tizen.accessibility-setting-profile_common" +ACCESSIBILITY_SETTING_TESTS_NAME="org.tizen.accessibility-setting-profile_common-tests" print_help() { @@ -72,8 +72,8 @@ RUN_TESTS=0 CLEAN_JOURNAL=0 DEFAULT_BUILT_TYPE="fast" DEFAULT_INSTALL_TYPE="all" -VERSION=`awk '/Version/ {print $2}' packaging/org.tizen.accessibility-setting.spec` -RELEASE=`awk '/Release/ {print $2}' packaging/org.tizen.accessibility-setting.spec` +VERSION=`awk '/Version/ {print $2}' packaging/org.tizen.accessibility-setting-profile_common.spec` +RELEASE=`awk '/Release/ {print $2}' packaging/org.tizen.accessibility-setting-profile_common.spec` ARGUMENTS=`getopt -o hb::i::tj -l help,build::,install::,run-tests,clean-journal -n "$0" -- "$@"` if [ $? -ne 0 ]; @@ -100,7 +100,7 @@ while [ $# -gt 0 ]; do '-b'|'--build') case "$2" in "") - BUILD_DIR="$HOME/GBS-ROOT/local/BUILD-ROOTS/scratch.armv7l.0/home/abuild/rpmbuild/BUILD/org.tizen.accessibility-setting-$VERSION" + BUILD_DIR="$HOME/GBS-ROOT/local/BUILD-ROOTS/scratch.armv7l.0/home/abuild/rpmbuild/BUILD/org.tizen.accessibility-setting-profile_common-$VERSION" if [ -d "$BUILD_DIR" ]; then BUILD_TYPE="fast" else @@ -176,7 +176,7 @@ if [ "$BUILD_TYPE" != "" ]; then fi if [ "$INSTALL_PACKAGE" != "" ]; then - GBS_PATH="$HOME/GBS-ROOT/local/repos/public_mobile/armv7l/RPMS" + GBS_PATH="$HOME/GBS-ROOT/local/repos/public_unified/armv7l/RPMS" BASE_PACKAGE_NAME="$GBS_PATH/$ACCESSIBILITY_SETTING_NAME-$VERSION-$RELEASE.armv7l.rpm" TEST_PACKAGE_NAME="$GBS_PATH/$ACCESSIBILITY_SETTING_TESTS_NAME-$VERSION-$RELEASE.armv7l.rpm" TEST_LIB_PACKAGE_NAME="$HOME/GBS-ROOT/local/cache/*/gtest-[0-9]*" @@ -248,7 +248,7 @@ if [ $RUN_TESTS -eq 1 ]; then DATE=`date "+%F %X"` TMPFILE=`mktemp` FAILED_BINARIES_COUNT=0 - for i in /usr/apps/org.tizen.accessibility-setting-tests/no-ui-scenarios/* + for i in /usr/apps/org.tizen.accessibility-setting-profile_common-tests/no-ui-scenarios/* do TEST_COUNT=$((TEST_COUNT+1)) $i --gtest_color=yes | tee -a $TMPFILE @@ -269,8 +269,8 @@ if [ $RUN_TESTS -eq 1 ]; then echo -e "\033[0;32mPASSED \\t---> \\t $PASSED\033[0m" echo "----------------------------" echo "Tests with Graphical User Interface" - UI_PID=`app_launcher -s org.tizen.accessibility-setting-tests | sed "s/^.*pid \= \([[:digit:]]*\).*$/\1/"` - journalctl --since "$DATE" -f | grep accessibility-setting-tests & + UI_PID=`app_launcher -s org.tizen.accessibility-setting-profile_common-tests | sed "s/^.*pid \= \([[:digit:]]*\).*$/\1/"` + journalctl --since "$DATE" -f | grep accessibility-setting-profile_common-tests & while kill -0 $UI_PID 2> /dev/null do sleep 1 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 64594be..eb8157a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/utils ${CMAKE_SOURCE_DIR}/src/presenter ${CMAKE_SOURCE_DIR}/src/service ${CMAKE_SOURCE_DIR}/src/ui ${CMAKE_SOURCE_DIR}/src/model) INSTALL(PROGRAMS VConf_init.sh DESTINATION ${CMAKE_TESTS_INSTALL_PREFIX}/scripts/) -INSTALL(FILES org.tizen.accessibility-setting-tests.xml DESTINATION ${TZ_SYS_RO_PACKAGES}) +INSTALL(FILES org.tizen.accessibility-setting-profile_common-tests.xml DESTINATION ${TZ_SYS_RO_PACKAGES}) ADD_LIBRARY(accessibility-setting-static STATIC $) TARGET_LINK_LIBRARIES(accessibility-setting-static ${pkgs_LDFLAGS}) diff --git a/tests/org.tizen.accessibility-setting-profile_common-tests.xml b/tests/org.tizen.accessibility-setting-profile_common-tests.xml new file mode 100644 index 0000000..fbcc126 --- /dev/null +++ b/tests/org.tizen.accessibility-setting-profile_common-tests.xml @@ -0,0 +1,20 @@ + + + + + accessibility-setting.png + + + + + + + + http://tizen.org/privilege/window.priority.set + http://tizen.org/privilege/inputgenerator + http://tizen.org/privilege/display + http://tizen.org/privilege/externalstorage + http://tizen.org/privilege/mediastorage + + + diff --git a/tests/org.tizen.accessibility-setting-tests.xml b/tests/org.tizen.accessibility-setting-tests.xml deleted file mode 100644 index 9aabe86..0000000 --- a/tests/org.tizen.accessibility-setting-tests.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - accessibility-setting.png - - - - - - - - http://tizen.org/privilege/window.priority.set - http://tizen.org/privilege/inputgenerator - http://tizen.org/privilege/display - http://tizen.org/privilege/externalstorage - http://tizen.org/privilege/mediastorage - - -