projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87923d1 2ec3911)
Merge branch 'develop' into tizen_2.3.2
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 6 Jun 2016 08:14:31 +0000 (17:14 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 6 Jun 2016 08:41:14 +0000 (17:41 +0900)
Change-Id: I14275fb66a6f831486d140fe0d3bbb615c335cef

1  2 
package/build.common patch | diff1 | diff2 | blob | history
package/pkginfo.manifest patch | diff1 | diff2 | blob | history

diff --cc package/build.common
index 89e87afad195ff6cf04975a8091423c039848950,9e21adc10beb1b4fa1019d6a19074579e253b14d..918b167b77dbd0be5f34c13a195f3d93d43cb3a9
--- 1/package/build.common
--- 2/package/build.common
+++ b/package/build.common
@@@ -38,27 -26,22 +38,27 @@@ build_common(
  # install_common
  install_common()
  {
 -      X86_BIN_DIR=$SRCDIR/package/2.3.2-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.3.2/common
 -      COMMON_BIN_DIR=$SRCDIR/package/2.3.2-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.3.2/common
 +      # emulator
-       EMULATOR_COMMON_DIR=$SRCDIR/package/3.0-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-3.0/common
++      EMULATOR_COMMON_DIR=$SRCDIR/package/2.3.2-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.3.2/common
 +      mkdir -p $EMULATOR_COMMON_DIR
 +      # we have nothing for common now
 +
-       EMULATOR_X86_DIR=$SRCDIR/package/3.0-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-3.0/common
++      EMULATOR_X86_DIR=$SRCDIR/package/2.3.2-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.3.2/common
 +
 +      mkdir -p $EMULATOR_X86_DIR
 +      cp -pPR $SRCDIR/tizen/emulator $EMULATOR_X86_DIR/emulator
 +
 +      # 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
+       MOBILE_2_3_2_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.3.2-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.3.2/mobile/emulator-resources/skins
+       WEARABLE_2_3_2_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.3.2-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.3.2/wearable/emulator-resources/skins
++      #TV_2_3_2_SKIN_RESOURCE_DIR=$SRCDIR/package/tv-2.3.2-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.3.2/tv/emulator-resources/skins
  
-       mkdir -p $MOBILE_3_0_SKIN_RESOURCE_DIR
-       mkdir -p $WEARABLE_3_0_SKIN_RESOURCE_DIR
-       mkdir -p $TV_3_0_SKIN_RESOURCE_DIR
 -      cd $SRCDIR/tizen
 -
 -      mkdir -p $X86_BIN_DIR
 -      mkdir -p $COMMON_BIN_DIR
+       mkdir -p $MOBILE_2_3_2_SKIN_RESOURCE_DIR
+       mkdir -p $WEARABLE_2_3_2_SKIN_RESOURCE_DIR
++      #mkdir -p $TV_2_3_2_SKIN_RESOURCE_DIR
  
-       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
 -      mv x86 $X86_BIN_DIR/emulator
 -      mv common $COMMON_BIN_DIR/emulator
++      cp -pPR $SRCDIR/tizen/src/ui/resource/skins/mobile/* $MOBILE_2_3_2_SKIN_RESOURCE_DIR
++      cp -pPR $SRCDIR/tizen/src/ui/resource/skins/wearable/* $WEARABLE_2_3_2_SKIN_RESOURCE_DIR
++      #cp -pPR $SRCDIR/tizen/src/ui/resource/skins/tv/* $TV_3_0_SKIN_RESOURCE_DIR
  
 -      #profile skins
 -      mv skins/mobile/* $MOBILE_2_3_2_SKIN_RESOURCE_DIR
 -      mv skins/wearable/* $WEARABLE_2_3_2_SKIN_RESOURCE_DIR
  }
diff --cc package/pkginfo.manifest
index eb7e557f698883896e4f1353bce06b1b5f7c34e6,d5687a33173e59967cbce83a2444313a0cafaffa..a0eba5955b6b029423343c8361ed480073466049
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -38,83 -38,76 +38,63 @@@ Install-dependency: 2.3.2-emulator-kern
  C-Prerequisites: libsdl1.2debian, libglib2.0-0, acl, zlib1g, libpixman-1-0, bridge-utils, openvpn
  Description: Tizen x86 Emulator
  
- Package: 3.0-emulator-qemu-x86
+ Package: 2.3.2-emulator-qemu-x86
 -OS: windows-32, windows-64
 +OS: windows-32
  Build-host-os: ubuntu-64
- Build-dependency: 3.0-emulator-lib-dev [ windows-32 ], 3.0-libav-dev [ windows-32 ]
- Install-dependency: 3.0-emulator-kernel-x86, 3.0-libav
+ Build-dependency: 2.3.2-emulator-lib-dev [ windows-32 ], 2.3.2-libav-dev [ windows-32 ]
+ Install-dependency: 2.3.2-emulator-kernel-x86, 2.3.2-libav
  Description: Tizen x86 Emulator
  
- Package: 3.0-emulator-qemu-x86
++Package: 2.3.2-emulator-qemu-x86
 +OS: windows-64
 +Build-host-os: ubuntu-64
- Build-dependency: 3.0-emulator-lib-dev [ windows-64 ], 3.0-libav-dev [ windows-64 ]
- Install-dependency: 3.0-emulator-kernel-x86, 3.0-libav
++Build-dependency: 2.3.2-emulator-lib-dev [ windows-64 ], 2.3.2-libav-dev [ windows-64 ]
++Install-dependency: 2.3.2-emulator-kernel-x86, 2.3.2-libav
 +Description: Tizen x86 Emulator
 +
- Package: 3.0-emulator-qemu-x86
+ Package: 2.3.2-emulator-qemu-x86
  OS: macos-64
  Build-host-os: macos-64
- Build-dependency: 3.0-emulator-lib-dev [ macos-64 ], 3.0-libav-dev [ macos-64 ]
- Install-dependency: cocoasudo [ macos-64 ], 3.0-emulator-kernel-x86 [ macos-64 ], 3.0-libav [ macos-64 ], tuntaposx [ macos-64 ]
+ Build-dependency: 2.3.2-emulator-lib-dev [ macos-64 ], 2.3.2-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-3.0-emulator-qemu-skins
+ Package: mobile-2.3.2-emulator-qemu-skins
  OS: ubuntu-32
  Build-host-os: ubuntu-32
- Description: Skin images for Mobile 3.0 Tizen Emulator
+ Description: Skin images for Mobile 2.3.2 Tizen Emulator
  
- Package: mobile-3.0-emulator-qemu-skins
+ Package: mobile-2.3.2-emulator-qemu-skins
  OS: ubuntu-64
  Build-host-os: ubuntu-64
- Description: Skin images for Mobile 3.0 Tizen Emulator
+ Description: Skin images for Mobile 2.3.2 Tizen Emulator
  
- Package: mobile-3.0-emulator-qemu-skins
+ Package: mobile-2.3.2-emulator-qemu-skins
  OS: windows-32, windows-64
  Build-host-os: ubuntu-64
- Description: Skin images for Mobile 3.0 Tizen Emulator
+ Description: Skin images for Mobile 2.3.2 Tizen Emulator
  
- Package: mobile-3.0-emulator-qemu-skins
+ Package: mobile-2.3.2-emulator-qemu-skins
  OS: macos-64
  Build-host-os: macos-64
- Description: Skin images for Mobile 3.0 Tizen Emulator
+ Description: Skin images for Mobile 2.3.2 Tizen Emulator
  
- Package: wearable-3.0-emulator-qemu-skins
+ Package: wearable-2.3.2-emulator-qemu-skins
  OS: ubuntu-32
  Build-host-os: ubuntu-32
- Description: Skin images for Wearable 3.0 Tizen Emulator
+ Description: Skin images for Wearable 2.3.2 Tizen Emulator
  
- Package: wearable-3.0-emulator-qemu-skins
+ Package: wearable-2.3.2-emulator-qemu-skins
  OS: ubuntu-64
  Build-host-os: ubuntu-64
- Description: Skin images for Wearable 3.0 Tizen Emulator
+ Description: Skin images for Wearable 2.3.2 Tizen Emulator
  
- Package: wearable-3.0-emulator-qemu-skins
+ Package: wearable-2.3.2-emulator-qemu-skins
  OS: windows-32, windows-64
  Build-host-os: ubuntu-64
- Description: Skin images for Wearable 3.0 Tizen Emulator
+ Description: Skin images for Wearable 2.3.2 Tizen Emulator
  
- Package: wearable-3.0-emulator-qemu-skins
+ Package: wearable-2.3.2-emulator-qemu-skins
  OS: macos-64
  Build-host-os: macos-64
- Description: Skin images for Wearable 3.0 Tizen Emulator
- 
- Package: tv-3.0-emulator-qemu-skins
- OS: ubuntu-32
- Build-host-os: ubuntu-32
- Description: Skin images for TV 3.0 Tizen Emulator
- 
- Package: tv-3.0-emulator-qemu-skins
- OS: ubuntu-64
- Build-host-os: ubuntu-64
- Description: Skin images for TV 3.0 Tizen Emulator
- 
- Package: tv-3.0-emulator-qemu-skins
- OS: windows-32, windows-64
- Build-host-os: ubuntu-64
- Description: Skin images for TV 3.0 Tizen Emulator
- 
- Package: tv-3.0-emulator-qemu-skins
- OS: macos-64
- Build-host-os: macos-64
- Description: Skin images for TV 3.0 Tizen Emulator
+ Description: Skin images for Wearable 2.3.2 Tizen Emulator
 -
 -#Package: tv-2.3.2-emulator-qemu-skins
 -#OS: ubuntu-32
 -#Build-host-os: ubuntu-32
 -#Description: Skin images for TV 2.3.2 Tizen Emulator
 -#
 -#Package: tv-2.3.2-emulator-qemu-skins
 -#OS: ubuntu-64
 -#Build-host-os: ubuntu-64
 -#Description: Skin images for TV 2.3.2 Tizen Emulator
 -#
 -#Package: tv-2.3.2-emulator-qemu-skins
 -#OS: windows-32, windows-64
 -#Build-host-os: windows-32
 -#Description: Skin images for TV 2.3.2 Tizen Emulator
 -#
 -#Package: tv-2.3.2-emulator-qemu-skins
 -#OS: macos-64
 -#Build-host-os: macos-64
 -#Description: Skin images for TV 2.3.2 Tizen Emulator
Domain: SDK / Emulator;