fixup! Build ewk with gyp instead of cmake

Before [1], we use to build EWK from a separate repo
using CMake and unittests were disabled by default.
Once [1] landed, the EWK build was integrated to the
GYP build, but unittests target continued optional for both
mobile and TV builds. On desktop build though, no
targets were never specified to GYP, so all targets
including the unsopported unittests target, were being
build. This broke the desktop build.

[1] http://165.213.202.130:8080/#/c/70211/

Patch changes the build_desktop.sh script so that
the same targets are build for both desktop, tv and
mobile builds, being 'unittests' target optional.
By doing this, the desktop build is fixed.

Also, it rename build_ewk_test to build_ewk_tests in
packaging/chromium-efl.spec

Change-Id: Ibbe455ed411180f7b93c396512221c6cfdd5547c
Signed-off-by: Antonio Gomes <a1.gomes@samsung.com>

diff --git a/tizen_src/build/build_desktop.sh b/tizen_src/build/build_desktop.sh
index 36529074890f4925d02d02813a2e279e704c8ea1..d79162eb94a1a08bde0ec634467c7fca22522f2e 100755 (executable)
--- a/tizen_src/build/build_desktop.sh
+++ b/tizen_src/build/build_desktop.sh
@@ -20,6 +20,7 @@ OPTIONS:
    --skip-gyp    Skip restore_gyp, jhbuild and gyp_chromium steps
    --ccache      configure ccache installed in your system
    --skip-ninja  Skip ninja step
+   --build-ewk-unittests  build ewk unittests
    --debug       build debug version of chromium-efl (in $GYP_GENERATOR_OUTPUT/Debug instead of default $GYP_GENERATOR_OUTPUT/Release)
    -jN           set number of jobs, just like with make or ninja
 
@@ -53,6 +54,10 @@ if echo "$@" | grep -cq '\-\-ccache'; then
   USE_CCACHE=1
 fi
 
+if echo "$@" | grep -cq '\-\-build_ewk_unittests'; then
+  BUILD_EWK_UNITTESTS=1
+fi
+
 JHBUILD_STAMPFILE="${GYP_GENERATOR_OUTPUT}/Dependencies/jhbuild.stamp"
 
 if echo "$@" | grep -cq '\-\-force-jhbuild'; then
@@ -98,5 +103,11 @@ if [ "$SKIP_NINJA" == "0" ]; then
   fi
   export LD_LIBRARY_PATH="${JHBUILD_DEPS}/${_LIBDIR}:$LD_LIBRARY_PATH"
   export PATH="${JHBUILD_DEPS}/bin:$PATH"
-  ninja -C ${GYP_GENERATOR_OUTPUT}/${BUILD_SUBDIRECTORY} ${JOBS}
+
+  TARGETS="chromium-efl efl_webprocess chromium-ewk efl_webview_app"
+  if [ "$BUILD_EWK_UNITTESTS" == "1" ]; then
+    TARGETS = "$TARGETS ewk_unittests"
+  fi
+
+  ninja -C ${GYP_GENERATOR_OUTPUT}/${BUILD_SUBDIRECTORY} ${JOBS} ${TARGETS}
 fi

diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec
index 65f04942df7d343fd6171d1ee5d4e6cb93cee583..2e2416d229413a62a49c4f2894898e31ce3ef3ea 100755 (executable)
--- a/tizen_src/packaging/chromium-efl.spec
+++ b/tizen_src/packaging/chromium-efl.spec
@@ -114,7 +114,7 @@ Requires: %{name} = %{version}-%{release}
 Chromium unite tests
 %endif
 
-%if 0%{?build_ewk_unittest}
+%if 0%{?build_ewk_unittests}
 %package ewktest
 Summary: Chromium EWK unittests
 Group: Development/UnitTests
@@ -208,7 +208,7 @@ fi
 %endif
 
 build/prebuild/ninja %{_smp_mflags} -C"%{OUTPUT_FOLDER}" \
-%if 0%{?build_ewk_unittest}
+%if 0%{?build_ewk_unittests}
   ewk_unittests \
 %endif
   chromium-efl efl_webprocess chromium-ewk efl_webview_app mini_browser
@@ -263,7 +263,7 @@ for test in "%{OUTPUT_FOLDER}/*_unittests"; do
 done
 %endif
 
-%if 0%{?build_ewk_unittest}
+%if 0%{?build_ewk_unittests}
 mkdir -p %{buildroot}/opt/usr/resources/
 mkdir -p %{buildroot}/opt/usr/utc_exec/
 cp -r ewk/unittest/resources/* %{buildroot}/opt/usr/resources/
@@ -333,7 +333,7 @@ fi
 %{CHROMIUM_UNITTESTS_DIR}/*
 %endif
 
-%if 0%{?build_ewk_unittest}
+%if 0%{?build_ewk_unittests}
 %files ewktest
 %defattr(-,root,root,-)
 %manifest ./packaging/org.tizen.chromium-ewktest.manifest