Fix for building with Tizen X Repo

Currently for building with Tizen X repo we are using directory of form
out.tz_v9.0* to store object files, which is the same format of
directory, as when creating with standard repositories. Due to this
object files from these builds get mixed in the same directory.

This patch fixes this by use of conditional in .spec file. When the
Tizen X is detected, the directory of form out.tz_X* will be used instead

Change-Id: Ia57797b5e1d8cfb865ecc72887877abd8d0c9a7b
Signed-off-by: Aleksander Świniarski <a.swiniarski@samsung.com>

diff --git a/packaging/chromium-efl.spec b/packaging/chromium-efl.spec
index a2934b7..f6624ae 100644 (file)
--- a/packaging/chromium-efl.spec
+++ b/packaging/chromium-efl.spec
@@ -46,6 +46,12 @@ Source1: content_shell.in
 
 %define tizen_version %{tizen_version_major}%{tizen_version_minor}
 
+%if "%{?_is_tizen_x}" == "1"
+%define __is_tizen_x 1
+%else
+%define __is_tizen_x 0
+%endif
+
 %if "%{?_build_chrome}" == "1"
 %define __build_chrome 1
 %else
@@ -481,8 +487,12 @@ Chromium gcov objects
 %if %{__build_chrome} == 1
 %define OUTPUT_BASE_FOLDER out.chrome.tz_v%{tizen_version_major}.%{tizen_version_minor}.%{repo_name}.%{ARCHITECTURE}
 %else
+%if %{__is_tizen_x} == 1
+%define OUTPUT_BASE_FOLDER out.tz_X.%{repo_name}.%{ARCHITECTURE}
+%else
 %define OUTPUT_BASE_FOLDER out.tz_v%{tizen_version_major}.%{tizen_version_minor}.%{repo_name}.%{ARCHITECTURE}
 %endif
+%endif
 
 export GN_GENERATOR_OUTPUT=$PWD/%{OUTPUT_BASE_FOLDER}
 

diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh
index 7ed7887..3fcf1eb 100755 (executable)
--- a/tizen_src/build/common.sh
+++ b/tizen_src/build/common.sh
@@ -363,6 +363,7 @@ function setupAndExecuteTargetBuild() {
       PROFILE=tzwr_5.5_arm-spin
     elif [[ $platform == "Base-X" ]]; then
       PROFILE=tz_X
+      ARGS+=(--define "_is_tizen_x 1")
     else
       echo "Cannot set default PROFILE for platform=${platform}"
       exit 1