From 421af565f68247159f995b5dde9ad02b718111b8 Mon Sep 17 00:00:00 2001 From: Lukasz Stanislawski Date: Mon, 14 Mar 2016 15:31:14 +0900 Subject: [PATCH] Restore gbs build ABS build system is far from being ready and it doesn't look like it will be ready in near future. To support submission into Tizen images the previous build system must have been restored. From now on two build system must be supported. Change-Id: Iab02312c4edba788722a76ae908adb0879d48b7a --- CMake/CMakeLists.txt | 66 +++++++++++++++++ CMake/res/CMakeLists.txt | 3 + CMake/res/edje/CMakeLists.txt | 23 ++++++ CMake/res/po/CMakeLists.txt | 26 +++++++ org.tizen.task-mgr.manifest | 5 ++ org.tizen.task-mgr.xml | 14 ++++ packaging/org.tizen.task-mgr.spec | 83 ++++++++++++++++++++++ project_def.prop | 2 +- res/images/default.png => shared/res/task-mgr.png | Bin src/.util.c.swp | Bin 20480 -> 0 bytes src/util.c | 4 ++ tizen-manifest.xml | 2 +- 12 files changed, 226 insertions(+), 2 deletions(-) create mode 100644 CMake/CMakeLists.txt create mode 100644 CMake/res/CMakeLists.txt create mode 100644 CMake/res/edje/CMakeLists.txt create mode 100755 CMake/res/po/CMakeLists.txt create mode 100644 org.tizen.task-mgr.manifest create mode 100644 org.tizen.task-mgr.xml create mode 100644 packaging/org.tizen.task-mgr.spec rename res/images/default.png => shared/res/task-mgr.png (100%) delete mode 100644 src/.util.c.swp diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt new file mode 100644 index 0000000..b70bbea --- /dev/null +++ b/CMake/CMakeLists.txt @@ -0,0 +1,66 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT(task-mgr C) + +SET(INSTALL_EXEC_PREFIX "${INSTALL_PREFIX}/bin") +SET(INSTALL_RESDIR "${INSTALL_PREFIX}/res") +SET(INSTALL_IMAGEDIR "${INSTALL_RESDIR}/images") +SET(EDJEDIR "${INSTALL_RESDIR}/edje") +SET(LOCALEDIR "${INSTALL_RESDIR}/locale") +SET(CMAKE_VERBOSE_MAKEFILE 0) + +SET(PROJECT_ROOT_DIR "${CMAKE_SOURCE_DIR}/..") +SET(PROJECT_RESOURCES_DIR "${PROJECT_ROOT_DIR}/res") +SET(PROJECT_EDC_DIR "${PROJECT_RESOURCES_DIR}/edje") +SET(PROJECT_IMAGES_DIR "${PROJECT_RESOURCES_DIR}/images") +SET(PROJECT_PO_DIR "${PROJECT_RESOURCES_DIR}/po") + +INCLUDE(FindPkgConfig) +pkg_check_modules(MENU_PKGS REQUIRED + appcore-efl + evas + edje + elementary + ecore + eina + capi-appfw-application + capi-system-info + capi-appfw-package-manager + capi-appfw-app-manager + dlog + pkgmgr-info + feedback + context +) + +ADD_DEFINITIONS("-DINSTALL_RESDIR=\"${INSTALL_RESDIR}\"") + +FOREACH (flag ${MENU_PKGS_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +ENDFOREACH(flag) + +SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall -Winline -g -fno-builtin-malloc -fPIE") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") +SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie") + +INCLUDE_DIRECTORIES(${PROJECT_ROOT_DIR}/inc) + +ADD_EXECUTABLE(${PROJECT_NAME} + ${PROJECT_ROOT_DIR}/src/item.c + ${PROJECT_ROOT_DIR}/src/list.c + ${PROJECT_ROOT_DIR}/src/main.c + ${PROJECT_ROOT_DIR}/src/scroller.c + ${PROJECT_ROOT_DIR}/src/util.c +) + +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -lm) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${MENU_PKGS_LDFLAGS}) + +# Install +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${INSTALL_EXEC_PREFIX}) + +INSTALL(FILES ${PROJECT_ROOT_DIR}/org.tizen.task-mgr.xml DESTINATION ${SYS_PACKAGES_DIR}) +INSTALL(DIRECTORY DESTINATION ${PREFIX}/data) +INSTALL(FILES ${PROJECT_ROOT_DIR}/shared/res/task-mgr.png DESTINATION ${SYS_ICONS_DIR}) + +# End of a file +ADD_SUBDIRECTORY(res) diff --git a/CMake/res/CMakeLists.txt b/CMake/res/CMakeLists.txt new file mode 100644 index 0000000..def54bc --- /dev/null +++ b/CMake/res/CMakeLists.txt @@ -0,0 +1,3 @@ +ADD_SUBDIRECTORY(edje) +ADD_SUBDIRECTORY(po) + diff --git a/CMake/res/edje/CMakeLists.txt b/CMake/res/edje/CMakeLists.txt new file mode 100644 index 0000000..ef72254 --- /dev/null +++ b/CMake/res/edje/CMakeLists.txt @@ -0,0 +1,23 @@ +ADD_CUSTOM_TARGET(layout.edj + COMMAND edje_cc -id ${PROJECT_EDC_DIR}/images + ${PROJECT_EDC_DIR}/layout.edc layout.edj + DEPENDS ${PROJECT_EDC_DIR}/layout.edc +) +ADD_DEPENDENCIES(${PROJECT_NAME} layout.edj) +INSTALL(FILES layout.edj DESTINATION ${EDJEDIR}) + +ADD_CUSTOM_TARGET(item.edj + COMMAND edje_cc -id ${PROJECT_EDC_DIR}/images + ${PROJECT_EDC_DIR}/item.edc item.edj + DEPENDS ${PROJECT_EDC_DIR}/item.edc +) +ADD_DEPENDENCIES(${PROJECT_NAME} item.edj) +INSTALL(FILES item.edj DESTINATION ${EDJEDIR}) + +ADD_CUSTOM_TARGET(box.edj + COMMAND edje_cc -id ${PROJECT_EDC_DIR}/images + ${PROJECT_EDC_DIR}/box.edc box.edj + DEPENDS ${PROJECT_EDC_DIR}/box.edc +) +ADD_DEPENDENCIES(${PROJECT_NAME} box.edj) +INSTALL(FILES box.edj DESTINATION ${EDJEDIR}) diff --git a/CMake/res/po/CMakeLists.txt b/CMake/res/po/CMakeLists.txt new file mode 100755 index 0000000..1ac0fc9 --- /dev/null +++ b/CMake/res/po/CMakeLists.txt @@ -0,0 +1,26 @@ +# for i18n + +SET(POFILES ar.po az.po bg.po ca.po cs.po da.po de.po el_GR.po en_PH.po en.po en_US.po + es_ES.po es_US.po et.po eu.po fi.po fr_CA.po fr.po ga.po gl.po hi.po hr.po + hu.po hy.po is.po it_IT.po ja_JP.po ka.po kk.po ko_KR.po lt.po lv.po mk.po + nb.po nl.po pl.po pt_BR.po pt_PT.po ro.po ru_RU.po sk.po sl.po sr.po sv.po + tr_TR.po uk.po uz.po zh_CN.po zh_HK.po zh_TW.po) +SET(MSGFMT "/usr/bin/msgfmt") + +MESSAGE(STATUS "po files ---") +FOREACH(pofile ${POFILES}) + SET(pofile ${PROJECT_PO_DIR}/${pofile}) + MESSAGE(STATUS " ${pofile}") + GET_FILENAME_COMPONENT(absPofile ${pofile} ABSOLUTE) + GET_FILENAME_COMPONENT(lang ${absPofile} NAME_WE) + SET(moFile ${CMAKE_CURRENT_BINARY_DIR}/${lang}.mo) + ADD_CUSTOM_COMMAND( + OUTPUT ${moFile} + COMMAND ${MSGFMT} -o ${moFile} ${absPofile} + DEPENDS ${absPofile} + ) + INSTALL(FILES ${moFile} DESTINATION ${LOCALEDIR}/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo) + SET(moFiles ${moFiles} ${moFile}) +ENDFOREACH(pofile) + +ADD_CUSTOM_TARGET(po ALL DEPENDS ${moFiles}) diff --git a/org.tizen.task-mgr.manifest b/org.tizen.task-mgr.manifest new file mode 100644 index 0000000..a76fdba --- /dev/null +++ b/org.tizen.task-mgr.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/org.tizen.task-mgr.xml b/org.tizen.task-mgr.xml new file mode 100644 index 0000000..539a08a --- /dev/null +++ b/org.tizen.task-mgr.xml @@ -0,0 +1,14 @@ + + + + + + taskmanager.png + + + http://tizen.org/privilege/packagemanager.info + http://tizen.org/privilege/appmanager.kill.bgapp + http://tizen.org/privilege/appmanager.launch + http://tizen.org/privilege/apphistory.read + + diff --git a/packaging/org.tizen.task-mgr.spec b/packaging/org.tizen.task-mgr.spec new file mode 100644 index 0000000..8a5d5e0 --- /dev/null +++ b/packaging/org.tizen.task-mgr.spec @@ -0,0 +1,83 @@ +Name: org.tizen.task-mgr +Summary: Taskmanager application +Version: 0.0.1 +Release: 1 +Group: Applications/Core Applications +License: Apache-2.0 +Source0: %{name}-%{version}.tar.gz + +%if "%{?profile}" == "wearable" +ExcludeArch: %{arm} %ix86 x86_64 +%endif + +%if "%{?profile}" == "tv" +ExcludeArch: %{arm} %ix86 x86_64 +%endif + +BuildRequires: cmake +BuildRequires: edje-tools +BuildRequires: gettext-tools +BuildRequires: hash-signer +BuildRequires: pkgconfig(appcore-efl) +BuildRequires: pkgconfig(capi-appfw-application) +BuildRequires: pkgconfig(ecore) +BuildRequires: pkgconfig(eina) +BuildRequires: pkgconfig(evas) +BuildRequires: pkgconfig(edje) +BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(elementary) +BuildRequires: pkgconfig(capi-system-info) +BuildRequires: pkgconfig(capi-appfw-package-manager) +BuildRequires: pkgconfig(capi-appfw-app-manager) +BuildRequires: pkgconfig(pkgmgr-info) +BuildRequires: pkgconfig(feedback) +BuildRequires: pkgconfig(context) +BuildRequires: pkgconfig(libtzplatform-config) + +%description +Taskmanager application reference implementation. + +%prep +%setup -q + +%build + +%define _pkg_dir %{TZ_SYS_RO_APP}/%{name} +%define _pkg_shared_dir %{_pkg_dir}/shared +%define _pkg_data_dir %{_pkg_dir}/data +%define _sys_icons_dir %{_pkg_shared_dir}/res +%define _sys_packages_dir %{TZ_SYS_RO_PACKAGES} +%define _sys_license_dir %{TZ_SYS_SHARE}/license + +cd CMake +cmake . -DINSTALL_PREFIX=%{_pkg_dir} \ + -DSYS_ICONS_DIR=%{_sys_icons_dir} \ + -DSYS_PACKAGES_DIR=%{_sys_packages_dir} +make %{?jobs:-j%jobs} +cd - + +%install +cd CMake +%make_install +cd - + +%define tizen_sign 1 +%define tizen_sign_base %{_pkg_dir} +%define tizen_sign_level public +%define tizen_author_sign 1 +%define tizen_dist_sign 1 +%find_lang task-mgr + +%post + +%postun -p /sbin/ldconfig + +%files -f task-mgr.lang +%manifest %{name}.manifest +%defattr(-,root,root,-) +%{_pkg_dir}/bin/task-mgr +%{_pkg_dir}/res/* +%{_sys_packages_dir}/%{name}.xml +%{_sys_icons_dir}/task-mgr.png +%{_pkg_dir}/author-signature.xml +%{_pkg_dir}/signature1.xml diff --git a/project_def.prop b/project_def.prop index 3c7ede9..3f4f3b5 100644 --- a/project_def.prop +++ b/project_def.prop @@ -1,6 +1,6 @@ # Project Name -APPNAME = taskmanager +APPNAME = task-mgr # Project Type type = app diff --git a/res/images/default.png b/shared/res/task-mgr.png similarity index 100% rename from res/images/default.png rename to shared/res/task-mgr.png diff --git a/src/.util.c.swp b/src/.util.c.swp deleted file mode 100644 index 123e66e9544df5e50afd3a4b122e7093b1790f1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20480 zcmeI2ZEPGz8OJwGUvi;s5JgJ)#P~wP*<9`%m$Xq*Cv5FaeChelx;y7ZZMCd-=X?|I z?Oyi9j`IdzBJmF@F+L~ zPJ#Quey|TP@NRJBZHn>?xBwQxJP5%d@IEjEt_QzGU48_90Gc9*=_WkbKpDRN$>>l!3i)84gd}8 z0s~+J_$MZBUItHtC&5?1SrC9@U<3?;&ER*K$oVyR0$c#+K?CducY)i%RZJGW0=^F( z1|I?Ez!AU!j#R2xKB#5VB{yIV!?A2`F-v&d3|w!K1&b}7OAqc6Q@~ddmnJ88TrSK4z6O7bKr%3fVyA1+DUC|mFa3t z8(+J8i9wJ1Zs?h-)i|+O(W>R?%Gf$pUf(Z$yJMYV^;e#?T-k>Q*Kl0oFMmMlXL%yO{C0H!n;cr9#f6 zWwulK+_7}q2pzMbd;CO*Ozj+5R+=srA2{IQ-@x$6W3?vm;QRQ}mZbQ97b(g|K2Nm$l_O=`=%ylPjup}AO zA`zn6>*JYpZ9=2oiWRD?RIahgbg5J*9gI4|vy9v5%P5{AKlV5{auf-Z($TNh4Pmpu zjk?HW;~d2I!zL$5Gj~{n=`49Ul2X)JhWrM{Q%xt;l6p`>U%3<#aSSg>j{bJZ_vB@q zM|Q|Y+$&$>k)4EZtn}2;w*|xl-$)gr$X`~%6%r*S*+mrd{OZoLoVHRE(M&p1X(L;ltZeGP;>`0ZU!O zQsgj-oC8VZ#4R?%64^H>Ew+9X-?R7)O+=YQ9ClW3CFZUi?ejJJGhZnI#+CWHirwH zEBE+;HG>e%HTHE~j2+l)y3Vz(M=!mVH`*S6*SX{41+;3C-W!_Do7@QuZ;`IEp*+AJ zvqe+T@BnRvg^tBN7Bo03;sxvYJVz<298I!wjn&;ajo;#?sAF7V8_sNq&C+bvoyW)+ zeE`GTu_=5ip3gAeCNoD0wTbd{jU7=d6}40=XjN9OFboLB3-qGI*#V}OjtU3(bU&p-Lx#>!1iMtyb}pOS5~`YN48? z0!=$MnWjO4z&M`GEK+;6g=x F!$31jO!eI-Z2vEB$^WA!|fWbe^kflZt zwD#ol3kwT50~^R2Jm-3|c~~M1{d}=7rj@GNj*;AOlHr&evZk@f+?l|DT?4&*3upBn zosEEOFD6MHe7b~q9S03mkA`Q^#^kMl%4NEwjp3M_VIAF_h60vyFgd%t1CXJUq;H;AiJ9RyCS_2(Kf?ObpQ+Vft*$ z&1G3JuyRaAS03dft!Wq%JCQ2KYS?MdCgZL4N`6S8@BbI@?fzbT*VFeuKGUP)Z#cgS z9tEET=fDGC5*z{rup8V3b^*%29mqo}AQg}bNCl(Sf z&9P{{fF=UEXDPSS^3E{Ub$aIX;u-(;BIp#BDx=8*ZeeDly%rQr`NuPNKHJB9af-Y3 z49pGEL~^Q*X^>33phT0pbXyPTdmeLmoF-M5R*dxHu5c(Lrb#+RvMkO_%K*uuQSaPv zTt@o-{}|Sm|Bm%%`u=b4@BcTx=kP5t26ljl1IU`~VirI+G?ResRi~Bz0DdOQ=l}o! diff --git a/src/util.c b/src/util.c index 66721e8..ab815fa 100644 --- a/src/util.c +++ b/src/util.c @@ -118,7 +118,11 @@ const char *util_get_file_path(app_subdir dir, const char *relative) prefix = app_get_cache_path(); break; case APP_DIR_RESOURCE: +#ifdef INSTALL_RESDIR + prefix = strdup(INSTALL_RESDIR); +#else prefix = app_get_resource_path(); +#endif break; case APP_DIR_SHARED_DATA: prefix = app_get_shared_data_path(); diff --git a/tizen-manifest.xml b/tizen-manifest.xml index 4fe65a1..6ae95f3 100644 --- a/tizen-manifest.xml +++ b/tizen-manifest.xml @@ -1,7 +1,7 @@ - + taskmanager.png -- 2.7.4