fixup! Add build switch to separate onscreen and offscreen targets

This patch fixes the path error of pak files during build and
packaging of rpm when out directory does not exist yet.

Change-Id: I77fe89c4a10175b4f1b4ea28f21cba92b5e007a7
Signed-off-by: Ayush Kumar <ayush.k@samsung.com>

diff --git a/packaging/chromium-efl.spec b/packaging/chromium-efl.spec
index 1f6c3ee..d6b0c1f 100644 (file)
--- a/packaging/chromium-efl.spec
+++ b/packaging/chromium-efl.spec
@@ -362,12 +362,6 @@ install -d "%{buildroot}%{CHROMIUM_EXE_DIR}"
 install -d "%{buildroot}%{CHROMIUM_EXE_DIR}"/locales
 install -d "%{buildroot}%{CHROMIUM_DATA_DIR}"/themes
 
-# locale for ewk layer
-cp -r "%{OUTPUT_FOLDER}/locale" "%{buildroot}/%{CHROMIUM_LOCALE_DIR}"
-
-# locale for chromium layer
-install -m 0644 "%{OUTPUT_FOLDER}"/locales/efl/*.pak "%{buildroot}%{CHROMIUM_EXE_DIR}"/locales
-
 install -d "%{buildroot}"%{_libdir}/../local/lib/
 %if %{__use_clang} == 1
   install -m 0644 %{_libdir}/libatomic.so*         "%{buildroot}"%{_libdir}/../local/lib/
@@ -378,10 +372,6 @@ install -m 0755 "%{OUTPUT_FOLDER}"/snapshot_blob.bin "%{buildroot}%{CHROMIUM_EXE
 install -m 0644 "%{OUTPUT_FOLDER}"/content_shell.pak "%{buildroot}%{CHROMIUM_EXE_DIR}"
 install -m 0644 "%{OUTPUT_FOLDER}"/resources/*.edj   "%{buildroot}%{CHROMIUM_DATA_DIR}"/themes
 
-install -m 0644 "%{OUTPUT_FOLDER}"/locales/*.pak "%{buildroot}%{CHROMIUM_EXE_DIR}"/locales
-install -m 0644 "%{OUTPUT_FOLDER}"/chrome_100_percent.pak "%{buildroot}%{CHROMIUM_EXE_DIR}"
-install -m 0644 "%{OUTPUT_FOLDER}"/resources.pak "%{buildroot}%{CHROMIUM_EXE_DIR}"
-
 install -d "%{OUTPUT_FOLDER}"/packages
 install -d %{buildroot}%{_xmldir}
 sed -e 's#@TIZEN_VERSION@#%{tizen_version_major}.%{tizen_version_minor}#g' \
@@ -413,7 +403,16 @@ install -m 0755 "%{OUTPUT_FOLDER}"/libminigbm.so   "%{buildroot}"%{_libdir}
   install -m 0755 "%{OUTPUT_FOLDER}"/chrome_crashpad_handler "%{buildroot}%{CHROMIUM_EXE_DIR}"/chrome_crashpad_handler
   sed 's#@binary@#%{CHROMIUM_EXE_DIR}/chrome_crashpad_handler#' %{SOURCE1} > "%{buildroot}"%{_bindir}/chrome_crashpad_handler
   install -m 0644 "%{OUTPUT_FOLDER}"/ui_resources_100_percent.pak "%{buildroot}%{CHROMIUM_EXE_DIR}"
+  install -m 0644 "%{OUTPUT_FOLDER}"/locales/*.pak "%{buildroot}%{CHROMIUM_EXE_DIR}"/locales
+  install -m 0644 "%{OUTPUT_FOLDER}"/chrome_100_percent.pak "%{buildroot}%{CHROMIUM_EXE_DIR}"
+  install -m 0644 "%{OUTPUT_FOLDER}"/resources.pak "%{buildroot}%{CHROMIUM_EXE_DIR}"
 %else
+  # locale for ewk layer
+  cp -r "%{OUTPUT_FOLDER}/locale" "%{buildroot}/%{CHROMIUM_LOCALE_DIR}"
+
+  # locale for chromium layer
+  install -m 0644 "%{OUTPUT_FOLDER}"/locales/efl/*.pak "%{buildroot}%{CHROMIUM_EXE_DIR}"/locales
+
   install -m 0755 "%{OUTPUT_FOLDER}"/libchromium-ewk.so    "%{buildroot}"%{_libdir}
   install -m 0755 "%{OUTPUT_FOLDER}"/efl_webprocess    "%{buildroot}%{CHROMIUM_EXE_DIR}"
 
@@ -458,12 +457,10 @@ install -m 0755 tizen_src/ewk/utc_gtest_run.sh %{buildroot}/opt/usr/utc_exec/
 %{CHROMIUM_EXE_DIR}/content_shell.pak
 %{CHROMIUM_EXE_DIR}/locales/*.pak
 %{CHROMIUM_DATA_DIR}/themes/*.edj
-%{CHROMIUM_LOCALE_DIR}
-%{CHROMIUM_EXE_DIR}/chrome_100_percent.pak
-%{CHROMIUM_EXE_DIR}/resources.pak
-%{CHROMIUM_EXE_DIR}/locales/*.pak
 
 %if %{__build_chrome} == 1
+  %{CHROMIUM_EXE_DIR}/chrome_100_percent.pak
+  %{CHROMIUM_EXE_DIR}/resources.pak
   %{CHROMIUM_EXE_DIR}/ui_resources_100_percent.pak
   %{CHROMIUM_EXE_DIR}/content_shell
   %{_bindir}/content_shell
@@ -472,6 +469,7 @@ install -m 0755 tizen_src/ewk/utc_gtest_run.sh %{buildroot}/opt/usr/utc_exec/
   %{CHROMIUM_EXE_DIR}/chrome_crashpad_handler
   %{_bindir}/chrome_crashpad_handler
 %else
+  %{CHROMIUM_LOCALE_DIR}
   %{_libdir}/libchromium-ewk.so
   %if "%{?tizen_profile_name}" == "tv"
     %caps(cap_mac_admin,cap_mac_override,cap_setgid=ei) %{CHROMIUM_EXE_DIR}/efl_webprocess