Merge branch 'tizen_2.4_develop' into tizen_3.0_develop

Change-Id: Ibf4bc4ff0d810ce2653b248a896de7fd61497a98
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --cc configure
Simple merge

diff --cc package/3.0-emulator-qemu-x86.install.macos-64
index 702f2c0,da6d983..9a78416
--- 1/package/3.0-emulator-qemu-x86.install.macos-64
--- 2/package/2.4-emulator-qemu-x86.install.macos-64
+++ b/package/3.0-emulator-qemu-x86.install.macos-64
@@@ -4,13 -4,13 +4,13 @@@ TIZEN_SDK_INSTALL_PATH="`echo $INSTALLE
  OLD_SHMMAXSIZE=`sysctl -n kern.sysv.shmmax`
  SYSCTL_FILE=sysctl.conf
  TMP_DIR=~/.installmanager
- COCOASUDO_PATH="$TIZEN_SDK_INSTALL_PATH/tools/emulator/bin"
- TIZEN_BIN_PATH="$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/bin"
- TIZEN_PLATFORM_ETC_PATH="$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/etc"
- TIZEN_TOOL_ETC_PATH="$TIZEN_SDK_INSTALL_PATH/tools/emulator/etc"
- TMP_FILE="$TMP_DIR/emulator-install.sh"
+ COCOASUDO_PATH=$TIZEN_SDK_INSTALL_PATH/tools/emulator/bin
 -TIZEN_BIN_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-2.4/common/emulator/bin
 -TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-2.4/common/emulator/etc
++TIZEN_BIN_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/bin
++TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/etc
+ TIZEN_TOOL_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/tools/emulator/etc
+ TMP_FILE=$TMP_DIR/emulator-install.sh
  NEW_SHMMAXSIZE=83886080
- if [ -z $TIZEN_SDK_INSTALL_PATH ]
+ if [ -z "$TIZEN_SDK_INSTALL_PATH" ]
  then
     echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
  #   exit 2;

diff --cc package/3.0-emulator-qemu-x86.install.ubuntu-32
index e1f239b,641234e..8710d0a
--- 1/package/3.0-emulator-qemu-x86.install.ubuntu-32
--- 2/package/2.4-emulator-qemu-x86.install.ubuntu-32
+++ b/package/3.0-emulator-qemu-x86.install.ubuntu-32
@@@ -8,14 -8,14 +8,14 @@@ the
  fi
  
  TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}`
 -TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-2.4/common/emulator/etc
 +TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/etc
- if [ -z ${TIZEN_SDK_INSTALL_PATH} ]
+ if [ -z "${TIZEN_SDK_INSTALL_PATH}" ]
  then
  #   echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
     exit 2;
  fi
  
- PLATFORM_VERSION="tizen-3.0"
 -PLATFORM_VERSION=tizen-2.4
++PLATFORM_VERSION=tizen-3.0
  
  LSB_RELEASE=`which lsb_release`
  if [ "${LSB_RELEASE}" = "" ]; then

diff --cc package/3.0-emulator-qemu-x86.install.ubuntu-64
index e1f239b,641234e..8710d0a
--- 1/package/3.0-emulator-qemu-x86.install.ubuntu-64
--- 2/package/2.4-emulator-qemu-x86.install.ubuntu-32
+++ b/package/3.0-emulator-qemu-x86.install.ubuntu-64
@@@ -8,14 -8,14 +8,14 @@@ the
  fi
  
  TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}`
 -TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-2.4/common/emulator/etc
 +TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/etc
- if [ -z ${TIZEN_SDK_INSTALL_PATH} ]
+ if [ -z "${TIZEN_SDK_INSTALL_PATH}" ]
  then
  #   echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
     exit 2;
  fi
  
- PLATFORM_VERSION="tizen-3.0"
 -PLATFORM_VERSION=tizen-2.4
++PLATFORM_VERSION=tizen-3.0
  
  LSB_RELEASE=`which lsb_release`
  if [ "${LSB_RELEASE}" = "" ]; then

diff --cc package/3.0-emulator-qemu-x86.remove.ubuntu-32
Simple merge

