[NextBrowser] Manifest variable for NextBrowser changed

This change is done to support simultaneous generation of NextBrowser and UWE
tpk with a single build command.

./tizen_src/build/build_tv.sh --create-next-browser-tpk --squashfs --define "tpktype upgrade"

Also removed --build-next-browser switch support.

Change-Id: I086b1362b851fe172cb6cf087e4054031317de54
Signed-off-by: saurabh.t3 <saurabh.t3@samsung.com>

diff --git a/packaging/chromium-efl.spec b/packaging/chromium-efl.spec
index 3d650cabe91d258c412531b3962a031eeedcf5a1..657a02cc15cb86e870b7477ba022d4a24a207b76 100644 (file)
--- a/packaging/chromium-efl.spec
+++ b/packaging/chromium-efl.spec
@@ -75,19 +75,13 @@ Source1: content_shell.in
  %define __create_next_browser_tpk 0
 %endif
 
-%if 0%{?_build_next_browser:1} || 0%{__create_next_browser_tpk}
- %define __build_next_browser 1
-%else
- %define __build_next_browser 0
-%endif
-
-%if "%{?_build_chrome}" == "1" || 0%{__build_next_browser}
+%if "%{?_build_chrome}" == "1" || 0%{__create_next_browser_tpk}
 %define __build_chrome 1
 %else
 %define __build_chrome 0
 %endif
 
-%if 0%{__build_next_browser}
+%if 0%{__create_next_browser_tpk}
 %define __browser_binary_name next_browser
 %else
 %define __browser_binary_name chrome_tizen
@@ -244,7 +238,7 @@ BuildRequires: pkgconfig(tts)
 BuildRequires: pkgconfig(ui-gadget-1)
 BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(zlib)
-%if 0%{?__build_next_browser}
+%if 0%{?__create_next_browser_tpk}
 #Added below pkg for Next Browser
 BuildRequires: dapi-provider-devel
 BuildRequires: pkgconfig(vd-elementary)
@@ -643,7 +637,7 @@ Chromium Tizen V8 unittests
 %define _tpkid %{_pkgid}
 %endif
 
-%if 0%{?__build_next_browser}
+%if 0%{?__create_next_browser_tpk}
 %define __next_browser_version 1.1.2
 %define __browser_tpk_id org.tizen.next-browser
 %endif
@@ -770,7 +764,7 @@ touch ./tizen_src/downloadable/ewk_api_wrapper_generator.py
 %endif
 %if "%{?tizen_profile_name}" == "tv"
   "tizen_product_tv=true" \
-%if 0%{?__build_next_browser}
+%if 0%{?__create_next_browser_tpk}
   "is_samsung_next_browser=true" \
   "version_next_browser=\"%{__next_browser_version}\""\
   "app_samsung_next_browser_root_dir=\"%{TZ_SYS_RW_APP}/%{__browser_tpk_id}\"" \
@@ -970,10 +964,9 @@ echo %{version} > "%{OUTPUT_FOLDER}"/version
 # Prepare Tizen App Manifest
 %if "%{?profile}" == "tv"
   %if 0%{?__create_next_browser_tpk}
-    %define _manifestname %{__browser_tpk_id}
-  %else
-    %define _manifestname %{_pkgid}-vd
+    %define _next_browser_manifestname %{__browser_tpk_id}
   %endif
+  %define _manifestname %{_pkgid}-vd
 %else
 %define _manifestname %{_pkgid}
 %endif
@@ -994,7 +987,7 @@ sed -e 's#@TIZEN_VERSION@#%{tizen_version_major}.%{tizen_version_minor}#g' \
 sed -e 's#@TIZEN_VERSION@#%{tizen_version_major}.%{tizen_version_minor}#g' \
     -e 's#@CHROMIUM_VERSION@#%{__next_browser_version}#g' \
     -e 's#@PACKAGE_ID@#%{__browser_tpk_id}#g' \
-    packaging/%{_manifestname}.xml.in \
+    packaging/%{_next_browser_manifestname}.xml.in \
     > "%{OUTPUT_FOLDER}"/tizen-manifest-next-browser-tpk.xml
 %endif
 

diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh
index be5f84ccc44d8f7bca3a6ac09481861555b1025d..cd61c8727e5d14ee742ede9169d70905a74c45c6 100755 (executable)
--- a/tizen_src/build/common.sh
+++ b/tizen_src/build/common.sh
@@ -332,9 +332,6 @@ function setupAndExecuteTargetBuild() {
         BUILD_CHROME=1
         ARGS+=(--define "_build_chrome 1")
     ;;
-    --build-next-browser)
-        ARGS+=(--define "_build_next_browser 1")
-    ;;
     --create-next-browser-tpk)
         ARGS+=(--define "_create_next_browser_tpk 1")
     ;;