restore gbs build

Change-Id: I9db73446a9bfee9533b73654163b75a94ddd2297

diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
new file mode 100644 (file)
index 0000000..339d943
--- /dev/null
+++ b/CMake/CMakeLists.txt
@@ -0,0 +1,71 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT(indicator-win C)
+
+SET(INSTALL_EXEC_PREFIX "${INSTALL_PREFIX}/bin")
+SET(INSTALL_RESDIR "${INSTALL_PREFIX}/res")
+SET(INSTALL_IMAGEDIR "${INSTALL_RESDIR}/images")
+SET(INSTALL_EDJEDIR "${INSTALL_RESDIR}/resource")
+SET(INSTALL_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}/resource")
+SET(PROJECT_IMAGES_DIR "${PROJECT_RESOURCES_DIR}/images")
+SET(PROJECT_PO_DIR "${PROJECT_RESOURCES_DIR}/po")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(pkgs REQUIRED
+       capi-appfw-application
+       capi-appfw-app-manager
+       capi-system-runtime-info
+       capi-network-bluetooth
+       capi-appfw-preference
+       capi-system-system-settings
+       capi-media-player
+       capi-media-sound-manager
+       capi-media-metadata-extractor
+       capi-network-wifi
+       capi-ui-efl-util
+       appcore-common
+       dlog
+       elementary
+       notification
+       vconf
+       minicontrol-monitor
+       feedback
+       pkgmgr-info
+       efl-assist
+       tzsh-indicator-service
+       capi-system-device
+       capi-telephony
+       capi-network-wifi-direct
+       capi-network-nfc
+       capi-network-tethering
+       storage
+       capi-base-utils-i18n
+)
+
+FOREACH(flag ${pkgs_CFLAGS})
+       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -std=gnu99 -fvisibility=hidden -Wall -Winline -g -fno-builtin-malloc -fPIC")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
+
+INCLUDE_DIRECTORIES(${PROJECT_ROOT_DIR}/inc)
+
+AUX_SOURCE_DIRECTORY(${PROJECT_ROOT_DIR}/src DAEMON_SRCS)
+FILE(GLOB_RECURSE MODULE_SRCS ${PROJECT_ROOT_DIR}/src/modules/*.c)
+
+SET(SRCS ${DAEMON_SRCS} ${MODULE_SRCS})
+
+ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
+
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${INSTALL_EXEC_PREFIX})
+INSTALL(DIRECTORY DESTINATION ${PREFIX}/data})
+INSTALL(FILES ${PROJECT_ROOT_DIR}/tizen-manifest.xml DESTINATION ${SYS_PACKAGES_DIR} RENAME org.tizen.indicator.xml)
+
+ADD_SUBDIRECTORY(res)

diff --git a/CMake/res/CMakeLists.txt b/CMake/res/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f457a28
--- /dev/null
+++ b/CMake/res/CMakeLists.txt
@@ -0,0 +1,5 @@
+#CONFIGURE_FILE(${PROJECT_NAME}.sh.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME})
+#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME} DESTINATION /etc/init.d/)
+
+ADD_SUBDIRECTORY(resource)
+ADD_SUBDIRECTORY(po)

diff --git a/CMake/res/po/CMakeLists.txt b/CMake/res/po/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..6618036
--- /dev/null
+++ b/CMake/res/po/CMakeLists.txt
@@ -0,0 +1,27 @@
+# for i18n
+
+SET(POFILES et.po is.po hy.po hu.po hr.po hi.po nb.po ga.po fr_FR.po fr_CA.po fi.po
+eu.po it_IT.po es_MX.po es_ES.po en_US.po en_PH.po en.po el_GR.po de_DE.po da.po
+ca.po bg.po az.po ar.po ja_JP.po zh_TW.po zh_SG.po zh_HK.po zh_CN.po uz.po cs.po
+uk.po tr_TR.po sv.po sr.po sl.po sk.po ru_RU.po ka.po pt_PT.po pt_BR.po pl.po
+nl_NL.po gl.po mk.po lv.po lt.po ko_KR.po kk.po ro.po)
+
+SET(MSGFMT "/usr/bin/msgfmt")
+
+FOREACH(pofile ${POFILES})
+       SET(pofile ${PROJECT_PO_DIR}/${pofile})
+       MESSAGE("PO: ${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 ${INSTALL_LOCALEDIR}/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
+       SET(moFiles ${moFiles} ${moFile})
+ENDFOREACH(pofile)
+
+MESSAGE(".mo files: ${moFiles}")
+ADD_CUSTOM_TARGET(po ALL DEPENDS ${moFiles})

diff --git a/CMake/res/resource/CMakeLists.txt b/CMake/res/resource/CMakeLists.txt
new file mode 100644 (file)
index 0000000..9cc5524
--- /dev/null
+++ b/CMake/res/resource/CMakeLists.txt
@@ -0,0 +1,68 @@
+ADD_CUSTOM_TARGET(indicator_port.edj
+               COMMAND edje_cc -id ${PROJECT_EDC_DIR}/icons_edc "${EDJEFLAGS}"
+               ${PROJECT_EDC_DIR}/indicator_port.edc
+               indicator_port.edj
+               DEPENDS ${PROJECT_EDC_DIR}/indicator_port.edc
+)
+ADD_DEPENDENCIES(${PROJECT_NAME} indicator_port.edj)
+
+ADD_CUSTOM_TARGET(ticker.edj
+               COMMAND edje_cc -id ${PROJECT_EDC_DIR}/icons_edc "${EDJEFLAGS}"
+               ${PROJECT_EDC_DIR}/ticker.edc
+               ticker.edj
+               DEPENDS ${PROJECT_EDC_DIR}/ticker.edc
+)
+ADD_DEPENDENCIES(${PROJECT_NAME} ticker.edj)
+
+ADD_CUSTOM_TARGET(ticker_default.edj
+               COMMAND edje_cc -id ${PROJECT_EDC_DIR}/icons_edc "${EDJEFLAGS}"
+               ${PROJECT_EDC_DIR}/ticker_default.edc
+               ticker_default.edj
+               DEPENDS ${PROJECT_EDC_DIR}/ticker_default.edc
+)
+ADD_DEPENDENCIES(${PROJECT_NAME} ticker_default.edj)
+
+ADD_CUSTOM_TARGET(ticker_animated_icon.edj
+               COMMAND edje_cc -id ${PROJECT_EDC_DIR}/animated_icon "${EDJEFLAGS}"
+               ${PROJECT_EDC_DIR}/ticker_animated_icon.edc
+               ticker_animated_icon.edj
+               DEPENDS ${PROJECT_EDC_DIR}/ticker_animated_icon.edc
+)
+ADD_DEPENDENCIES(${PROJECT_NAME} ticker_animated_icon.edj)
+
+ADD_CUSTOM_TARGET(indicator_icon_theme.edj
+               COMMAND edje_cc "${EDJEFLAGS}"
+               ${PROJECT_EDC_DIR}/indicator_icon_theme.edc
+               indicator_icon_theme.edj
+               DEPENDS ${PROJECT_EDC_DIR}/indicator_icon_theme.edc
+)
+ADD_DEPENDENCIES(${PROJECT_NAME} indicator_icon_theme.edj)
+
+ADD_CUSTOM_TARGET(indicator_icon_nonfixed_theme.edj
+               COMMAND edje_cc "${EDJEFLAGS}"
+               ${PROJECT_EDC_DIR}/indicator_icon_nonfixed_theme.edc
+               indicator_icon_nonfixed_theme.edj
+               DEPENDS ${PROJECT_EDC_DIR}/indicator_icon_nonfixed_theme.edc
+)
+ADD_DEPENDENCIES(${PROJECT_NAME} indicator_icon_nonfixed_theme.edj)
+
+ADD_CUSTOM_TARGET(indicator_icon_animation.edj
+               COMMAND edje_cc -id ${PROJECT_EDC_DIR}/icons_edc "${EDJEFLAGS}"
+               ${PROJECT_EDC_DIR}/indicator_icon_animation.edc
+               indicator_icon_animation.edj
+               DEPENDS ${PROJECT_EDC_DIR}/indicator_icon_animation.edc
+)
+ADD_DEPENDENCIES(${PROJECT_NAME} indicator_icon_animation.edj)
+
+INSTALL(FILES indicator_port.edj DESTINATION ${INSTALL_EDJEDIR})
+INSTALL(FILES ticker.edj DESTINATION ${INSTALL_EDJEDIR})
+INSTALL(FILES ticker_default.edj DESTINATION ${INSTALL_EDJEDIR})
+INSTALL(FILES ticker_animated_icon.edj DESTINATION ${INSTALL_EDJEDIR})
+INSTALL(FILES indicator_icon_theme.edj DESTINATION ${INSTALL_EDJEDIR})
+INSTALL(FILES indicator_icon_nonfixed_theme.edj DESTINATION ${INSTALL_EDJEDIR})
+INSTALL(FILES indicator_icon_animation.edj DESTINATION ${INSTALL_EDJEDIR})
+
+INSTALL(DIRECTORY ${PROJECT_EDC_DIR}/icons DESTINATION ${INSTALL_EDJEDIR} FILES_MATCHING PATTERN "*.png")
+INSTALL(DIRECTORY ${PROJECT_EDC_DIR}/icons DESTINATION ${INSTALL_EDJEDIR} FILES_MATCHING PATTERN "*.PNG")
+INSTALL(DIRECTORY ${PROJECT_EDC_DIR}/icons DESTINATION ${INSTALL_EDJEDIR} FILES_MATCHING PATTERN "*.gif")
+

diff --git a/org.tizen.indicator.manifest b/org.tizen.indicator.manifest
new file mode 100644 (file)
index 0000000..97e8c31
--- /dev/null
+++ b/org.tizen.indicator.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_"/>
+       </request>
+</manifest>

diff --git a/packaging/indicator.service b/packaging/indicator.service
new file mode 100644 (file)
index 0000000..3c3c2a8
--- /dev/null
+++ b/packaging/indicator.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Start the indicator
+After=starter.service wm_ready.service smack-default-labeling.service
+Requires=starter.service
+
+[Service]
+ExecStart=/usr/apps/org.tizen.indicator/bin/indicator-win
+KillSignal=SIGKILL
+
+[Install]
+WantedBy=multi-user.target
+

diff --git a/packaging/org.tizen.indicator.spec b/packaging/org.tizen.indicator.spec
new file mode 100644 (file)
index 0000000..fb7ba0f
--- /dev/null
+++ b/packaging/org.tizen.indicator.spec
@@ -0,0 +1,118 @@
+Name:       org.tizen.indicator
+Summary:    indicator window
+Version:    0.2.53
+Release:    1
+Group:      utils
+License:    Apache-2.0
+Source0:    %{name}-%{version}.tar.gz
+Source1:    indicator.service
+
+%if "%{?profile}" == "wearable"
+ExcludeArch: %{arm} %ix86 x86_64
+%endif
+
+%if "%{?profile}"=="tv"
+ExcludeArch: %{arm} %ix86 x86_64
+%endif
+
+BuildRequires: pkgconfig(capi-appfw-application)
+BuildRequires: pkgconfig(capi-appfw-app-manager)
+BuildRequires: pkgconfig(capi-system-runtime-info)
+BuildRequires: pkgconfig(capi-network-bluetooth)
+BuildRequires: pkgconfig(capi-appfw-preference)
+BuildRequires: pkgconfig(capi-system-system-settings)
+BuildRequires: pkgconfig(capi-media-player)
+BuildRequires: pkgconfig(capi-media-sound-manager)
+BuildRequires: pkgconfig(capi-media-metadata-extractor)
+BuildRequires: pkgconfig(capi-network-wifi)
+BuildRequires: pkgconfig(capi-ui-efl-util)
+BuildRequires: pkgconfig(appcore-common)
+BuildRequires: pkgconfig(dlog)
+BuildRequires: pkgconfig(elementary)
+BuildRequires: pkgconfig(ecore)
+BuildRequires: pkgconfig(ecore-evas)
+BuildRequires: pkgconfig(edje)
+BuildRequires: pkgconfig(evas)
+BuildRequires: pkgconfig(eina)
+BuildRequires: pkgconfig(vconf)
+BuildRequires: pkgconfig(notification)
+BuildRequires: pkgconfig(minicontrol-monitor)
+BuildRequires: pkgconfig(icu-io)
+BuildRequires: pkgconfig(feedback)
+BuildRequires: pkgconfig(pkgmgr-info)
+BuildRequires: pkgconfig(edbus)
+BuildRequires: pkgconfig(efl-assist)
+BuildRequires: pkgconfig(message-port)
+BuildRequires: pkgconfig(tzsh-indicator-service)
+BuildRequires: pkgconfig(libtzplatform-config)
+BuildRequires: pkgconfig(capi-system-device)
+BuildRequires: pkgconfig(capi-telephony)
+BuildRequires: pkgconfig(capi-network-wifi-direct)
+BuildRequires: pkgconfig(capi-network-nfc)
+BuildRequires: pkgconfig(capi-network-tethering)
+BuildRequires: pkgconfig(storage)
+BuildRequires: pkgconfig(capi-base-utils-i18n)
+
+BuildRequires: cmake
+BuildRequires: edje-tools
+BuildRequires: gettext-tools
+BuildRequires: hash-signer
+
+Requires(post): /usr/bin/vconftool
+
+%description
+Indicator window 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
+%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
+
+
+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
+rm -rf %{buildroot}
+cd CMake
+%make_install
+cd -
+
+mkdir -p %{buildroot}/%{_sys_license_dir}
+cp LICENSE %{buildroot}/%{_sys_license_dir}/%{name}
+
+mkdir -p %{buildroot}/usr/lib/systemd/user/default.target.wants
+install -m 0644 %SOURCE1 %{buildroot}/usr/lib/systemd/user/indicator.service
+ln -s ../indicator.service %{buildroot}/usr/lib/systemd/user/default.target.wants/
+%find_lang indicator-win
+
+
+%files -f indicator-win.lang
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_pkg_dir}/bin/*
+%{_pkg_dir}/res/resource/icons/*
+%{_pkg_dir}/res/resource/*.edj
+%{_sys_packages_dir}/%{name}.xml
+/usr/lib/systemd/user/indicator.service
+/usr/lib/systemd/user/default.target.wants/indicator.service
+%{_sys_license_dir}/%{name}
+%{_pkg_dir}/author-signature.xml
+%{_pkg_dir}/signature1.xml

diff --git a/src/box.c b/src/box.c
index df617b7..66b7eac 100644 (file)
--- a/src/box.c
+++ b/src/box.c
@@ -19,7 +19,7 @@
 
 //#include <Ecore_X.h>
 #include <Eina.h>
-#include <display.h>
+#include <device/display.h>
 
 #include "common.h"
 #include "box.h"

diff --git a/tizen-manifest.xml b/tizen-manifest.xml
index 88ec2e5..c66bca4 100644 (file)
--- a/tizen-manifest.xml
+++ b/tizen-manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.indicator-win" version="1.0.0">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.indicator" version="1.0.0">
     <profile name="mobile"/>
-    <ui-application appid="org.tizen.indicator-win" exec="indicator-win" launch_mode="single" multiple="false" nodisplay="true" taskmanage="false" type="capp">
+    <ui-application appid="org.tizen.indicator" exec="indicator-win" launch_mode="single" multiple="false" nodisplay="true" taskmanage="false" type="capp">
         <label>indicator-win</label>
         <icon>indicator-win.png</icon>
     </ui-application>