diff --cc package/3.0-emulator-qemu-x86.remove.ubuntu-64
Simple merge

diff --cc package/changelog
Simple merge

diff --cc package/pkginfo.manifest
Simple merge

diff --cc tizen/emulator_configure.sh
index 360a01a,bb6244e..a20d5be
--- 1/tizen/emulator_configure.sh
--- 2/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@@ -1,11 -1,7 +1,7 @@@
  #!/bin/sh
  
- if [ -z "$TIZEN_SDK_DEV_PATH" ] ; then
-     TIZEN_SDK_DEV_PATH=${HOME}/tizen-sdk-dev
- fi
- 
  CONFIGURE_APPEND=""
 -EMUL_TARGET_LIST="i386-softmmu"
 +EMUL_TARGET_LIST="x86_64-softmmu"
  
  usage() {
      echo "usage: build.sh [options] [target]"
@@@ -87,20 -99,16 +101,19 @@@ f
  # append common options
  CONFIGURE_APPEND="
   --target-list=$EMUL_TARGET_LIST
 + --enable-maru
   --enable-yagl
   --enable-curl
 - --disable-gtk
 - --disable-quorum
   --enable-vigs
 - --enable-maru
 + --enable-qt
   --enable-libav
   --enable-libpng
-  --disable-sdl
 - --enable-qt
 - --enable-java-ui
 + --disable-gtk
 + --disable-vnc
 + --disable-spice
 + --disable-curses
 + --disable-quorum
 + --disable-xen
   $CONFIGURE_APPEND"
  
  # append platform specific options
@@@ -110,22 -118,45 +123,35 @@@ CONFIGURE_APPEND=
   --enable-werror
   --extra-ldflags=-Wl,--export-dynamic
   --audio-drv-list=alsa
 - --disable-vnc
 - --disable-pie
 - --enable-virtfs
 - --disable-xen
+  --enable-sdl
 - --enable-java-ui
++ --enable-virtfs
+  $CONFIGURE_APPEND
+ "
+ ;;
+ CROSS_MINGW*)
+ CONFIGURE_APPEND="
+  --cross-prefix=$CROSS_PREFIX
+  --enable-werror
+  --extra-ldflags=-Wl,--large-address-aware
+  --extra-ldflags=-Wl,--export-all-symbols
+  --audio-drv-list=winwave
+  --enable-hax
 - --enable-virtfs
 - --disable-vnc
+  --enable-sdl
 - --enable-java-ui
 + --enable-virtfs
   $CONFIGURE_APPEND
  "
  ;;
  MINGW*)
  CONFIGURE_APPEND="
   --cc=gcc
 + --cxx=g++
   --enable-werror
-- --extra-cflags=-Wno-error=format
-- --extra-cflags=-Wno-error=format-extra-args
-- --extra-cflags=-Wno-error=redundant-decls
   --extra-ldflags=-Wl,--large-address-aware
   --extra-ldflags=-Wl,--export-all-symbols
   --audio-drv-list=winwave
 - --enable-hax
 - --enable-virtfs
 - --disable-vnc
+  --enable-sdl
 - --enable-java-ui
++ --enable-virtfs
 + --enable-hax
   $CONFIGURE_APPEND
  "
  ;;
@@@ -137,8 -168,13 +163,9 @@@ CONFIGURE_APPEND=
   --extra-cflags=-mmacosx-version-min=10.4
   --extra-ldflags=-lstdc++
   --audio-drv-list=coreaudio
 - --enable-shm
 - --enable-hax
++ --enable-cocoa
+  --enable-virtfs
 - --disable-vnc
 - --disable-cocoa
 - --disable-sdl
 - --enable-java-ui
 + --enable-hax
-  --disable-cocoa
   $CONFIGURE_APPEND
  "
  # FIXME: "-export_dynamic" causes error on old version clang

diff --cc tizen/src/Makefile
Simple merge

diff --cc tizen/src/emul_state.c
Simple merge

diff --cc tizen/src/emul_state.h
Simple merge

diff --cc tizen/src/emulator.c
Simple merge

diff --cc tizen/src/scripts/emulator.sh
Simple merge