[beta-merge] Unify build_mobile.sh and build_desktop.sh arguments

With this patch, build_mobile.sh (and build_tv.sh) now support
--skip-gyp, --skip-ninja and --debug arguments.

gbs --debug option is renamed to --gbs-debug. It shouldn't have much
impact since gbs --debug is rarely used by developers.

Beta review: http://165.213.202.130/gerrit/#/c/75908/

Change-Id: I4a960a402152e51b82ba5c97415113866722b533
Signed-off-by: Arnaud Renevier <a.renevier@samsung.com>

diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh
index 42f020f..6d79783 100755 (executable)
--- a/tizen_src/build/common.sh
+++ b/tizen_src/build/common.sh
@@ -209,8 +209,38 @@ function setupAndExecuteTargetBuild() {
     EXTRA_PACK_OPTS="--extra-packs python-base-x86-arm,python-x86-arm,python-xml-x86-arm"
   fi
 
+  local count=0
+  while [[ $# > 0 ]]; do
+    count=$(( $count + 1 ))
+    case "$1" in
+    --debug)
+        ARGS[$count]=--define
+        count=$(( $count + 1 ))
+        ARGS[$count]="_debug_mode 1"
+    ;;
+    --skip-ninja)
+        ARGS[$count]=--define
+        count=$(( $count + 1 ))
+        ARGS[$count]="_skip_ninja 1"
+    ;;
+    --skip-gyp)
+        ARGS[$count]=--define
+        count=$(( $count + 1 ))
+        ARGS[$count]="_skip_gyp 1"
+    ;;
+    --gbs-debug)
+        ARGS[$count]=--debug
+    ;;
+    *)
+      ARGS[$count]="$1"
+    ;;
+    esac
+    shift;
+  done
+
   cd $TOPDIR
   rm -f packaging
   ln -sf tizen_src/packaging packaging
-  gbs $CONF_FLAG build $PROFILE_FLAG -A $ARCHITECTURE --incremental "${@}" $EXTRA_PACK_OPTS
+
+  gbs $CONF_FLAG build $PROFILE_FLAG -A $ARCHITECTURE --incremental "${ARGS[@]}"
 }

diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec
index b304b30..3499509 100644 (file)
--- a/tizen_src/packaging/chromium-efl.spec
+++ b/tizen_src/packaging/chromium-efl.spec
@@ -253,6 +253,7 @@ export LDFLAGS="$LDFLAGS -L/lib"
 #/lib
 
 # architecture related configuration + neon temporary workaround
+%if %{?_skip_ninja:0}%{!?_skip_ninja:1}
 %ifarch %{arm}
   export ADDITION_OPTION=" -finline-limit=64 -foptimize-sibling-calls -fno-unwind-tables -fno-exceptions -Os "
 
@@ -366,6 +367,8 @@ ninja %{_smp_mflags} -C"%{OUTPUT_FOLDER}" angle_unittests env_chromium_unittests
 # gpu_unittests compos9itor_unittests media_unittests
 %endif
 
+%endif
+
 #XXX icudtl.dat is not copied by gyp. Do that manually
 cp third_party/icu/android/icudtl.dat "%{OUTPUT_FOLDER}"