Support icu library via jhbuild

Change-Id: I1c8a34dc21e234a9123a25c94d165738d3d7c62e
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>

diff --git a/efl/build/build_desktop.sh b/efl/build/build_desktop.sh
index 1cb62a3..5d56889 100755 (executable)
--- a/efl/build/build_desktop.sh
+++ b/efl/build/build_desktop.sh
@@ -43,6 +43,7 @@ elif [ "${host_arch}" == "x86" ]; then
 fi
 export PKG_CONFIG_PATH="${JHBUILD_DEPS}/${_LIBDIR}/pkgconfig"
 
+$SCRIPTDIR/jhbuild/handle_exceptional_libs.sh
 jhbuild --no-interact -f ${SCRIPTDIR}/jhbuild/jhbuildrc
 
 if [ ! -f "$JHBUILD_STAMPFILE" ]; then

diff --git a/efl/build/jhbuild/handle_exceptional_libs.sh b/efl/build/jhbuild/handle_exceptional_libs.sh
new file mode 100755 (executable)
index 0000000..a63fb0f
--- /dev/null
+++ b/efl/build/jhbuild/handle_exceptional_libs.sh
@@ -0,0 +1,30 @@
+export SCRIPTDIR=$(readlink -e $(dirname $0))
+
+source ${SCRIPTDIR}/common.sh
+
+echo "** Checkinng exceptional libraries that have different directory name with file name"
+echo
+
+SOURCE_DIR=$TOPDIR/out/Dependencies/Source
+
+if [ ! -e $SOURCE_DIR ]; then
+  mkdir -p $SOURCE_DIR
+fi
+pushd $SOURCE_DIR > /dev/null
+
+echo "** Checkinng for icu 58.1"
+LIB=icu4c-58_1-src
+if [ ! -e $LIB ]; then
+  MD5SUM=1901302aaff1c1633ef81862663d2917
+  wget https://jaist.dl.sourceforge.net/project/icu/ICU4C/58.1/$LIB.tgz
+  if [ "$(md5sum $LIB.tgz | sed -e "s/ .*//g")" == "$MD5SUM" ]; then
+    tar -zxvf $LIB.tgz > /dev/null
+    mv icu/source $LIB > /dev/null
+    cp -f icu/LICENSE ./ > /dev/null
+  else
+    echo "Error: Invalid md5sum !!"
+    exit 1
+  fi
+fi
+
+popd > /dev/null

diff --git a/efl/build/jhbuild/jhbuild.modules b/efl/build/jhbuild/jhbuild.modules
index d87eb36..a00df1b 100755 (executable)
--- a/efl/build/jhbuild/jhbuild.modules
+++ b/efl/build/jhbuild/jhbuild.modules
@@ -8,6 +8,7 @@
       <dep package="gstreamer"/>
       <dep package="efl"/>
       <dep package="elementary"/>
+      <dep package="icu"/>
     </dependencies>
   </metamodule>
 
@@ -23,6 +24,8 @@
       href="ftp://sourceware.org"/>
   <repository type="tarball" name="freedesktop.org"
       href="http://freedesktop.org"/>
+  <repository type="tarball" name="jaist.dl.sourceforge.net"
+      href="http://jaist.dl.sourceforge.net"/>
   <repository type="tarball" name="zlib.net"
       href="http://zlib.net"/>
 
@@ -204,6 +207,14 @@
     </branch>
   </autotools>
 
+  <!-- icu source is downloaded by handle_exceptional_libs.sh.
+       This part is only needed for jhbuild process. -->
+  <autotools id="icu" autogen-sh="configure">
+    <branch module="project/icu/ICU4C/58.1/icu4c-58_1-src.tgz" version="58.1"
+            repo="jaist.dl.sourceforge.net">
+    </branch>
+  </autotools>
+
   <autotools id="harfbuzz" autogen-sh="configure">
     <branch module="software/harfbuzz/release/harfbuzz-1.3.1.tar.bz2" version="1.3.1"
             repo="freedesktop.org"

diff --git a/electron.gyp b/electron.gyp
index 2017805..2f8d7b0 100644 (file)
--- a/electron.gyp
+++ b/electron.gyp
@@ -360,6 +360,7 @@
             '<(DEPTH)/efl/build/system.gyp:ecore-x',
             '<(DEPTH)/efl/build/system.gyp:elocation',
             '<(DEPTH)/efl/build/system.gyp:elementary',
+            '<(DEPTH)/efl/build/system.gyp:icu',
           ],
           'link_settings': {
             'ldflags': [