From 220dd1018a4242c13c19dbb3b87068d4d50971f9 Mon Sep 17 00:00:00 2001 From: Youngsoo Choi Date: Wed, 28 Jan 2015 13:07:02 +0900 Subject: [PATCH] Add spec and manifest files for supporting tizen v3.0 Tizen v3.0 has some constraints of package configuration which are diffrent from Tizen v2.x. 1. xml file should be installed in '/usr/share/packages'. 2. app should be installed in '/usr/apps'. 3. appid should be consist of '.' such as 'org.tizen.chromium-efl'. 4. environment variable 'ELM_ENGINE' has to be set as 'gl'. bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=11063 Change-Id: I106cca288ef15c4618452602bd725960404b9f5e Signed-off-by: Youngsoo Choi --- .../ewk/efl_webview_app/chromium-efl_v3.0.xml | 16 +++++ tizen_src/ewk/efl_webview_app/mini_browser.c | 5 ++ tizen_src/packaging/chromium-efl.manifest | 1 - tizen_src/packaging/chromium-efl.spec | 49 +++++++++++---- .../packaging/chromium-efl_v3.0.manifest | 61 +++++++++++++++++++ 5 files changed, 120 insertions(+), 12 deletions(-) create mode 100644 tizen_src/ewk/efl_webview_app/chromium-efl_v3.0.xml create mode 100644 tizen_src/packaging/chromium-efl_v3.0.manifest diff --git a/tizen_src/ewk/efl_webview_app/chromium-efl_v3.0.xml b/tizen_src/ewk/efl_webview_app/chromium-efl_v3.0.xml new file mode 100644 index 000000000000..17f64714298a --- /dev/null +++ b/tizen_src/ewk/efl_webview_app/chromium-efl_v3.0.xml @@ -0,0 +1,16 @@ + + + + SWC + mini browser application based on chromium-efl + + /opt/share/icons/mini-browser.png + + + + + http://tizen.org/privilege/location + http://tizen.org/privilege/internet + http://tizen.org/privilege/network.get + + diff --git a/tizen_src/ewk/efl_webview_app/mini_browser.c b/tizen_src/ewk/efl_webview_app/mini_browser.c index 258d488f60a2..7fb2817bcce1 100755 --- a/tizen_src/ewk/efl_webview_app/mini_browser.c +++ b/tizen_src/ewk/efl_webview_app/mini_browser.c @@ -696,6 +696,11 @@ int main(int argc, char** argv) { LOGD(" Minibrowser main\n"); +#if defined(TIZEN_V_3_0) + if (setenv("ELM_ENGINE","gl",1)==0) + LOGD("'ELM_ENGINE' has been set to 'gl' value.\n"); +#endif + //FIXME: this is temporal code. ewk_set_arguments(argc, argv); diff --git a/tizen_src/packaging/chromium-efl.manifest b/tizen_src/packaging/chromium-efl.manifest index 6392d2514be5..186a99265031 100644 --- a/tizen_src/packaging/chromium-efl.manifest +++ b/tizen_src/packaging/chromium-efl.manifest @@ -1,4 +1,3 @@ - diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec index 796c561e97ce..08ac1198d5ce 100644 --- a/tizen_src/packaging/chromium-efl.spec +++ b/tizen_src/packaging/chromium-efl.spec @@ -7,7 +7,11 @@ %define _debug_mode 1 %endif +%if "%{_repository}"=="arm-x11" +Name: org.tizen.chromium-efl +%else Name: chromium-efl +%endif Summary: Chromium EFL # Set by by scripts/update-chromium-version.sh %define ChromiumVersion 40.2214.38 @@ -326,10 +330,30 @@ install -m 0755 "%{OUTPUT_FOLDER}"/icudtl.dat "%{buildroot}%{CHROMIUM_EXE_DIR install -m 0755 "%{OUTPUT_FOLDER}"/content_shell.pak "%{buildroot}%{CHROMIUM_EXE_DIR}" install -m 0644 "%{OUTPUT_FOLDER}"/resources/*.edj "%{buildroot}%{CHROMIUM_DATA_DIR}"/themes +%if "%{?chromium_efl_tizen_version:%{chromium_efl_tizen_version}}%{!?chromium_efl_tizen_version:0}" == "3.0" +mkdir -p "%{buildroot}"/usr/apps/%{name}/bin +install -m 0755 "%{OUTPUT_FOLDER}"/efl_webview_app "%{buildroot}"/usr/apps/%{name}/bin/ +install -m 0755 "%{OUTPUT_FOLDER}"/mini_browser "%{buildroot}"/usr/apps/%{name}/bin/ +install -m 0755 "%{OUTPUT_FOLDER}"/ubrowser "%{buildroot}"/usr/apps/%{name}/bin/ + +install -d "%{buildroot}"/usr/share/packages +install -m 0644 ewk/efl_webview_app/chromium-efl_v3.0.xml "%{buildroot}"/usr/share/packages + +mkdir -p "%{buildroot}"/usr/apps/%{name}/res/icons +install -d "%{buildroot}"/usr/share/icons +install -m 0644 ewk/efl_webview_app/mini-browser.png "%{buildroot}"/usr/apps/%{name}/res/icons +%else install -m 0755 "%{OUTPUT_FOLDER}"/efl_webview_app "%{buildroot}"%{_bindir} install -m 0755 "%{OUTPUT_FOLDER}"/mini_browser "%{buildroot}"%{_bindir} install -m 0755 "%{OUTPUT_FOLDER}"/ubrowser "%{buildroot}"%{_bindir} +install -d "%{buildroot}"/opt/share/packages +install -m 0644 ewk/efl_webview_app/chromium-efl.xml "%{buildroot}"/opt/share/packages + +install -d "%{buildroot}"/opt/share/icons +install -m 0644 ewk/efl_webview_app/mini-browser.png "%{buildroot}"/opt/share/icons +%endif + install -m 0644 "%{OUTPUT_FOLDER}"/pkgconfig/*.pc "%{buildroot}"%{_libdir}/pkgconfig/ install -m 0644 ewk/efl_integration/public/*.h "%{buildroot}"%{_includedir}/chromium-ewk/ install -m 0644 src/v8/include/*.h "%{buildroot}"%{_includedir}/v8/ @@ -344,12 +368,6 @@ install -m 0755 "%{OUTPUT_FOLDER}"/content_shell_efl "%{buildroot}%{CHROMIUM_EXE sed 's#@binary@#%{CHROMIUM_EXE_DIR}/content_shell#' %{SOURCE1} > "%{buildroot}"%{_bindir}/content_shell %endif -install -d "%{buildroot}"/opt/share/packages -install -m 0644 ewk/efl_webview_app/chromium-efl.xml "%{buildroot}"/opt/share/packages - -install -d "%{buildroot}"/opt/share/icons -install -m 0644 ewk/efl_webview_app/mini-browser.png "%{buildroot}"/opt/share/icons - %if 0%{?_enable_unittests} install -d "%{INSTALL_ROOT}%{CHROMIUM_UNITTESTS_DIR}" for test in "%{OUTPUT_FOLDER}/*_unittests"; do @@ -383,7 +401,21 @@ chown -R app:app %{CHROMIUM_WEBDB_DIR}/data %postun %files +%if "%{?chromium_efl_tizen_version:%{chromium_efl_tizen_version}}%{!?chromium_efl_tizen_version:0}" == "3.0" +%manifest packaging/chromium-efl_v3.0.manifest +/usr/apps/%{name}/bin/efl_webview_app +/usr/apps/%{name}/bin/mini_browser +/usr/apps/%{name}/bin/ubrowser +/usr/share/packages/chromium-efl_v3.0.xml +/usr/apps/%{name}/res/icons/mini-browser.png +%else %manifest packaging/%{name}.manifest +%{_bindir}/efl_webview_app +%{_bindir}/mini_browser +%{_bindir}/ubrowser +/opt/share/packages/chromium-efl.xml +/opt/share/icons/mini-browser.png +%endif %defattr(-,root,root,-) %{_libdir}/libchromium-efl.so %{_libdir}/libchromium-ewk.so @@ -393,11 +425,6 @@ chown -R app:app %{CHROMIUM_WEBDB_DIR}/data %{CHROMIUM_EXE_DIR}/content_shell.pak %{CHROMIUM_EXE_DIR}/locales/*.pak %{CHROMIUM_DATA_DIR}/themes/*.edj -%{_bindir}/efl_webview_app -%{_bindir}/mini_browser -%{_bindir}/ubrowser -/opt/share/packages/chromium-efl.xml -/opt/share/icons/mini-browser.png %{CHROMIUM_DATA_DIR}/locale/* %files devel diff --git a/tizen_src/packaging/chromium-efl_v3.0.manifest b/tizen_src/packaging/chromium-efl_v3.0.manifest new file mode 100644 index 000000000000..2fa5f404dbf8 --- /dev/null +++ b/tizen_src/packaging/chromium-efl_v3.0.manifest @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.34.1