Merge branch 'develop' into tizen_studio_1.2_p3.0

Change-Id: I0b2c24f4f2495d9622bdf68de6f179a209cb0491
Signed-off-by: Minkee Lee <minkee.lee@samsung.com>

diff --cc package/build.common
index 89e87afad195ff6cf04975a8091423c039848950,15271534c3f2e3045bfbd0db4b7dc72ca4e6745b..0f29e37ed4c503962ec7be3e4a4695539837fd30
--- 1/package/build.common
--- 2/package/build.common
+++ b/package/build.common
@@@ -38,27 -38,57 +38,57 @@@ build_common(
  # install_common
  install_common()
  {
-       # emulator
-       EMULATOR_COMMON_DIR=$SRCDIR/package/3.0-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-3.0/common
-       mkdir -p $EMULATOR_COMMON_DIR
-       # we have nothing for common now
 -      TIZEN_VERSIONS="4.0 3.0 2.4 2.3.2"
++      TIZEN_VERSIONS="3.0"
  
-       EMULATOR_X86_DIR=$SRCDIR/package/3.0-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-3.0/common
+       for VER in ${TIZEN_VERSIONS} ; do
+               # emulator
+               EMULATOR_COMMON_DIR=$SRCDIR/package/$VER-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-$VER/common
+               mkdir -p $EMULATOR_COMMON_DIR
+               # we have nothing for common now
  
-       mkdir -p $EMULATOR_X86_DIR
-       cp -pPR $SRCDIR/tizen/emulator $EMULATOR_X86_DIR/emulator
+               EMULATOR_X86_DIR=$SRCDIR/package/$VER-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-$VER/common
  
-       # profile skins
-       MOBILE_3_0_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-3.0-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-3.0/mobile/emulator-resources/skins
-       WEARABLE_3_0_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-3.0-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-3.0/wearable/emulator-resources/skins
-       TV_3_0_SKIN_RESOURCE_DIR=$SRCDIR/package/tv-3.0-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-3.0/tv/emulator-resources/skins
+               mkdir -p $EMULATOR_X86_DIR
+               cp -pPR $SRCDIR/tizen/emulator $EMULATOR_X86_DIR/emulator
  
-       mkdir -p $MOBILE_3_0_SKIN_RESOURCE_DIR
-       mkdir -p $WEARABLE_3_0_SKIN_RESOURCE_DIR
-       mkdir -p $TV_3_0_SKIN_RESOURCE_DIR
+               # profile skins
+               MOBILE_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-$VER-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-$VER/mobile/emulator-resources/skins
+               WEARABLE_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-$VER-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-$VER/wearable/emulator-resources/skins
+               # Tizen 2.3.2 does not have the tv profile
+               if [ "$VER" != "2.3.2" ] ; then
+                       TV_SKIN_RESOURCE_DIR=$SRCDIR/package/tv-$VER-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-$VER/tv/emulator-resources/skins
+               fi
  
-       cp -pPR $SRCDIR/tizen/src/ui/resource/skins/mobile/* $MOBILE_3_0_SKIN_RESOURCE_DIR
-       cp -pPR $SRCDIR/tizen/src/ui/resource/skins/wearable/* $WEARABLE_3_0_SKIN_RESOURCE_DIR
-       cp -pPR $SRCDIR/tizen/src/ui/resource/skins/tv/* $TV_3_0_SKIN_RESOURCE_DIR
+               mkdir -p $MOBILE_SKIN_RESOURCE_DIR
+               mkdir -p $WEARABLE_SKIN_RESOURCE_DIR
+               if [ "$VER" != "2.3.2" ] ; then
+                       mkdir -p $TV_SKIN_RESOURCE_DIR
+               fi
  
+               cp -pPR $SRCDIR/tizen/src/ui/resource/skins/mobile/* $MOBILE_SKIN_RESOURCE_DIR
+               cp -pPR $SRCDIR/tizen/src/ui/resource/skins/wearable/* $WEARABLE_SKIN_RESOURCE_DIR
+               if [ "$VER" != "2.3.2" ] ; then
+                       cp -pPR $SRCDIR/tizen/src/ui/resource/skins/tv/* $TV_SKIN_RESOURCE_DIR
+               fi
+ 
+               # make install/remove script, depending on the version
+               ORIGIN_INSTALL_FILE=$SRCDIR/package/emulator-qemu-x86.install.$TARGET_OS_CATEGORY
+               ORIGIN_REMOVE_FILE=$SRCDIR/package/emulator-qemu-x86.remove.$TARGET_OS_CATEGORY
+               TARTGET_INSTALL_FILE=$SRCDIR/package/$VER-emulator-qemu-x86.install.$TARGET_OS_CATEGORY
+               TARTGET_REMOVE_FILE=$SRCDIR/package/$VER-emulator-qemu-x86.remove.$TARGET_OS_CATEGORY
+               if [ -e "$ORIGIN_INSTALL_FILE" ] ; then
+                       cp -p "$ORIGIN_INSTALL_FILE" "$TARTGET_INSTALL_FILE"
+                       # Replace existing version to inputted version.
+                       # To apply some variables to 'sed' command,
+                       # you must enclose expressions in double quotes("").
+                       # -i'' option means that does not make backup file, it must have an extension in macOS.
+                       sed -i'' -e "s/tizen-x.x/tizen-$VER/g" "$TARTGET_INSTALL_FILE"
+               fi
+               if [ -e "$ORIGIN_REMOVE_FILE" ] ; then
+                       cp -p "$ORIGIN_REMOVE_FILE" "$TARTGET_REMOVE_FILE"
+                       # Replace existing version to inputted version.
+                       # Now it is not necessary. Uncomment the line below if necessary.
+                       #sed -i'' -e "s/tizen-x.x/tizen-$VER/g" "$TARTGET_INSTALL_FILE"
+               fi
+       done
  }

diff --cc package/pkginfo.manifest
index 0597a95fa4045b78e047a4df5a3a782a9c3c88d4,b8b49118cd4884d17d0f2b19fe08fd4ba207b058..d9b57285a1712b342a82dd8a0feea64eab7c3c95
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -118,3 -237,219 +118,4 @@@ Package: tv-3.0-emulator-qemu-skin
  OS: macos-64
  Build-host-os: macos-64
  Description: Skin images for TV 3.0 Tizen Emulator
 -# For tizen 2.4
 -Package: 2.4-emulator-qemu-common
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.4-emulator-qemu-common
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.4-emulator-qemu-common
 -OS: windows-32, windows-64
 -Build-host-os: ubuntu-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.4-emulator-qemu-common
 -OS: macos-64
 -Build-host-os: macos-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.4-emulator-qemu-x86
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Build-dependency: 4.0-emulator-lib-dev [ ubuntu-32 ], 4.0-libav-dev [ ubuntu-32 ]
 -Install-dependency: 2.4-emulator-kernel-x86 [ ubuntu-32 ], 2.4-libav [ ubuntu-32 ]
 -C-Prerequisites: acl, bridge-utils, openvpn, libfontconfig1, libglib2.0-0, libjpeg-turbo8, libpixman-1-0, libpng12-0, libsdl1.2debian, libsm6, libv4l-0, libx11-xcb1, libxcb-icccm4, libxcb-image0, libxcb-randr0, libxcb-render-util0, libxcb-shape0, libxcb-xfixes0, libxi6
 -Description: Tizen x86 Emulator
 -
 -Package: 2.4-emulator-qemu-x86
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Build-dependency: 4.0-emulator-lib-dev [ ubuntu-64 ], 4.0-libav-dev [ ubuntu-64]
 -Install-dependency: 2.4-emulator-kernel-x86 [ ubuntu-64 ], 2.4-libav [ ubuntu-64 ]
 -C-Prerequisites: acl, bridge-utils, openvpn, libfontconfig1, libglib2.0-0, libjpeg-turbo8, libpixman-1-0, libpng12-0, libsdl1.2debian, libsm6, libv4l-0, libx11-xcb1, libxcb-icccm4, libxcb-image0, libxcb-randr0, libxcb-render-util0, libxcb-shape0, libxcb-xfixes0, libxi6
 -Description: Tizen x86 Emulator
 -
 -Package: 2.4-emulator-qemu-x86
 -OS: windows-32
 -Build-host-os: ubuntu-64
 -Build-dependency: 4.0-emulator-lib-dev [ windows-32 ], 4.0-libav-dev [ windows-32 ]
 -Install-dependency: 2.4-emulator-kernel-x86, 2.4-libav
 -Description: Tizen x86 Emulator
 -
 -Package: 2.4-emulator-qemu-x86
 -OS: windows-64
 -Build-host-os: ubuntu-64
 -Build-dependency: 4.0-emulator-lib-dev [ windows-64 ], 4.0-libav-dev [ windows-64 ]
 -Install-dependency: 2.4-emulator-kernel-x86, 2.4-libav
 -Description: Tizen x86 Emulator
 -
 -Package: 2.4-emulator-qemu-x86
 -OS: macos-64
 -Build-host-os: macos-64
 -Build-dependency: 4.0-emulator-lib-dev [ macos-64 ], 4.0-libav-dev [ macos-64 ]
 -Install-dependency: cocoasudo [ macos-64 ], 2.4-emulator-kernel-x86 [ macos-64 ], 2.4-libav [ macos-64 ], tuntaposx [ macos-64 ]
 -Description: Tizen x86 Emulator
 -
 -Package: mobile-2.4-emulator-qemu-skins
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Description: Skin images for Mobile 2.4 Tizen Emulator
 -
 -Package: mobile-2.4-emulator-qemu-skins
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Description: Skin images for Mobile 2.4 Tizen Emulator
 -
 -Package: mobile-2.4-emulator-qemu-skins
 -OS: windows-32, windows-64
 -Build-host-os: ubuntu-64
 -Description: Skin images for Mobile 2.4 Tizen Emulator
 -
 -Package: mobile-2.4-emulator-qemu-skins
 -OS: macos-64
 -Build-host-os: macos-64
 -Description: Skin images for Mobile 2.4 Tizen Emulator
 -
 -Package: wearable-2.4-emulator-qemu-skins
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Description: Skin images for Wearable 2.4 Tizen Emulator
 -
 -Package: wearable-2.4-emulator-qemu-skins
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Description: Skin images for Wearable 2.4 Tizen Emulator
 -
 -Package: wearable-2.4-emulator-qemu-skins
 -OS: windows-32, windows-64
 -Build-host-os: ubuntu-64
 -Description: Skin images for Wearable 2.4 Tizen Emulator
 -
 -Package: wearable-2.4-emulator-qemu-skins
 -OS: macos-64
 -Build-host-os: macos-64
 -Description: Skin images for Wearable 2.4 Tizen Emulator
 -
 -Package: tv-2.4-emulator-qemu-skins
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Description: Skin images for TV 2.4 Tizen Emulator
 -
 -Package: tv-2.4-emulator-qemu-skins
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Description: Skin images for TV 2.4 Tizen Emulator
 -
 -Package: tv-2.4-emulator-qemu-skins
 -OS: windows-32, windows-64
 -Build-host-os: ubuntu-64
 -Description: Skin images for TV 2.4 Tizen Emulator
 -
 -Package: tv-2.4-emulator-qemu-skins
 -OS: macos-64
 -Build-host-os: macos-64
 -Description: Skin images for TV 2.4 Tizen Emulator
 -
 -# For tizen 2.3.2
 -Package: 2.3.2-emulator-qemu-common
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.3.2-emulator-qemu-common
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.3.2-emulator-qemu-common
 -OS: windows-32, windows-64
 -Build-host-os: ubuntu-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.3.2-emulator-qemu-common
 -OS: macos-64
 -Build-host-os: macos-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.3.2-emulator-qemu-x86
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Build-dependency: 4.0-emulator-lib-dev [ ubuntu-32 ], 4.0-libav-dev [ ubuntu-32 ]
 -Install-dependency: 2.3.2-emulator-kernel-x86 [ ubuntu-32 ], 2.3.2-libav [ ubuntu-32 ]
 -C-Prerequisites: acl, bridge-utils, openvpn, libfontconfig1, libglib2.0-0, libjpeg-turbo8, libpixman-1-0, libpng12-0, libsdl1.2debian, libsm6, libv4l-0, libx11-xcb1, libxcb-icccm4, libxcb-image0, libxcb-randr0, libxcb-render-util0, libxcb-shape0, libxcb-xfixes0, libxi6
 -Description: Tizen x86 Emulator
 -
 -Package: 2.3.2-emulator-qemu-x86
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Build-dependency: 4.0-emulator-lib-dev [ ubuntu-64 ], 4.0-libav-dev [ ubuntu-64]
 -Install-dependency: 2.3.2-emulator-kernel-x86 [ ubuntu-64 ], 2.3.2-libav [ ubuntu-64 ]
 -C-Prerequisites: acl, bridge-utils, openvpn, libfontconfig1, libglib2.0-0, libjpeg-turbo8, libpixman-1-0, libpng12-0, libsdl1.2debian, libsm6, libv4l-0, libx11-xcb1, libxcb-icccm4, libxcb-image0, libxcb-randr0, libxcb-render-util0, libxcb-shape0, libxcb-xfixes0, libxi6
 -Description: Tizen x86 Emulator
 -
 -Package: 2.3.2-emulator-qemu-x86
 -OS: windows-32
 -Build-host-os: ubuntu-64
 -Build-dependency: 4.0-emulator-lib-dev [ windows-32 ], 4.0-libav-dev [ windows-32 ]
 -Install-dependency: 2.3.2-emulator-kernel-x86, 2.3.2-libav
 -Description: Tizen x86 Emulator
 -
 -Package: 2.3.2-emulator-qemu-x86
 -OS: windows-64
 -Build-host-os: ubuntu-64
 -Build-dependency: 4.0-emulator-lib-dev [ windows-64 ], 4.0-libav-dev [ windows-64 ]
 -Install-dependency: 2.3.2-emulator-kernel-x86, 2.3.2-libav
 -Description: Tizen x86 Emulator
 -
 -Package: 2.3.2-emulator-qemu-x86
 -OS: macos-64
 -Build-host-os: macos-64
 -Build-dependency: 4.0-emulator-lib-dev [ macos-64 ], 4.0-libav-dev [ macos-64 ]
 -Install-dependency: cocoasudo [ macos-64 ], 2.3.2-emulator-kernel-x86 [ macos-64 ], 2.3.2-libav [ macos-64 ], tuntaposx [ macos-64 ]
 -Description: Tizen x86 Emulator
 -
 -Package: mobile-2.3.2-emulator-qemu-skins
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Description: Skin images for Mobile 2.3.2 Tizen Emulator
 -
 -Package: mobile-2.3.2-emulator-qemu-skins
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Description: Skin images for Mobile 2.3.2 Tizen Emulator
 -
 -Package: mobile-2.3.2-emulator-qemu-skins
 -OS: windows-32, windows-64
 -Build-host-os: ubuntu-64
 -Description: Skin images for Mobile 2.3.2 Tizen Emulator
 -
 -Package: mobile-2.3.2-emulator-qemu-skins
 -OS: macos-64
 -Build-host-os: macos-64
 -Description: Skin images for Mobile 2.3.2 Tizen Emulator
 -
 -Package: wearable-2.3.2-emulator-qemu-skins
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Description: Skin images for Wearable 2.3.2 Tizen Emulator
 -
 -Package: wearable-2.3.2-emulator-qemu-skins
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Description: Skin images for Wearable 2.3.2 Tizen Emulator
 -
 -Package: wearable-2.3.2-emulator-qemu-skins
 -OS: windows-32, windows-64
 -Build-host-os: ubuntu-64
 -Description: Skin images for Wearable 2.3.2 Tizen Emulator
 -
 -Package: wearable-2.3.2-emulator-qemu-skins
 -OS: macos-64
 -Build-host-os: macos-64
 -Description: Skin images for Wearable 2.3.2 Tizen Emulator
+